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, 118 insertions, 20 deletions

diff --git a/src/http/ngx_http_script.h b/src/http/ngx_http_script.h
index fae2b7bb1..21927c1f7 100644
--- a/src/http/ngx_http_script.h
+++ b/src/http/ngx_http_script.h
@@ -16,23 +16,48 @@
 typedef struct {
     u_char                         *ip;
     u_char                         *pos;
+    ngx_http_variable_value_t      *sp;
+
+    ngx_str_t                       buf;
+    ngx_str_t                      *line;
+
+    /* the start of the rewritten arguments */
+    u_char                         *args;
+
+    unsigned                        skip:1;
+    unsigned                        quote:1;
+    unsigned                        log:1;
+
+    int                            *captures;
+
+    ngx_int_t                       status;
     ngx_http_request_t             *request;
-} ngx_http_script_lite_engine_t;
+} ngx_http_script_engine_t;
 
 
 typedef struct {
-    ngx_http_script_lite_engine_t   lite;
-} ngx_http_script_engine_t;
+    ngx_conf_t                     *cf;
+    ngx_str_t                      *source;
+    ngx_array_t                   **lengths;
+    ngx_array_t                   **values;
 
+    ngx_uint_t                      variables;
+    ngx_uint_t                      ncaptures;
+    ngx_uint_t                      size;
 
-typedef void (*ngx_http_script_code_pt) (ngx_http_script_engine_t *e);
-typedef size_t (*ngx_http_script_len_code_pt)
-    (ngx_http_script_lite_engine_t *e);
+    void                           *main;
+
+    unsigned                        compile_args:1;
+    unsigned                        compile_null:1;
+    unsigned                        complete_lengths:1;
+    unsigned                        complete_values:1;
 
-typedef ngx_int_t (*ngx_http_script_compile_lite_start_pt) (ngx_table_elt_t *h,
-    ngx_array_t *lengths, ngx_array_t *values, ngx_uint_t value);
-typedef ngx_int_t (*ngx_http_script_compile_lite_end_pt) (ngx_array_t *lengths,
-    ngx_array_t *values);
+    unsigned                        args:1;
+} ngx_http_script_compile_t;
+
+
+typedef void (*ngx_http_script_code_pt) (ngx_http_script_engine_t *e);
+typedef size_t (*ngx_http_script_len_code_pt) (ngx_http_script_engine_t *e);
 
 
 typedef struct {
@@ -47,20 +72,93 @@ typedef struct {
 } ngx_http_script_var_code_t;
 
 
-ngx_int_t ngx_http_script_compile_lite(ngx_conf_t *cf, ngx_array_t *sources,
-    ngx_array_t **lengths, ngx_array_t **values,
-    ngx_http_script_compile_lite_start_pt start,
-    ngx_http_script_compile_lite_end_pt end);
+typedef struct {
+    ngx_http_script_code_pt          code;
+    uintptr_t                        n;
+} ngx_http_script_copy_capture_code_t;
 
 
-static void *ngx_http_script_start_code(ngx_pool_t *pool, ngx_array_t **codes,
-    size_t size);
+typedef struct {
+    ngx_http_script_code_pt          code;
+    ngx_regex_t                     *regex;
+    ngx_array_t                     *lengths;
+    uintptr_t                        size;
+    uintptr_t                        ncaptures;
+    uintptr_t                        status;
+    uintptr_t                        next;
+
+    uintptr_t                        test:1;
+    uintptr_t                        uri:1;
+    uintptr_t                        args:1;
+
+    /* add the r->args to the new arguments */
+    uintptr_t                        add_args:1;
+    
+    uintptr_t                        redirect:1;
+    uintptr_t                        break_cycle:1;
+
+    ngx_str_t                        name;
+} ngx_http_script_regex_code_t;
 
-size_t ngx_http_script_copy_len(ngx_http_script_engine_t *e);
-void ngx_http_script_copy(ngx_http_script_engine_t *e);
-size_t ngx_http_script_copy_var_len(ngx_http_script_engine_t *e);
-void ngx_http_script_copy_var(ngx_http_script_engine_t *e);
 
+typedef struct {
+    ngx_http_script_code_pt          code;
+
+    uintptr_t                        uri:1;
+    uintptr_t                        args:1;
+
+    /* add the r->args to the new arguments */
+    uintptr_t                        add_args:1;
+
+    uintptr_t                        redirect:1;
+} ngx_http_script_regex_end_code_t;
+
+
+typedef struct {
+    ngx_http_script_code_pt          code;
+    uintptr_t                        status;
+    uintptr_t                        null;
+} ngx_http_script_return_code_t;
+
+
+typedef struct {
+    ngx_http_script_code_pt          code;
+    uintptr_t                        next;
+    void                           **loc_conf;
+} ngx_http_script_if_code_t;
+
+
+typedef struct {
+    ngx_http_script_code_pt          code;
+    uintptr_t                        value;
+    uintptr_t                        text_len;
+    uintptr_t                        text_data;
+} ngx_http_script_value_code_t;
+
+
+ngx_uint_t ngx_http_script_variables_count(ngx_str_t *value);
+ngx_int_t ngx_http_script_compile(ngx_http_script_compile_t *sc);
+
+void *ngx_http_script_start_code(ngx_pool_t *pool, ngx_array_t **codes,
+    size_t size);
+void *ngx_http_script_add_code(ngx_array_t *codes, size_t size, void *code);
+
+size_t ngx_http_script_copy_len_code(ngx_http_script_engine_t *e);
+void ngx_http_script_copy_code(ngx_http_script_engine_t *e);
+size_t ngx_http_script_copy_var_len_code(ngx_http_script_engine_t *e);
+void ngx_http_script_copy_var_code(ngx_http_script_engine_t *e);
+size_t ngx_http_script_copy_capture_len_code(ngx_http_script_engine_t *e);
+void ngx_http_script_copy_capture_code(ngx_http_script_engine_t *e);
+void ngx_http_script_regex_start_code(ngx_http_script_engine_t *e);
+void ngx_http_script_regex_end_code(ngx_http_script_engine_t *e);
+void ngx_http_script_copy_capture_code(ngx_http_script_engine_t *e);
+void ngx_http_script_start_args_code(ngx_http_script_engine_t *e);
+void ngx_http_script_return_code(ngx_http_script_engine_t *e);
+void ngx_http_script_if_code(ngx_http_script_engine_t *e);
+void ngx_http_script_value_code(ngx_http_script_engine_t *e);
+void ngx_http_script_set_var_code(ngx_http_script_engine_t *e);
+void ngx_http_script_var_code(ngx_http_script_engine_t *e);
+void ngx_http_script_nop_code(ngx_http_script_engine_t *e);
 
 
 #endif /* _NGX_HTTP_SCRIPT_H_INCLUDED_ */