nginx-0.1.29-RELEASE importrelease-0.1.29

    *) Feature: the ngx_http_ssi_module supports "include virtual" command.

    *) Feature: the ngx_http_ssi_module supports the condition command like
       'if expr="$NAME"' and "else" and "endif" commands. Only one nested
       level is supported.

    *) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
       DATE_GMT variables and "config timefmt" command.

    *) Feature: the "ssi_ignore_recycled_buffers" directive.

    *) Bugfix: the "echo" command did not show the default value for the
       empty QUERY_STRING variable.

    *) Change: the ngx_http_proxy_module was rewritten.

    *) Feature: the "proxy_redirect", "proxy_pass_request_headers",
       "proxy_pass_request_body", and "proxy_method" directives.

    *) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
       canceled and must be replaced with the proxy_set_header directive.

    *) Change: the "proxy_preserve_host" is canceled and must be replaced
       with the "proxy_set_header Host $host" and the "proxy_redirect off"
       directives, the "proxy_set_header Host $host:$proxy_port" directive
       and the appropriate proxy_redirect directives.

    *) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
       with the "proxy_set_header X-Real-IP $remote_addr" directive.

    *) Change: the "proxy_add_x_forwarded_for" is canceled and must be
       replaced with
       the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
       directive.

    *) Change: the "proxy_set_x_url" is canceled and must be replaced with
       the "proxy_set_header X-URL http://$host:$server_port$request_uri"
       directive.

    *) Feature: the "fastcgi_param" directive.

    *) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
       directive are canceled and must be replaced with the fastcgi_param
       directives.

    *) Feature: the "index" directive can use the variables.

    *) Feature: the "index" directive can be used at http and server levels.

    *) Change: the last index only in the "index" directive can be absolute.

    *) Feature: the "rewrite" directive can use the variables.

    *) Feature: the "internal" directive.

    *) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
       SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
       REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.

    *) Change: nginx now passes the invalid lines in a client request
       headers or a backend response header.

    *) Bugfix: if the backend did not transfer response for a long time and
       the "send_timeout" was less than "proxy_read_timeout", then nginx
       returned the 408 response.

    *) Bugfix: the segmentation fault was occurred if the backend sent an
       invalid line in response header; the bug had appeared in 0.1.26.

    *) Bugfix: the segmentation fault may occurred in FastCGI fault
       tolerance configuration.

    *) Bugfix: the "expires" directive did not remove the previous
       "Expires" and "Cache-Control" headers.

    *) Bugfix: nginx did not take into account trailing dot in "Host"
       header line.

    *) Bugfix: the ngx_http_auth_module did not work under Linux.

    *) Bugfix: the rewrite directive worked incorrectly, if the arguments
       were in a request.

    *) Bugfix: nginx could not be built on MacOS X.

1 files changed, 102 insertions, 49 deletions

diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index c1bc0d9e7..cf2aeaa0e 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -29,88 +29,141 @@
 
 
 typedef struct {
-    time_t                      bl_time;
-    ngx_uint_t                  bl_state;
+    time_t                          bl_time;
+    ngx_uint_t                      bl_state;
 
-    ngx_uint_t                  status;
-    time_t                      time;
+    ngx_uint_t                      status;
+    time_t                          time;
     
-    ngx_str_t                  *peer;
+    ngx_str_t                      *peer;
 } ngx_http_upstream_state_t;
 
 
 typedef struct {
-    ngx_msec_t                  connect_timeout;
-    ngx_msec_t                  send_timeout;
-    ngx_msec_t                  read_timeout;
+    ngx_hash_t                      headers_in_hash;
+} ngx_http_upstream_main_conf_t;
 
-    size_t                      send_lowat;
-    size_t                      header_buffer_size;
-    size_t                      busy_buffers_size;
-    size_t                      max_temp_file_size;
-    size_t                      temp_file_write_size;
 
-    ngx_uint_t                  next_upstream;
+typedef struct {
+    ngx_msec_t                      connect_timeout;
+    ngx_msec_t                      send_timeout;
+    ngx_msec_t                      read_timeout;
+
+    size_t                          send_lowat;
+    size_t                          header_buffer_size;
+    size_t                          busy_buffers_size;
+    size_t                          max_temp_file_size;
+    size_t                          temp_file_write_size;
+
+    ngx_uint_t                      next_upstream;
+    ngx_uint_t                      method;
+
+    ngx_bufs_t                      bufs;
+
+    ngx_flag_t                      pass_request_headers;
+    ngx_flag_t                      pass_request_body;
 
-    ngx_bufs_t                  bufs;
+    ngx_flag_t                      redirect_errors;
+    ngx_flag_t                      pass_unparsed_uri;
+    ngx_flag_t                      cyclic_temp_file;
 
-    ngx_flag_t                  redirect_errors;
-    ngx_flag_t                  pass_unparsed_uri;
-    ngx_flag_t                  x_powered_by;
-    ngx_flag_t                  cyclic_temp_file;
+    ngx_flag_t                      pass_x_powered_by;
+    ngx_flag_t                      pass_server;
+    ngx_flag_t                      pass_date;
+    ngx_flag_t                      pass_x_accel_expires;
 
-    ngx_path_t                 *temp_path;
+    ngx_path_t                     *temp_path;
+
+    ngx_str_t                       schema;
+    ngx_str_t                       uri;
+    ngx_str_t                      *location;
+    ngx_str_t                       url;  /* used in proxy_rewrite_location */
 } ngx_http_upstream_conf_t;
 
 
