nginx-vendor-current: src/core/nginx.c comparison

comparison src/core/nginx.c @ 480:549994537f15 NGINX_0_7_52

nginx 0.7.52 *) Feature: the first native Windows binary release. *) Bugfix: in processing HEAD method while caching. *) Bugfix: in processing the "If-Modified-Since", "If-Range", etc. client request header lines while caching. *) Bugfix: now the "Set-Cookie" and "P3P" header lines are hidden in cacheable responses. *) Bugfix: if nginx was built with the ngx_http_perl_module and with a perl which supports threads, then during a master process exit the message "panic: MUTEX_LOCK" might be issued. *) Bugfix: nginx could not be built --without-http-cache; the bug had appeared in 0.7.48. *) Bugfix: nginx could not be built on platforms different from i386, amd64, sparc, and ppc; the bug had appeared in 0.7.42.

author	Igor Sysoev <http://sysoev.ru>
date	Mon, 20 Apr 2009 00:00:00 +0400
parents	a8424ffa495c
children	392c16f2d858

comparison

equal deleted inserted replaced

-:eb4fdebda673
+:549994537f15
 NULL,                                  /* exit master */
 NGX_MODULE_V1_PADDING
 };
-ngx_uint_t  ngx_max_module;
+ngx_uint_t          ngx_max_module;
-static ngx_uint_t  ngx_show_version;
+static ngx_uint_t   ngx_show_version;
-static ngx_uint_t  ngx_show_configure;
+static ngx_uint_t   ngx_show_configure;
+#if (NGX_WIN32)
+static char        *ngx_signal;
+#endif
 static char **ngx_os_environ;
 int ngx_cdecl
 main(int argc, char *const *argv)
 {
-char             *p;
-ssize_t           n;
 ngx_int_t         i;
 ngx_log_t        *log;
 ngx_cycle_t      *cycle, init_cycle;
 ngx_core_conf_t  *ccf;
 return 1;
 }
 if (ngx_show_version) {
-p = "nginx version: " NGINX_VER CRLF;
+ngx_log_stderr("nginx version: " NGINX_VER);
-n = sizeof("nginx version: " NGINX_VER CRLF) - 1;
-if (ngx_write_fd(ngx_stderr_fileno, p, n) != n) {
-return 1;
-}
 if (ngx_show_configure) {
 #ifdef NGX_COMPILER
-p = "built by " NGX_COMPILER CRLF;
+ngx_log_stderr("built by " NGX_COMPILER);
-n = sizeof("built by " NGX_COMPILER CRLF) - 1;
+#endif
-if (ngx_write_fd(ngx_stderr_fileno, p, n) != n) {
+ngx_log_stderr("configure arguments: " NGX_CONFIGURE);
-return 1;
-}
-#endif
-p = "configure arguments: " NGX_CONFIGURE CRLF;
-n = sizeof("configure arguments :" NGX_CONFIGURE CRLF) - 1;
-if (ngx_write_fd(ngx_stderr_fileno, p, n) != n) {
-return 1;
-}
 }
 if (!ngx_test_config) {
 return 0;
 }
 }
 cycle = ngx_init_cycle(&init_cycle);
 if (cycle == NULL) {
 if (ngx_test_config) {
-ngx_log_error(NGX_LOG_EMERG, log, 0,
+ngx_log_stderr("the configuration file %s test failed",
-"the configuration file %s test failed",
+init_cycle.conf_file.data);
-init_cycle.conf_file.data);
 }
 return 1;
 }
 if (ngx_test_config) {
-ngx_log_error(NGX_LOG_INFO, log, 0,
+ngx_log_stderr("the configuration file %s was tested successfully",
-"the configuration file %s was tested successfully",
+cycle->conf_file.data);
-cycle->conf_file.data);
 return 0;
 }
 ngx_os_status(cycle->log);
 ngx_cycle = cycle;
 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-ngx_process = ccf->master ? NGX_PROCESS_MASTER : NGX_PROCESS_SINGLE;
+if (ccf->master && ngx_process == NGX_PROCESS_SINGLE) {
+ngx_process = NGX_PROCESS_MASTER;
+}
 #if (NGX_WIN32)
