Mercurial > hg > nginx-vendor-1-0

comparison src/core/nginx.c @ 642:1b80544421e8 NGINX_1_0_11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.0.11 *) Change: now double quotes are encoded in an "echo" SSI-command output. Thanks to Zaur Abasmirzoev. *) Feature: the "image_filter_sharpen" directive. *) Bugfix: a segmentation fault might occur in a worker process if SNI was used; the bug had appeared in 1.0.9. *) Bugfix: SIGWINCH signal did not work after first binary upgrade; the bug had appeared in 1.0.9. *) Bugfix: the "If-Modified-Since", "If-Range", etc. client request header lines might be passed to backend while caching; or not passed without caching if caching was enabled in another part of the configuration. *) Bugfix: in the "scgi_param" directive, if complex parameters were used. *) Bugfix: "add_header" and "expires" directives did not work if a request was proxied and response status code was 206. *) Bugfix: in the "expires @time" directive. *) Bugfix: in the ngx_http_flv_module. Thanks to Piotr Sikora. *) Bugfix: in the ngx_http_mp4_module. *) Bugfix: nginx could not be built on FreeBSD 10. *) Bugfix: nginx could not be built on AIX.
author Igor Sysoev <http://sysoev.ru>
date Thu, 15 Dec 2011 00:00:00 +0400
parents 428c6e58046a
children ad25218fd14b
comparison
equal deleted inserted replaced
641:e21c9e01ce08 642:1b80544421e8
201 ngx_int_t i; 201 ngx_int_t i;
202 ngx_log_t *log; 202 ngx_log_t *log;
203 ngx_cycle_t *cycle, init_cycle; 203 ngx_cycle_t *cycle, init_cycle;
204 ngx_core_conf_t *ccf; 204 ngx_core_conf_t *ccf;
205 205
206 #if (NGX_FREEBSD)
207 ngx_debug_init();
208 #endif
209
206 if (ngx_strerror_init() != NGX_OK) { 210 if (ngx_strerror_init() != NGX_OK) {
207 return 1; 211 return 1;
208 } 212 }
209 213
210 if (ngx_get_options(argc, argv) != NGX_OK) { 214 if (ngx_get_options(argc, argv) != NGX_OK) {
211 return 1; 215 return 1;
212 } 216 }
213 217
214 if (ngx_show_version) { 218 if (ngx_show_version) {
215 ngx_log_stderr(0, "nginx version: " NGINX_VER); 219 ngx_write_stderr("nginx version: " NGINX_VER NGX_LINEFEED);
216 220
217 if (ngx_show_help) { 221 if (ngx_show_help) {
218 ngx_log_stderr(0, 222 ngx_write_stderr(
219 "Usage: nginx [-?hvVtq] [-s signal] [-c filename] " 223 "Usage: nginx [-?hvVtq] [-s signal] [-c filename] "
220 "[-p prefix] [-g directives]" CRLF CRLF 224 "[-p prefix] [-g directives]" NGX_LINEFEED
221 "Options:" CRLF 225 NGX_LINEFEED
222 " -?,-h : this help" CRLF 226 "Options:" NGX_LINEFEED
223 " -v : show version and exit" CRLF 227 " -?,-h : this help" NGX_LINEFEED
228 " -v : show version and exit" NGX_LINEFEED
224 " -V : show version and configure options then exit" 229 " -V : show version and configure options then exit"
225 CRLF 230 NGX_LINEFEED
226 " -t : test configuration and exit" CRLF 231 " -t : test configuration and exit" NGX_LINEFEED
227 " -q : suppress non-error messages " 232 " -q : suppress non-error messages "
228 "during configuration testing" CRLF 233 "during configuration testing" NGX_LINEFEED
229 " -s signal : send signal to a master process: " 234 " -s signal : send signal to a master process: "
230 "stop, quit, reopen, reload" CRLF 235 "stop, quit, reopen, reload" NGX_LINEFEED
231 #ifdef NGX_PREFIX 236 #ifdef NGX_PREFIX
232 " -p prefix : set prefix path (default: " 237 " -p prefix : set prefix path (default: "
233 NGX_PREFIX ")" CRLF 238 NGX_PREFIX ")" NGX_LINEFEED
234 #else 239 #else
235 " -p prefix : set prefix path (default: NONE)" CRLF 240 " -p prefix : set prefix path (default: NONE)" NGX_LINEFEED
236 #endif 241 #endif
237 " -c filename : set configuration file (default: " 242 " -c filename : set configuration file (default: "
238 NGX_CONF_PATH ")" CRLF 243 NGX_CONF_PATH ")" NGX_LINEFEED
239 " -g directives : set global directives out of configuration " 244 " -g directives : set global directives out of configuration "
240 "file" CRLF 245 "file" NGX_LINEFEED NGX_LINEFEED
241 ); 246 );
242 } 247 }
243 248
244 if (ngx_show_configure) { 249 if (ngx_show_configure) {
250 ngx_write_stderr(
245 #ifdef NGX_COMPILER 251 #ifdef NGX_COMPILER
246 ngx_log_stderr(0, "built by " NGX_COMPILER); 252 "built by " NGX_COMPILER NGX_LINEFEED
247 #endif 253 #endif
248 #if (NGX_SSL) 254 #if (NGX_SSL)
249 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME 255 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
250 ngx_log_stderr(0, "TLS SNI support enabled"); 256 "TLS SNI support enabled" NGX_LINEFEED
251 #else 257 #else
252 ngx_log_stderr(0, "TLS SNI support disabled"); 258 "TLS SNI support disabled" NGX_LINEFEED
253 #endif 259 #endif
254 #endif 260 #endif
255 ngx_log_stderr(0, "configure arguments:" NGX_CONFIGURE); 261 "configure arguments:" NGX_CONFIGURE NGX_LINEFEED);
256 } 262 }
257 263
258 if (!ngx_test_config) { 264 if (!ngx_test_config) {
259 return 0; 265 return 0;
260 } 266 }
261 } 267 }
262
263 #if (NGX_FREEBSD)
264 ngx_debug_init();
265 #endif
266 268
267 /* TODO */ ngx_max_sockets = -1; 269 /* TODO */ ngx_max_sockets = -1;
268 270
269 ngx_time_init(); 271 ngx_time_init();
270 272
369 if (!ngx_inherited && ccf->daemon) { 371 if (!ngx_inherited && ccf->daemon) {
370 if (ngx_daemon(cycle->log) != NGX_OK) { 372 if (ngx_daemon(cycle->log) != NGX_OK) {
371 return 1; 373 return 1;
372 } 374 }
373 375
376 ngx_daemonized = 1;
377 }
378
379 if (ngx_inherited) {
374 ngx_daemonized = 1; 380 ngx_daemonized = 1;
375 } 381 }
376 382
377 #endif 383 #endif
378 384