Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 364:a39aab45a53f NGINX_0_6_26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
363:6999caedb665 364:a39aab45a53f
650 NULL, /* exit master */ 650 NULL, /* exit master */
651 NGX_MODULE_V1_PADDING 651 NGX_MODULE_V1_PADDING
652 }; 652 };
653 653
654 654
655 static ngx_str_t ngx_http_core_get_method = { 3, (u_char *) "GET " };
656
657
655 void 658 void
656 ngx_http_handler(ngx_http_request_t *r) 659 ngx_http_handler(ngx_http_request_t *r)
657 { 660 {
658 ngx_http_core_main_conf_t *cmcf; 661 ngx_http_core_main_conf_t *cmcf;
659 662
1758 1761
1759 sr->zero_in_uri = (flags & NGX_HTTP_ZERO_IN_URI) != 0; 1762 sr->zero_in_uri = (flags & NGX_HTTP_ZERO_IN_URI) != 0;
1760 sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0; 1763 sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0;
1761 1764
1762 sr->unparsed_uri = r->unparsed_uri; 1765 sr->unparsed_uri = r->unparsed_uri;
1763 sr->method_name = r->method_name; 1766 sr->method_name = ngx_http_core_get_method;
1764 sr->http_protocol = r->http_protocol; 1767 sr->http_protocol = r->http_protocol;
1765 1768
1766 if (ngx_http_set_exten(sr) != NGX_OK) { 1769 if (ngx_http_set_exten(sr) != NGX_OK) {
1767 return NGX_ERROR; 1770 return NGX_ERROR;
1768 } 1771 }
2907 conf->resolver = prev->resolver; 2910 conf->resolver = prev->resolver;
2908 2911
2909 if (conf->resolver == NULL) { 2912 if (conf->resolver == NULL) {
2910 conf->resolver = ngx_resolver_create(NULL, cf->cycle->new_log); 2913 conf->resolver = ngx_resolver_create(NULL, cf->cycle->new_log);
2911 if (conf->resolver == NULL) { 2914 if (conf->resolver == NULL) {
2912 return NGX_OK; 2915 return NGX_CONF_ERROR;
2913 } 2916 }
2914 } 2917 }
2915 } 2918 }
2916 2919
2917 ngx_conf_merge_path_value(conf->client_body_temp_path, 2920 ngx_conf_merge_path_value(conf->client_body_temp_path,