-#if 0
+if (ngx_signal) {
+return ngx_signal_process(cycle, ngx_signal);
-TODO:
+}
-if (ccf->run_as_service) {
-if (ngx_service(cycle->log) != NGX_OK) {
-return 1;
-}
-return 0;
-}
-#endif
 #else
 if (ngx_init_signals(cycle->log) != NGX_OK) {
 return 1;
 }
 ngx_daemonized = 1;
 }
+#endif
 if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
 return 1;
 }
-#endif
+if (ngx_process == NGX_PROCESS_SINGLE) {
+ngx_single_process_cycle(cycle);
-if (ngx_process == NGX_PROCESS_MASTER) {
+} else {
 ngx_master_process_cycle(cycle);
-} else {
-ngx_single_process_cycle(cycle);
 }
 return 0;
 }
 cycle->conf_param.data = (u_char *) argv[++i];
 cycle->conf_param.len = ngx_strlen(cycle->conf_param.data);
 break;
+#if (NGX_WIN32)
+case 's':
+if (argv[++i] == NULL) {
+ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+"the option \"-s\" requires parameter");
+return NGX_ERROR;
+}
+if (ngx_strcmp(argv[i], "stop") == 0
+|| ngx_strcmp(argv[i], "quit") == 0
+|| ngx_strcmp(argv[i], "reopen") == 0
+|| ngx_strcmp(argv[i], "reload") == 0)
+{
+ngx_process = NGX_PROCESS_SIGNALLER;
+ngx_signal = argv[i];
+break;
+}
+ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
+"invalid option: \"-s %s\"", argv[i]);
+return NGX_ERROR;
+#endif
 default:
 ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
 "invalid option: \"%s\"", argv[i]);
 return NGX_ERROR;
 }
 ngx_threads_n = ccf->worker_threads;
 ngx_conf_init_size_value(ccf->thread_stack_size, 2 * 1024 * 1024);
 #endif
+if (ccf->pid.len == 0) {
+ccf->pid.len = sizeof(NGX_PID_PATH) - 1;
+ccf->pid.data = (u_char *) NGX_PID_PATH;
+}
+if (ngx_conf_full_name(cycle, &ccf->pid, 0) != NGX_OK) {
+return NGX_CONF_ERROR;
+}
+ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT);
+ccf->oldpid.data = ngx_pnalloc(cycle->pool, ccf->oldpid.len);
+if (ccf->oldpid.data == NULL) {
+return NGX_CONF_ERROR;
+}
+ngx_memcpy(ngx_cpymem(ccf->oldpid.data, ccf->pid.data, ccf->pid.len),
+NGX_OLDPID_EXT, sizeof(NGX_OLDPID_EXT));
 #if !(NGX_WIN32)
 if (ccf->user == (uid_t) NGX_CONF_UNSET_UINT && geteuid() == 0) {
 struct group   *grp;
 struct passwd  *pwd;
 }
 ccf->group = grp->gr_gid;
 }
-if (ccf->pid.len == 0) {
-ccf->pid.len = sizeof(NGX_PID_PATH) - 1;
-ccf->pid.data = (u_char *) NGX_PID_PATH;
-}
-if (ngx_conf_full_name(cycle, &ccf->pid, 0) != NGX_OK) {
-return NGX_CONF_ERROR;
-}
-ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT);
-ccf->oldpid.data = ngx_pnalloc(cycle->pool, ccf->oldpid.len);
-if (ccf->oldpid.data == NULL) {
-return NGX_CONF_ERROR;
-}
-ngx_memcpy(ngx_cpymem(ccf->oldpid.data, ccf->pid.data, ccf->pid.len),
-NGX_OLDPID_EXT, sizeof(NGX_OLDPID_EXT));
 if (ccf->lock_file.len == 0) {
 ccf->lock_file.len = sizeof(NGX_LOCK_PATH) - 1;
 ccf->lock_file.data = (u_char *) NGX_LOCK_PATH;
 }

Mercurial > hg > nginx-vendor-current

comparison src/core/nginx.c @ 480:549994537f15 NGINX_0_7_52