-typedef struct ngx_http_upstream_s  ngx_http_upstream_t;
+typedef struct {
+    ngx_str_t                       name;
+    ngx_http_header_handler_pt      handler;
+    ngx_uint_t                      offset;
+    ngx_http_header_handler_pt      copy_handler;
+    ngx_uint_t                      conf;
+} ngx_http_upstream_header_t;
+
+
+typedef struct {
+    ngx_list_t                      headers;
+
+    ngx_table_elt_t                *status;
+    ngx_table_elt_t                *date;
+    ngx_table_elt_t                *server;
+    ngx_table_elt_t                *connection;
+
+    ngx_table_elt_t                *expires;
+    ngx_table_elt_t                *etag;
+    ngx_table_elt_t                *x_accel_expires;
+
+    ngx_table_elt_t                *content_type;
+    ngx_table_elt_t                *content_length;
+
+    ngx_table_elt_t                *last_modified;
+    ngx_table_elt_t                *location;
+    ngx_table_elt_t                *accept_ranges;
+
+#if (NGX_HTTP_GZIP)
+    ngx_table_elt_t                *content_encoding;
+#endif
+
+    ngx_array_t                     cache_control;
+} ngx_http_upstream_headers_in_t;
+
 
 struct ngx_http_upstream_s {
-    ngx_http_request_t         *request;
+    ngx_http_request_t             *request;
+
+    ngx_peer_connection_t           peer;
 
-    ngx_peer_connection_t       peer;
+    ngx_event_pipe_t                pipe;
 
-    ngx_event_pipe_t            pipe;
+    ngx_chain_t                    *request_bufs;
 
-    ngx_output_chain_ctx_t      output;
-    ngx_chain_writer_ctx_t      writer;
+    ngx_output_chain_ctx_t          output;
+    ngx_chain_writer_ctx_t          writer;
 
-    ngx_http_upstream_conf_t   *conf;
+    ngx_http_upstream_conf_t       *conf;
 
-    ngx_buf_t                   header_in;
+    ngx_http_upstream_headers_in_t  headers_in;
 
-    ngx_int_t                 (*create_request)(ngx_http_request_t *r);
-    ngx_int_t                 (*reinit_request)(ngx_http_request_t *r);
-    ngx_int_t                 (*process_header)(ngx_http_request_t *r);
-    ngx_int_t                 (*send_header)(ngx_http_request_t *r);
-    void                      (*abort_request)(ngx_http_request_t *r);
-    void                      (*finalize_request)(ngx_http_request_t *r,
-                                                  ngx_int_t rc);
-    ngx_uint_t                  method;
+    ngx_buf_t                       header_in;
 
-    ngx_str_t                   schema0;
-    ngx_str_t                   uri0;
-    ngx_str_t                  *location0;
+    ngx_int_t                     (*create_request)(ngx_http_request_t *r);
+    ngx_int_t                     (*reinit_request)(ngx_http_request_t *r);
+    ngx_int_t                     (*process_header)(ngx_http_request_t *r);
+    void                          (*abort_request)(ngx_http_request_t *r);
+    void                          (*finalize_request)(ngx_http_request_t *r,
+                                        ngx_int_t rc);
+    ngx_int_t                     (*rewrite_redirect)(ngx_http_request_t *r,
+                                        ngx_table_elt_t *h, size_t prefix);
 
-    ngx_http_log_ctx_t         *log_ctx;
-    ngx_log_handler_pt          log_handler;
-    ngx_http_log_ctx_t         *saved_log_ctx;
-    ngx_log_handler_pt          saved_log_handler;
+    ngx_uint_t                      method;
 
-    ngx_http_upstream_state_t  *state;
-    ngx_array_t                 states;    /* of ngx_http_upstream_state_t */
+    ngx_http_log_handler_pt         saved_log_handler;
 
-    unsigned                    cachable:1;
+    ngx_http_upstream_state_t      *state;
+    ngx_array_t                     states;  /* of ngx_http_upstream_state_t */
 
-    unsigned                    request_sent:1;
-    unsigned                    header_sent:1;
+    unsigned                        cachable:1;
+    unsigned                        accel:1;
+
+    unsigned                        request_sent:1;
+    unsigned                        header_sent:1;
 };
 
 
 void ngx_http_upstream_init(ngx_http_request_t *r);
-u_char *ngx_http_upstream_log_error(ngx_log_t *log, u_char *buf, size_t len);
 
 
+extern ngx_module_t  ngx_http_upstream_module;
+
 extern char *ngx_http_upstream_header_errors[];