Mercurial > hg > nginx

comparison src/http/ngx_http_request.c @ 1731:9e04d3259096 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1657 merge: log entire request line instead of URI only
author Igor Sysoev <igor@sysoev.ru>
date Wed, 12 Dec 2007 21:05:17 +0000
parents 3b7262e720c1
children 7b074520602f
comparison
equal deleted inserted replaced
1730:d1b075a0f7a2 1731:9e04d3259096
2597 p = ngx_snprintf(buf, len, ", server: %V", &r->server_name); 2597 p = ngx_snprintf(buf, len, ", server: %V", &r->server_name);
2598 len -= p - buf; 2598 len -= p - buf;
2599 buf = p; 2599 buf = p;
2600 } 2600 }
2601 2601
2602 if (r->unparsed_uri.data) { 2602 if (r->request_line.data == NULL && r->request_start) {
2603 p = ngx_snprintf(buf, len, ", URL: \"%V\"", &r->unparsed_uri); 2603 for (p = r->request_start; p < r->header_in->last; p++) {
2604 if (*p == CR || *p == LF) {
2605 break;
2606 }
2607 }
2608
2609 r->request_line.len = p - r->request_start;
2610 r->request_line.data = r->request_start;
2611 }
2612
2613 if (r->request_line.len) {
2614 p = ngx_snprintf(buf, len, ", request: \"%V\"", &r->request_line);
2604 len -= p - buf; 2615 len -= p - buf;
2605 buf = p; 2616 buf = p;
2606
2607 } else {
2608 if (r->request_line.data == NULL && r->request_start) {
2609 for (p = r->request_start; p < r->header_in->last; p++) {
2610 if (*p == CR || *p == LF) {
2611 break;
2612 }
2613 }
2614
2615 r->request_line.len = p - r->request_start;
2616 r->request_line.data = r->request_start;
2617 }
2618
2619 if (r->request_line.len) {
2620 p = ngx_snprintf(buf, len, ", request: \"%V\"", &r->request_line);
2621 len -= p - buf;
2622 buf = p;
2623 }
2624 } 2617 }
2625 2618
2626 if (r != sr) { 2619 if (r != sr) {
2627 p = ngx_snprintf(buf, len, ", subrequest: \"%V\"", &sr->uri); 2620 p = ngx_snprintf(buf, len, ", subrequest: \"%V\"", &sr->uri);
2628 len -= p - buf; 2621 len -= p - buf;