nginx-0.0.2-2004-02-03-19:43:54 import
diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
index b2a37c1..8bad544 100644
--- a/src/os/unix/ngx_daemon.c
+++ b/src/os/unix/ngx_daemon.c
@@ -19,6 +19,8 @@
exit(0);
}
+ ngx_pid = ngx_getpid();
+
if (setsid() == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "setsid() failed");
return NGX_ERROR;
diff --git a/src/os/unix/ngx_freebsd_config.h b/src/os/unix/ngx_freebsd_config.h
index 6a43979..2e14831 100644
--- a/src/os/unix/ngx_freebsd_config.h
+++ b/src/os/unix/ngx_freebsd_config.h
@@ -28,6 +28,8 @@
#include <dirent.h>
#include <osreldate.h>
+#include <ngx_auto_config.h>
+
#ifndef HAVE_SELECT
#define HAVE_SELECT 1
diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
index e43a6ca..f6b8456 100644
--- a/src/os/unix/ngx_linux_config.h
+++ b/src/os/unix/ngx_linux_config.h
@@ -26,13 +26,6 @@
#include <sys/sysctl.h>
#include <sys/wait.h>
#include <sys/socket.h>
-
-#if (HAVE_SENDFILE64)
-#include <sys/sendfile.h>
-#else
-extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size);
-#endif
-
#include <netinet/in.h>
#include <netinet/tcp.h> /* TCP_CORK */
#include <arpa/inet.h>
@@ -41,6 +34,14 @@
#include <netdb.h>
#include <dirent.h>
+#include <ngx_auto_config.h>
+
+#if (HAVE_SENDFILE64)
+#include <sys/sendfile.h>
+#else
+extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size);
+#endif
+
#ifndef HAVE_SELECT
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
index 68bdaed..a8c9610 100644
--- a/src/os/unix/ngx_process.c
+++ b/src/os/unix/ngx_process.c
@@ -46,6 +46,7 @@
return NGX_ERROR;
case 0:
+ ngx_pid = ngx_getpid();
proc(cycle, data);
break;
diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h
index a1aa74b..66b9d7d 100644
--- a/src/os/unix/ngx_process.h
+++ b/src/os/unix/ngx_process.h
@@ -49,6 +49,7 @@
void ngx_respawn_processes(ngx_cycle_t *cycle);
void ngx_process_get_status(void);
+extern ngx_pid_t ngx_pid;
extern ngx_uint_t ngx_last_process;
extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES];
diff --git a/src/os/unix/ngx_solaris_config.h b/src/os/unix/ngx_solaris_config.h
index 43068f2..920aaf9 100644
--- a/src/os/unix/ngx_solaris_config.h
+++ b/src/os/unix/ngx_solaris_config.h
@@ -32,6 +32,8 @@
#include <netdb.h>
#include <dirent.h>
+#include <ngx_auto_config.h>
+
#ifndef HAVE_SELECT
#define HAVE_SELECT 1
