summaryrefslogtreecommitdiffhomepage
path: root/src/http/ngx_http_parse.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-09-07 11:11:24 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-09-07 11:11:24 +0000
commitcaf21c99d8cf5af400eae41fcefdd96a41cd9b96 (patch)
treed15267f6f0e94cdf527af970d4d95b277617f0a8 /src/http/ngx_http_parse.c
parente5fb02e01f77aca2c9ea784d8dc14d7e4bd3c6ea (diff)
downloadnginx-caf21c99d8cf5af400eae41fcefdd96a41cd9b96.tar.gz
nginx-caf21c99d8cf5af400eae41fcefdd96a41cd9b96.tar.bz2
merge r3076, r3077, r3080:
fix invalid header logging: *) fix segfault when a header starts with "\rX" and logging is set to info or debug level *) use %*s instead of %V
Diffstat (limited to 'src/http/ngx_http_parse.c')
-rw-r--r--src/http/ngx_http_parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index 0b7356598..160f96dbe 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -739,6 +739,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) {
@@ -751,7 +752,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];