From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 7 Sep 2009 11:54:51 +0000 (+0000)
Subject: merge r3076, r3080:
X-Git-Tag: release-0.6.39~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=06b8301307c15103dbf98bd050154d41cf725c53;p=nginx.git

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 7975361c4..fcb8fdc8f 100644
--- 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];