nginx-0.3.40-RELEASE import
*) Feature: the ngx_http_dav_module supports the MKCOL method.
*) Feature: the "create_full_put_path" directive.
*) Feature: the "$limit_rate" variable.
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index e96ba04..0e3c949 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -366,23 +366,23 @@
static ngx_http_variable_t ngx_http_proxy_vars[] = {
- { ngx_string("proxy_host"), ngx_http_proxy_host_variable, 0,
+ { ngx_string("proxy_host"), NULL, ngx_http_proxy_host_variable, 0,
NGX_HTTP_VAR_CHANGABLE|NGX_HTTP_VAR_NOHASH, 0 },
- { ngx_string("proxy_port"), ngx_http_proxy_port_variable, 0,
+ { ngx_string("proxy_port"), NULL, ngx_http_proxy_port_variable, 0,
NGX_HTTP_VAR_CHANGABLE|NGX_HTTP_VAR_NOHASH, 0 },
- { ngx_string("proxy_add_x_forwarded_for"),
+ { ngx_string("proxy_add_x_forwarded_for"), NULL,
ngx_http_proxy_add_x_forwarded_for_variable, 0, NGX_HTTP_VAR_NOHASH, 0 },
#if 0
- { ngx_string("proxy_add_via"), NULL, 0, NGX_HTTP_VAR_NOHASH, 0 },
+ { ngx_string("proxy_add_via"), NULL, NULL, 0, NGX_HTTP_VAR_NOHASH, 0 },
#endif
- { ngx_string("proxy_internal_body_length"),
+ { ngx_string("proxy_internal_body_length"), NULL,
ngx_http_proxy_internal_body_length_variable, 0, NGX_HTTP_VAR_NOHASH, 0 },
- { ngx_null_string, NULL, 0, 0, 0 }
+ { ngx_null_string, NULL, NULL, 0, 0, 0 }
};
@@ -1382,7 +1382,7 @@
return NGX_ERROR;
}
- var->handler = v->handler;
+ var->get_handler = v->get_handler;
var->data = v->data;
}