Mercurial > hg > nginx-vendor-0-8
diff src/http/ngx_http_core_module.c @ 364:a39aab45a53f NGINX_0_6_26
nginx 0.6.26
*) Bugfix: the "proxy_store" and "fastcgi_store" directives did not
check a response length.
*) Bugfix: a segmentation fault occurred in worker process, if big
value was used in a "expires" directive.
Thanks to Joaquin Cuenca Abela.
*) Bugfix: nginx incorrectly detected cache line size on Pentium 4.
Thanks to Gena Makhomed.
*) Bugfix: in proxied or FastCGI subrequests a client original method
was used instead of the GET method.
*) Bugfix: socket leak in HTTPS mode if deferred accept was used.
Thanks to Ben Maurer.
*) Bugfix: nginx issued the bogus error message "SSL_shutdown() failed
(SSL: )"; bug appeared in 0.6.23.
*) Bugfix: in HTTPS mode requests might fail with the "bad write retry"
error; bug appeared in 0.6.23.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 11 Feb 2008 00:00:00 +0300 |
parents | 54fad6c4b555 |
children | babd3d9efb62 |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -652,6 +652,9 @@ ngx_module_t ngx_http_core_module = { }; +static ngx_str_t ngx_http_core_get_method = { 3, (u_char *) "GET " }; + + void ngx_http_handler(ngx_http_request_t *r) { @@ -1760,7 +1763,7 @@ ngx_http_subrequest(ngx_http_request_t * sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0; sr->unparsed_uri = r->unparsed_uri; - sr->method_name = r->method_name; + sr->method_name = ngx_http_core_get_method; sr->http_protocol = r->http_protocol; if (ngx_http_set_exten(sr) != NGX_OK) { @@ -2909,7 +2912,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t if (conf->resolver == NULL) { conf->resolver = ngx_resolver_create(NULL, cf->cycle->new_log); if (conf->resolver == NULL) { - return NGX_OK; + return NGX_CONF_ERROR; } } }