Mercurial > hg > nginx-vendor-current
comparison src/http/ngx_http_core_module.c @ 354:583decdb82a4 NGINX_0_6_21
nginx 0.6.21
*) Change: if variable values used in a "proxy_pass" directive contain
IP-addresses only, then a "resolver" directive is not mandatory.
resolver
*) Bugfix: a segmentation fault might occur in worker process if a
"proxy_pass" directive with URI-part was used; bug appeared in
0.6.19.
*) Bugfix: if resolver was used on platform that does not support
kqueue, then nginx issued an alert "name is out of response".
Thanks to Andrei Nigmatulin.
*) Bugfix: if the $server_protocol was used in FastCGI parameters and a
request line length was near to the "client_header_buffer_size"
directive value, then nginx issued an alert "fastcgi: the request
record is too big".
*) Bugfix: if a plain text HTTP/0.9 version request was made to HTTPS
server, then nginx returned usual response.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 03 Dec 2007 00:00:00 +0300 |
| parents | e10168d6e371 |
| children | b743d290eb3b |
comparison
equal
deleted
inserted
replaced
| 353:4a470d9e2ea5 | 354:583decdb82a4 |
|---|---|
| 67 void *conf); | 67 void *conf); |
| 68 static char *ngx_http_core_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, | 68 static char *ngx_http_core_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, |
| 69 void *conf); | 69 void *conf); |
| 70 static char *ngx_http_core_internal(ngx_conf_t *cf, ngx_command_t *cmd, | 70 static char *ngx_http_core_internal(ngx_conf_t *cf, ngx_command_t *cmd, |
| 71 void *conf); | 71 void *conf); |
| 72 static char * ngx_http_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd, | 72 static char *ngx_http_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd, |
| 73 void *conf); | 73 void *conf); |
| 74 | 74 |
| 75 static char *ngx_http_core_lowat_check(ngx_conf_t *cf, void *post, void *data); | 75 static char *ngx_http_core_lowat_check(ngx_conf_t *cf, void *post, void *data); |
| 76 static char *ngx_http_core_pool_size(ngx_conf_t *cf, void *post, void *data); | 76 static char *ngx_http_core_pool_size(ngx_conf_t *cf, void *post, void *data); |
| 77 | 77 |
| 2592 ngx_conf_merge_msec_value(conf->resolver_timeout, | 2592 ngx_conf_merge_msec_value(conf->resolver_timeout, |
| 2593 prev->resolver_timeout, 30000); | 2593 prev->resolver_timeout, 30000); |
| 2594 | 2594 |
| 2595 if (conf->resolver == NULL) { | 2595 if (conf->resolver == NULL) { |
| 2596 conf->resolver = prev->resolver; | 2596 conf->resolver = prev->resolver; |
| 2597 | |
| 2598 if (conf->resolver == NULL) { | |
| 2599 conf->resolver = ngx_resolver_create(NULL, cf->cycle->new_log); | |
| 2600 if (conf->resolver == NULL) { | |
| 2601 return NGX_OK; | |
| 2602 } | |
| 2603 } | |
| 2597 } | 2604 } |
| 2598 | 2605 |
| 2599 ngx_conf_merge_path_value(conf->client_body_temp_path, | 2606 ngx_conf_merge_path_value(conf->client_body_temp_path, |
| 2600 prev->client_body_temp_path, | 2607 prev->client_body_temp_path, |
| 2601 NGX_HTTP_CLIENT_TEMP_PATH, 0, 0, 0, | 2608 NGX_HTTP_CLIENT_TEMP_PATH, 0, 0, 0, |
| 3391 ngx_url_t u; | 3398 ngx_url_t u; |
| 3392 ngx_str_t *value; | 3399 ngx_str_t *value; |
| 3393 | 3400 |
| 3394 value = cf->args->elts; | 3401 value = cf->args->elts; |
| 3395 | 3402 |
| 3403 ngx_memzero(&u, sizeof(ngx_url_t)); | |
| 3404 | |
| 3396 u.host = value[1]; | 3405 u.host = value[1]; |
| 3397 u.port = 53; | 3406 u.port = 53; |
| 3398 | 3407 |
| 3399 if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { | 3408 if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { |
| 3400 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V: %s", &u.host, u.err); | 3409 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V: %s", &u.host, u.err); |