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
index 7975361c4baadce04ae0c387320d9e82cef13ea5..fcb8fdc8fee0d7c5f2ab1423ccb1bd6052108a0c 100644 (file)
--- 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_request_t *r, ngx_buf_t *b)
 
         /* 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_request_t *r, ngx_buf_t *b)
                 goto header_done;
             default:
                 state = sw_name;
-                r->header_name_start = p;
 
                 c = lowcase[ch];