nginx-0.2.6-RELEASE import

    *) Change: while using load-balancing the time before the failed
       backend retry was decreased from 60 to 10 seconds.

    *) Change: the "proxy_pass_unparsed_uri" was canceled, the original URI
       now passed, if the URI part is omitted in "proxy_pass" directive.

    *) Feature: the "error_page" directive supports redirects and allows
       more flexible to change an error code.

    *) Change: the charset in the "Content-Type" header line now is ignored
       in proxied subrequests.

    *) Bugfix: if the URI was changed in the "if" block and request did not
       found new configuration, then the ngx_http_rewrite_module rules ran
       again.

    *) Bugfix: if the "set" directive set the ngx_http_geo_module variable
       in some configuration part, the this variable was not available in
       other configuration parts and the "using uninitialized variable"
       error was occurred; the bug had appeared in 0.2.2.
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index a38f65b..6d96737 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -70,7 +70,6 @@
     ngx_flag_t                      pass_request_body;
 
     ngx_flag_t                      redirect_errors;
-    ngx_flag_t                      pass_unparsed_uri;
     ngx_flag_t                      cyclic_temp_file;
 
     ngx_flag_t                      pass_x_powered_by;
@@ -164,6 +163,8 @@
     ngx_http_upstream_state_t      *state;
     ngx_array_t                     states;  /* of ngx_http_upstream_state_t */
 
+    ngx_str_t                       uri;
+
     unsigned                        cachable:1;
     unsigned                        accel:1;