IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-27 09:21:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

nginx-0.0.2-2004-02-03-19:43:54 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-02-03 16:43:54 +00:00
parent a4b16df728
commit 25b36fedf7
14 changed files with 60 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
auto/lib/make
View File

@ -12,7 +12,18 @@ if [ "$PLATFORM" != "win32" ]; then
if [ $MD5 != NO ]; then
echo "$MD5/libmd5.a:" >> $MAKEFILE
echo " cd $MD5 && \$(MAKE) x86-elf" >> $MAKEFILE
case $PLATFORM in
SunOS:*)
echo " cd $MD5 && \$(MAKE) x86-solaris" >> $MAKEFILE
;;
*)
echo " cd $MD5 && \$(MAKE) x86-elf" >> $MAKEFILE
;;
esac
echo >> $MAKEFILE
fi

4
auto/os/linux
View File

@ -1,8 +1,8 @@
CORE_INCS="$UNIX_INCS"
CORE_DEPS="$UNIX_DEPS $LINUX_DEPS"
CORE_SRCS="$UNIX_SRCS $LINUX_SRCS $SELECT_SRCS $POLL_SRCS"
EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE $POLL_MODULE"
CORE_SRCS="$UNIX_SRCS $LINUX_SRCS"
EVENT_MODULES="$EVENT_MODULES"
ZLIB_LIB="-lz"

4
auto/os/solaris
View File

@ -1,8 +1,8 @@
CORE_INCS="$UNIX_INCS"
CORE_DEPS="$UNIX_DEPS $SOLARIS_DEPS"
CORE_SRCS="$UNIX_SRCS $SOLARIS_SRCS $SELECT_SRCS $POLL_SRCS"
EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE $POLL_MODULE"
CORE_SRCS="$UNIX_SRCS $SOLARIS_SRCS "
EVENT_MODULES="$EVENT_MODULES"
MD5_LIB="-lmd5"
ZLIB_LIB="-lz"

8
src/core/nginx.c
View File

@ -82,6 +82,7 @@ ngx_int_t ngx_max_module;
ngx_uint_t ngx_connection_counter;
ngx_int_t ngx_process;
ngx_pid_t ngx_pid;
ngx_pid_t ngx_new_binary;
ngx_int_t ngx_inherited;
@ -122,6 +123,7 @@ int main(int argc, char *const *argv, char **envp)
#endif
log = ngx_log_init_errlog();
ngx_pid = ngx_getpid();
/* init_cycle->log is required for signal handlers */
@ -179,12 +181,6 @@ int main(int argc, char *const *argv, char **envp)
}
}
if (dup2(cycle->log->file->fd, STDERR_FILENO) == -1) {
ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
"dup2(STDERR) failed");
return 1;
}
if (ccf->pid.len == 0) {
ccf->pid.len = sizeof(NGINX_PID) - 1;
ccf->pid.data = NGINX_PID;

5
src/core/ngx_config.h
View File

@ -2,9 +2,6 @@
#define _NGX_CONFIG_H_INCLUDED_
#include <ngx_auto_config.h>
#if 1
/* STUB to allocate a big ngx_connections */
#undef FD_SETSIZE
@ -36,6 +33,8 @@
#else /* posix */
#include <ngx_auto_config.h>
#endif

15
src/core/ngx_cycle.c
View File

@ -228,6 +228,14 @@ ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle)
}
}
/* TODO: Win32 DuplicateHandle ? */
if (dup2(cycle->log->file->fd, STDERR_FILENO) == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
"dup2(STDERR) failed");
failed = 1;
}
if (failed) {
/* rollback the new cycle configuration */
@ -262,6 +270,7 @@ ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle)
return NULL;
}
/* commit the new cycle configuration */
pool->log = cycle->log;
@ -438,6 +447,12 @@ void ngx_reopen_files(ngx_cycle_t *cycle, uid_t user)
file[i].fd = fd;
}
/* TODO: Win32 DuplicateHandle ? */
if (dup2(cycle->log->file->fd, STDERR_FILENO) == -1) {
ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
"dup2(STDERR) failed");
}
}

2
src/core/ngx_log.c
View File

@ -79,7 +79,7 @@ void ngx_log_error_core(int level, ngx_log_t *log, ngx_err_t err,
/* pid#tid */
len += ngx_snprintf(errstr + len, max - len,
PID_T_FMT "#%d: ", ngx_getpid(), /* STUB */ 0);
PID_T_FMT "#%d: ", ngx_pid, /* STUB */ 0);
if (log->data) {
len += ngx_snprintf(errstr + len, max - len,

9
src/event/ngx_event.c
View File

@ -16,6 +16,7 @@ extern ngx_event_module_t ngx_select_module_ctx;
#if (HAVE_DEVPOLL)
extern ngx_module_t ngx_devpoll_module;
extern ngx_event_module_t ngx_devpoll_module_ctx;
#endif
#if (HAVE_AIO)
@ -386,6 +387,7 @@ static char *ngx_event_use(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
old_ecf = NULL;
}
for (m = 0; ngx_modules[m]; m++) {
if (ngx_modules[m]->type != NGX_EVENT_MODULE) {
continue;
@ -397,14 +399,19 @@ static char *ngx_event_use(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ecf->use = ngx_modules[m]->ctx_index;
ecf->name = module->name->data;
if (old_ecf && old_ecf->use != ecf->use) {
if (ngx_process == NGX_PROCESS_SINGLE
&& old_ecf
&& old_ecf->use != ecf->use)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"when the server runs without a master process "
"the \"%s\" event type must be the same as "
"in previous configuration - \"%s\" "
"and it can not be changed on the fly, "
"to change it you need to stop server "
"and start it again",
value[1].data, old_ecf->name);
return NGX_CONF_ERROR;
}

2
src/os/unix/ngx_daemon.c
View File

@ -19,6 +19,8 @@ int ngx_daemon(ngx_log_t *log)
exit(0);
}
ngx_pid = ngx_getpid();
if (setsid() == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "setsid() failed");
return NGX_ERROR;

2
src/os/unix/ngx_freebsd_config.h
View File

@ -28,6 +28,8 @@
#include <dirent.h>
#include <osreldate.h>
#include <ngx_auto_config.h>
#ifndef HAVE_SELECT
#define HAVE_SELECT 1

15
src/os/unix/ngx_linux_config.h
View File

@ -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 @@ extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size);
#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

1
src/os/unix/ngx_process.c
View File

@ -46,6 +46,7 @@ ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle,
return NGX_ERROR;
case 0:
ngx_pid = ngx_getpid();
proc(cycle, data);
break;

1
src/os/unix/ngx_process.h
View File

@ -49,6 +49,7 @@ ngx_pid_t ngx_exec(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx);
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];

2
src/os/unix/ngx_solaris_config.h
View File

@ -32,6 +32,8 @@
#include <netdb.h>
#include <dirent.h>
#include <ngx_auto_config.h>
#ifndef HAVE_SELECT
#define HAVE_SELECT 1