nginx-0.3.50-RELEASE import

    *) Change: the "proxy_redirect_errors" and "fastcgi_redirect_errors"
       directives was renamed to the "proxy_intercept_errors" and
       "fastcgi_intercept_errors" directives.

    *) Feature: the ngx_http_charset_module supports the recoding from the
       single byte encodings to the UTF-8 encoding and back.

    *) Feature: the "X-Accel-Charset" response header line is supported in
       proxy and FastCGI mode.

    *) Bugfix: the "\" escape symbol in the "\"" and "\'" pairs in the SSI
       command was removed only if the command also has the "$" symbol.

    *) Bugfix: the "<!--" string might be added on some conditions in the
       SSI after inclusion.

    *) Bugfix: if the "Content-Length: 0" header line was in response, then
       in nonbuffered proxying mode the client connection was not closed.
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index a694ee5..0bec204 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -9,6 +9,7 @@
 
 
 #define NGX_HTTP_MAX_URI_CHANGES           10
+#define NGX_HTTP_MAX_SUBREQUESTS           50
 
 /* must be 2^n */
 #define NGX_HTTP_LC_HEADER_LEN             32
@@ -228,10 +229,13 @@
     ngx_table_elt_t                  *expires;
     ngx_table_elt_t                  *etag;
 
+    ngx_str_t                        *override_charset;
+
+    size_t                            content_type_len;
     ngx_str_t                         content_type;
     ngx_str_t                         charset;
-    ngx_array_t                       ranges;
 
+    ngx_array_t                       ranges;
     ngx_array_t                       cache_control;
 
     off_t                             content_length_n;
@@ -446,6 +450,8 @@
     unsigned                          stat_writing:1;
 #endif
 
+    unsigned                          subrequests:8;
+
     /* used to parse HTTP headers */
     ngx_uint_t                        state;
     u_char                           *uri_start;