nginx-0.4.4-RELEASE

fix msvc build failure introduced by previous commit

diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index c92d881f4b504cf464abaac992b039be030f0da2..b56b1e6317249c8535506e7094dd61046daf9059 100644 (file)
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -9,6 +9,72 @@
 <title lang="en">nginx changelog</title>
 
 
+<changes ver="0.4.4" date="02.10.2006">
+
+<change type="feature">
+<para lang="ru">
+ÐÅÒÅÍÅÎÎÁÑ scheme.
+</para>
+<para lang="en">
+the "scheme" variable.
+</para>
+</change>
+
+<change type="feature">
+<para lang="ru">
+ÄÉÒÅËÔÉ×Á expires ÐÏÄÄÅÒÖÉ×ÁÅÔ ÐÁÒÁÍÅÔÒ max.
+</para>
+<para lang="en">
+the "expires" directive supports the "max" parameter.
+</para>
+</change>
+
+<change type="feature">
+<para lang="ru">
+ÄÉÒÅËÔÉ×Á include ÐÏÄÄÅÒÖÉ×ÁÅÔ ÍÁÓËÕ "*".<br/>
+óÐÁÓÉÂÏ Jonathan Dance.
+</para>
+<para lang="en">
+the "include" directive supports the "*" mask.<br/>
+Thanks to Jonathan Dance.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+ÄÉÒÅËÔÉ×Á return ×ÓÅÇÄÁ ÉÚÍÅÎÑÌÁ ËÏÄ ÏÔ×ÅÔÁ, ÐÅÒÅÎÁÐÒÁ×ÌÅÎÎÏÇÏ
+ÄÉÒÅËÔÉ×ÏÊ error_page.
+</para>
+<para lang="en">
+the "return" directive always overrode the "error_page" response code
+redirected by the "error_page" directive.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+ÐÒÏÉÓÈÏÄÉÌ segmentation fault, ÅÓÌÉ × ÍÅÔÏÄÅ PUT ÐÅÒÅÄÁ×ÁÌÏÓØ
+ÔÅÌÏ ÎÕÌÅ×ÏÊ ÄÌÉÎÙ.
+</para>
+<para lang="en">
+a segmentation fault occurred if zero-length body was in PUT method.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÐÅÒÅÍÅÎÎÙÈ × ÄÉÒÅËÔÉ×Å proxy_redirect ÒÅÄÉÒÅËÔ
+ÉÚÍÅÎÑÌÓÑ ÎÅ×ÅÒÎÏ.
+</para>
+<para lang="en">
+the redirect was changed incorrectly if the variables were used
+in the "proxy_redirect" directive.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="0.4.3" date="26.09.2006">
 
 <change type="change">

diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 7dc9cc1460bb22c477945caf45be949c659e8a9c..e6db0b7c6c3f5eebbc51dd49b87d7379919ec7f1 100644 (file)
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -786,7 +786,7 @@ ngx_http_variable_scheme(ngx_http_request_t *r,
         v->valid = 1;
         v->no_cachable = 0;
         v->not_found = 0;
-        v->data = "https";
+        v->data = (u_char *) "https";
 
         return NGX_OK;
     }
@@ -797,7 +797,7 @@ ngx_http_variable_scheme(ngx_http_request_t *r,
     v->valid = 1;
     v->no_cachable = 0;
     v->not_found = 0;
-    v->data = "http";
+    v->data = (u_char *) "http";
 
     return NGX_OK;
 }