Mercurial > hg > nginx-mail
comparison src/core/nginx.c @ 493:a8424ffa495c NGINX_0_7_39
nginx 0.7.39
*) Bugfix: large response with SSI might hang, if gzipping was enabled;
the bug had appeared in 0.7.28.
Thanks to Artem Bokhan.
*) Bugfix: a segmentation fault might occur in worker process, if short
static variants are used in a "try_files" directive.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 02 Mar 2009 00:00:00 +0300 |
parents | ff86d646f9df |
children | 549994537f15 |
comparison
equal
deleted
inserted
replaced
492:9ef0e36f3cd5 | 493:a8424ffa495c |
---|---|
386 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, | 386 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, |
387 "using inherited sockets from \"%s\"", inherited); | 387 "using inherited sockets from \"%s\"", inherited); |
388 | 388 |
389 if (ngx_array_init(&cycle->listening, cycle->pool, 10, | 389 if (ngx_array_init(&cycle->listening, cycle->pool, 10, |
390 sizeof(ngx_listening_t)) | 390 sizeof(ngx_listening_t)) |
391 == NGX_ERROR) | 391 != NGX_OK) |
392 { | 392 { |
393 return NGX_ERROR; | 393 return NGX_ERROR; |
394 } | 394 } |
395 | 395 |
396 for (p = inherited, v = p; *p; p++) { | 396 for (p = inherited, v = p; *p; p++) { |
836 if (ccf->pid.len == 0) { | 836 if (ccf->pid.len == 0) { |
837 ccf->pid.len = sizeof(NGX_PID_PATH) - 1; | 837 ccf->pid.len = sizeof(NGX_PID_PATH) - 1; |
838 ccf->pid.data = (u_char *) NGX_PID_PATH; | 838 ccf->pid.data = (u_char *) NGX_PID_PATH; |
839 } | 839 } |
840 | 840 |
841 if (ngx_conf_full_name(cycle, &ccf->pid, 0) == NGX_ERROR) { | 841 if (ngx_conf_full_name(cycle, &ccf->pid, 0) != NGX_OK) { |
842 return NGX_CONF_ERROR; | 842 return NGX_CONF_ERROR; |
843 } | 843 } |
844 | 844 |
845 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); | 845 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); |
846 | 846 |
856 if (ccf->lock_file.len == 0) { | 856 if (ccf->lock_file.len == 0) { |
857 ccf->lock_file.len = sizeof(NGX_LOCK_PATH) - 1; | 857 ccf->lock_file.len = sizeof(NGX_LOCK_PATH) - 1; |
858 ccf->lock_file.data = (u_char *) NGX_LOCK_PATH; | 858 ccf->lock_file.data = (u_char *) NGX_LOCK_PATH; |
859 } | 859 } |
860 | 860 |
861 if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) == NGX_ERROR) { | 861 if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) != NGX_OK) { |
862 return NGX_CONF_ERROR; | 862 return NGX_CONF_ERROR; |
863 } | 863 } |
864 | 864 |
865 { | 865 { |
866 ngx_str_t lock_file; | 866 ngx_str_t lock_file; |