Mercurial > hg > nginx-vendor-0-6

comparison src/http/ngx_http_request.c @ 348:e10168d6e371 NGINX_0_6_18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.18 *) Change: now the ngx_http_userid_module adds start time microseconds to the cookie field contains a pid value. *) Change: now the full request line instead of URI only is written to error_log. *) Feature: variables support in the "proxy_pass" directive. *) Feature: the "resolver" and "resolver_timeout" directives. *) Feature: now the directive "add_header last-modified ''" deletes a "Last-Modified" response header line. *) Bugfix: the "limit_rate" directive did not allow to use full throughput, even if limit value was very high.
author Igor Sysoev <http://sysoev.ru>
date Tue, 27 Nov 2007 00:00:00 +0300
parents 05693816539c
children 583decdb82a4
comparison
equal deleted inserted replaced
347:d53199b68e17 348:e10168d6e371
2611 p = ngx_snprintf(buf, len, ", server: %V", &r->server_name); 2611 p = ngx_snprintf(buf, len, ", server: %V", &r->server_name);
2612 len -= p - buf; 2612 len -= p - buf;
2613 buf = p; 2613 buf = p;
2614 } 2614 }
2615 2615
2616 if (r->unparsed_uri.data) { 2616 if (r->request_line.data == NULL && r->request_start) {
2617 p = ngx_snprintf(buf, len, ", URL: \"%V\"", &r->unparsed_uri); 2617 for (p = r->request_start; p < r->header_in->last; p++) {
2618 if (*p == CR || *p == LF) {
2619 break;
2620 }
2621 }
2622
2623 r->request_line.len = p - r->request_start;
2624 r->request_line.data = r->request_start;
2625 }
2626
2627 if (r->request_line.len) {
2628 p = ngx_snprintf(buf, len, ", request: \"%V\"", &r->request_line);
2618 len -= p - buf; 2629 len -= p - buf;
2619 buf = p; 2630 buf = p;
2620
2621 } else {
2622 if (r->request_line.data == NULL && r->request_start) {
2623 for (p = r->request_start; p < r->header_in->last; p++) {
2624 if (*p == CR || *p == LF) {
2625 break;
2626 }
2627 }
2628
2629 r->request_line.len = p - r->request_start;
2630 r->request_line.data = r->request_start;
2631 }
2632
2633 if (r->request_line.len) {
2634 p = ngx_snprintf(buf, len, ", request: \"%V\"", &r->request_line);
2635 len -= p - buf;
2636 buf = p;
2637 }
2638 } 2631 }
2639 2632
2640 if (r != sr) { 2633 if (r != sr) {
2641 p = ngx_snprintf(buf, len, ", subrequest: \"%V\"", &sr->uri); 2634 p = ngx_snprintf(buf, len, ", subrequest: \"%V\"", &sr->uri);
2642 len -= p - buf; 2635 len -= p - buf;
2654 uri_separator = ":"; 2647 uri_separator = ":";
2655 } 2648 }
2656 #endif 2649 #endif
2657 2650
2658 p = ngx_snprintf(buf, len, ", upstream: \"%V%V%s%V\"", 2651 p = ngx_snprintf(buf, len, ", upstream: \"%V%V%s%V\"",
2659 &u->conf->schema, u->peer.name, 2652 &u->schema, u->peer.name,
2660 uri_separator, &u->uri); 2653 uri_separator, &u->uri);
2661 len -= p - buf; 2654 len -= p - buf;
2662 buf = p; 2655 buf = p;
2663 } 2656 }
2664 2657