# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1252324491 0
# Node ID c2537655fd5fee38adc8ae5935d2c1cef85fdde0
# Parent  f14b468a5283978e761606e4fe689001543459a0
merge r3076, r3080:

fix segfault when a header starts with "\rX"
and logging is set to info or debug level

diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
--- 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];