changeset 3104:c2537655fd5f stable-0.6

merge r3076, r3080: fix segfault when a header starts with "\rX" and logging is set to info or debug level
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Sep 2009 11:54:51 +0000
parents f14b468a5283
children 8ed781b3bc02
files src/http/ngx_http_parse.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -738,6 +738,7 @@ ngx_http_parse_header_line(ngx_http_requ
 
         /* first char */
         case sw_start:
+            r->header_name_start = p;
             r->invalid_header = 0;
 
             switch (ch) {
@@ -750,7 +751,6 @@ ngx_http_parse_header_line(ngx_http_requ
                 goto header_done;
             default:
                 state = sw_name;
-                r->header_name_start = p;
 
                 c = lowcase[ch];