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.

src/http/ngx_http_upstream.c

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index bfaed70..997038c 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -249,13 +249,13 @@
 
 static ngx_http_variable_t  ngx_http_upstream_vars[] = {
 
-    { ngx_string("upstream_status"),
+    { ngx_string("upstream_status"), NULL,
       ngx_http_upstream_status_variable, 0, NGX_HTTP_VAR_NOHASH, 0 },
 
-    { ngx_string("upstream_response_time"),
+    { ngx_string("upstream_response_time"), NULL,
       ngx_http_upstream_response_time_variable, 0, NGX_HTTP_VAR_NOHASH, 0 },
 
-    { ngx_null_string, NULL, 0, 0, 0 }
+    { ngx_null_string, NULL, NULL, 0, 0, 0 }
 };
 
 
@@ -2399,7 +2399,7 @@
             return NGX_ERROR;
         }
 
-        var->handler = v->handler;
+        var->get_handler = v->get_handler;
         var->data = v->data;
     }