Mercurial > hg > nginx-vendor-0-8

comparison src/http/ngx_http_request.c @ 260:0effe91f6083 NGINX_0_5_0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.5.0 *) Change: the parameters in the "%name" form in the "log_format" directive are not supported anymore. *) Change: the "proxy_upstream_max_fails", "proxy_upstream_fail_timeout", "fastcgi_upstream_max_fails", "fastcgi_upstream_fail_timeout", "memcached_upstream_max_fails", and "memcached_upstream_fail_timeout" directives are not supported anymore. *) Feature: the "server" directive in the "upstream" context supports the "max_fails", "fail_timeout", and "down" parameters. *) Feature: the "ip_hash" directive inside the "upstream" block. *) Feature: the WAIT status in the "Auth-Status" header line of the IMAP/POP3 proxy authentication server response. *) Bugfix: nginx could not be built on 64-bit platforms; bug appeared in 0.4.14.
author Igor Sysoev <http://sysoev.ru>
date Mon, 04 Dec 2006 00:00:00 +0300
parents 6ae1357b7b7c
children e0b1d0a6c629
comparison
equal deleted inserted replaced
259:c68f18041059 260:0effe91f6083
2407 2407
2408 static u_char * 2408 static u_char *
2409 ngx_http_log_error_handler(ngx_http_request_t *r, ngx_http_request_t *sr, 2409 ngx_http_log_error_handler(ngx_http_request_t *r, ngx_http_request_t *sr,
2410 u_char *buf, size_t len) 2410 u_char *buf, size_t len)
2411 { 2411 {
2412 u_char *p; 2412 char *uri_separator;
2413 ngx_http_upstream_t *u; 2413 u_char *p;
2414 ngx_peer_connection_t *peer; 2414 ngx_http_upstream_t *u;
2415 2415
2416 if (r->server_name.data) { 2416 if (r->server_name.data) {
2417 p = ngx_snprintf(buf, len, ", server: %V", &r->server_name); 2417 p = ngx_snprintf(buf, len, ", server: %V", &r->server_name);
2418 len -= p - buf; 2418 len -= p - buf;
2419 buf = p; 2419 buf = p;
2449 buf = p; 2449 buf = p;
2450 } 2450 }
2451 2451
2452 u = sr->upstream; 2452 u = sr->upstream;
2453 2453
2454 if (u) { 2454 if (u && u->peer.name) {
2455 peer = &u->peer; 2455
2456 uri_separator = "";
2457
2458 #if (NGX_HAVE_UNIX_DOMAIN)
2459 if (u->peer.sockaddr && u->peer.sockaddr->sa_family == AF_UNIX) {
2460 uri_separator = ":";
2461 }
2462 #endif
2456 2463
2457 p = ngx_snprintf(buf, len, ", upstream: \"%V%V%s%V\"", 2464 p = ngx_snprintf(buf, len, ", upstream: \"%V%V%s%V\"",
2458 &u->conf->schema, 2465 &u->conf->schema, u->peer.name,
2459 &peer->peers->peer[peer->cur_peer].name, 2466 uri_separator, &u->uri);
2460 peer->peers->peer[peer->cur_peer].uri_separator,
2461 &u->uri);
2462 len -= p - buf; 2467 len -= p - buf;
2463 buf = p; 2468 buf = p;
2464 } 2469 }
2465 2470
2466 if (r->headers_in.host) { 2471 if (r->headers_in.host) {