From be2cfc3d28c90b0e911f22d6f14ce927b7f5bfad Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Sun, 15 Jun 2003 18:32:13 +0000
Subject: nginx-0.0.1-2003-06-15-22:32:13 import

---
 src/os/unix/ngx_daemon.c         | 24 ++----------------------
 src/os/unix/ngx_freebsd_config.h |  1 +
 2 files changed, 3 insertions(+), 22 deletions(-)

(limited to 'src/os/unix')

diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
index 93d3571b0..7d05fef9b 100644
--- a/src/os/unix/ngx_daemon.c
+++ b/src/os/unix/ngx_daemon.c
@@ -1,9 +1,7 @@
 
 #include <ngx_config.h>
 #include <ngx_core.h>
-#include <ngx_log.h>
 
-/* daemon in Linux */
 
 int ngx_daemon(ngx_log_t *log)
 {
@@ -26,27 +24,8 @@ int ngx_daemon(ngx_log_t *log)
         return NGX_ERROR;
     }
 
-#if (__SVR4 || linux)
-
-    /* need HUP IGN ? check in Solaris and Linux */
-
-    switch (fork()) {
-    case -1:
-        ngx_log_error(NGX_LOG_EMERG, log, errno, "fork() failed");
-        return NGX_ERROR;
-
-    case 0:
-        break;
-
-    default:
-        exit(0);
-    }
-
-#endif
-
     umask(0);
 
-#if 0
     fd = open("/dev/null", O_RDWR);
     if (fd == -1) {
         ngx_log_error(NGX_LOG_EMERG, log, errno, "open(\"/dev/null\") failed");
@@ -63,10 +42,12 @@ int ngx_daemon(ngx_log_t *log)
         return NGX_ERROR;
     }
 
+#if 0
     if (dup2(fd, STDERR_FILENO) == -1) {
         ngx_log_error(NGX_LOG_EMERG, log, errno, "dup2(STDERR) failed");
         return NGX_ERROR;
     }
+#endif
 
     if (fd > STDERR_FILENO) {
         if (close(fd) == -1) {
@@ -74,7 +55,6 @@ int ngx_daemon(ngx_log_t *log)
             return NGX_ERROR;
         }
     }
-#endif
 
     return NGX_OK;
 }
diff --git a/src/os/unix/ngx_freebsd_config.h b/src/os/unix/ngx_freebsd_config.h
index 64175fe82..31602f831 100644
--- a/src/os/unix/ngx_freebsd_config.h
+++ b/src/os/unix/ngx_freebsd_config.h
@@ -14,6 +14,7 @@
 #include <sys/ioctl.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
+#include <sys/mman.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>        /* TCP_NOPUSH */
-- 
cgit