From bb28b6d3a455c20077a7e2d7319c24e484694a72 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 11 Jul 2006 13:20:19 +0000 Subject: nginx-0.3.54-RELEASE import *) Feature: nginx now logs the subrequest information to the error log. *) Feature: the "proxy_next_upstream", "fastcgi_next_upstream", and "memcached_next_upstream" directives support the "off" parameter. *) Feature: the "debug_connection" directive supports the CIDR address form. *) Bugfix: if a response of proxied server or FastCGI server was converted from UTF-8 or back, then it may be transferred incomplete. *) Bugfix: the $upstream_response_time variable had the time of the first request to a backend only. *) Bugfix: nginx could not be built on amd64 platform; the bug had appeared in 0.3.53. --- src/http/ngx_http_upstream.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/http/ngx_http_upstream.h') diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h index 086d184b3..8c2a90193 100644 --- a/src/http/ngx_http_upstream.h +++ b/src/http/ngx_http_upstream.h @@ -16,14 +16,15 @@ #include -#define NGX_HTTP_UPSTREAM_FT_ERROR 0x002 -#define NGX_HTTP_UPSTREAM_FT_TIMEOUT 0x004 -#define NGX_HTTP_UPSTREAM_FT_INVALID_HEADER 0x008 -#define NGX_HTTP_UPSTREAM_FT_HTTP_500 0x010 -#define NGX_HTTP_UPSTREAM_FT_HTTP_503 0x020 -#define NGX_HTTP_UPSTREAM_FT_HTTP_404 0x040 -#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK 0x080 -#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING 0x100 +#define NGX_HTTP_UPSTREAM_FT_ERROR 0x00000002 +#define NGX_HTTP_UPSTREAM_FT_TIMEOUT 0x00000004 +#define NGX_HTTP_UPSTREAM_FT_INVALID_HEADER 0x00000008 +#define NGX_HTTP_UPSTREAM_FT_HTTP_500 0x00000010 +#define NGX_HTTP_UPSTREAM_FT_HTTP_503 0x00000020 +#define NGX_HTTP_UPSTREAM_FT_HTTP_404 0x00000040 +#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK 0x00000080 +#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING 0x00000100 +#define NGX_HTTP_UPSTREAM_FT_OFF 0x80000000 #define NGX_HTTP_UPSTREAM_INVALID_HEADER 40 @@ -193,8 +194,6 @@ struct ngx_http_upstream_s { ngx_str_t method; - ngx_http_log_handler_pt saved_log_handler; - ngx_http_upstream_state_t *state; ngx_array_t states; /* of ngx_http_upstream_state_t */ -- cgit