r1657 merge:

log entire request line instead of URI only
This commit is contained in:
Igor Sysoev 2007-12-12 21:05:17 +00:00
parent cb4723a288
commit 03bb14b2a3

View File

@ -2599,12 +2599,6 @@ ngx_http_log_error_handler(ngx_http_request_t *r, ngx_http_request_t *sr,
buf = p;
}
if (r->unparsed_uri.data) {
p = ngx_snprintf(buf, len, ", URL: \"%V\"", &r->unparsed_uri);
len -= p - buf;
buf = p;
} else {
if (r->request_line.data == NULL && r->request_start) {
for (p = r->request_start; p < r->header_in->last; p++) {
if (*p == CR || *p == LF) {
@ -2621,7 +2615,6 @@ ngx_http_log_error_handler(ngx_http_request_t *r, ngx_http_request_t *sr,
len -= p - buf;
buf = p;
}
}
if (r != sr) {
p = ngx_snprintf(buf, len, ", subrequest: \"%V\"", &sr->uri);