merge r3076, r3080:

fix segfault when a header starts with "\rX"
and logging is set to info or debug level
This commit is contained in:
Igor Sysoev 2009-09-07 12:02:37 +00:00
parent 5478e46ce9
commit 6660f82e17

View File

@ -738,6 +738,7 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
/* first char */ /* first char */
case sw_start: case sw_start:
r->header_name_start = p;
r->invalid_header = 0; r->invalid_header = 0;
switch (ch) { switch (ch) {
@ -750,7 +751,6 @@ ngx_http_parse_header_line(ngx_http_request_t *r, ngx_buf_t *b)
goto header_done; goto header_done;
default: default:
state = sw_name; state = sw_name;
r->header_name_start = p;
c = lowcase[ch]; c = lowcase[ch];