nginx-0.1.26-RELEASE import

    *) Change: the invalid client header lines are now ignored and logged
       at the info level.

    *) Change: the server name is also logged in error log.

    *) Feature: the ngx_http_auth_basic_module module and the auth_basic
       and auth_basic_user_file directives.
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 1859a34..715d2cf 100644
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -6,18 +6,18 @@
 
     msvc*)
         ngx_makefile=makefile.msvc
-        ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC"
+        ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
 
     ;;
 
     owc*)
         ngx_makefile=makefile.owc
-        ngx_opt="CPU_OPT=$CPU_OPT"
+        ngx_opt="CPU_OPT=\"$CPU_OPT\""
     ;;
 
     bcc)
         ngx_makefile=makefile.bcc
-        ngx_opt="-DCPU_OPT=$CPU_OPT"
+        ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
     ;;
 
 esac
diff --git a/auto/lib/zlib/patch.zlib.h b/auto/lib/zlib/patch.zlib.h
new file mode 100644
index 0000000..122f7fa
--- /dev/null
+++ b/auto/lib/zlib/patch.zlib.h
@@ -0,0 +1,10 @@
+--- zlib.h	Thu Jul  9 20:06:56 1998
++++ zlib-1.1.3/zlib.h	Tue Mar 22 13:41:04 2005
+@@ -709,7 +709,6 @@
+    (0 in case of error).
+ */
+ 
+-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
+ /*
+      Converts, formats, and writes the args to the compressed file under
+    control of the format string, as in fprintf. gzprintf returns the number of