diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 12:02:37 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 12:02:37 +0000 |
| commit | 6660f82e1755d881a629c542787899e79c7ae395 (patch) | |
| tree | 1a19b86903da22bbf23674c8e7277dfc9229503f | |
| parent | 5478e46ce9f4bffd1e2f171c6248f5b2a9104fe6 (diff) | |
| download | nginx-6660f82e1755d881a629c542787899e79c7ae395.tar.gz nginx-6660f82e1755d881a629c542787899e79c7ae395.tar.bz2 | |
merge r3076, r3080:
fix segfault when a header starts with "\rX"
and logging is set to info or debug level
| -rw-r--r-- | src/http/ngx_http_parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c index b83810d2e..de061c91d 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]; |