nginx-0.3.38-RELEASE import
*) Feature: the ngx_http_dav_module.
*) Change: the ngx_http_perl_module optimizations.
Thanks to Sergey Skvortsov.
*) Feature: the ngx_http_perl_module supports the $r->request_body_file
method.
*) Feature: the "client_body_in_file_only" directive.
*) Workaround: now on disk overflow nginx tries to write access logs
once a second only.
Thanks to Anton Yuzhaninov and Maxim Dounin.
*) Bugfix: now the "limit_rate" directive more precisely limits rate if
rate is more than 100 Kbyte/s.
Thanks to ForJest.
*) Bugfix: now the IMAP/POP3 proxy escapes the "\r" and "\n" symbols in
login and password to pass authorization server.
Thanks to Maxim Dounin.
diff --git a/auto/cc/msvc b/auto/cc/msvc
index 2f1e8bc..5c8acc1 100644
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -116,19 +116,25 @@
ngx_objext="obj"
ngx_binext=".exe"
-# Borland make
-#ngx_long_start='@&&|
-# '
-#ngx_long_end='|'
+if [ "$BMAKE" = nmake ]; then
+ # MS nmake
-# MS nmake
-ngx_long_start='@<<
+ ngx_long_start='@<<
'
-ngx_long_end='<<'
-ngx_long_regex_cont=' \
+ ngx_long_end='<<'
+ ngx_long_regex_cont=' \
'
-ngx_long_cont='
+ ngx_long_cont='
'
+
+else
+ # Borland make
+
+ ngx_long_start='@&&|
+ '
+ ngx_long_end='|'
+fi
+
# MSVC understand / in path
#ngx_regex_dirsep='\\'
#ngx_dirsep="\\"
diff --git a/auto/make b/auto/make
index 3031653..346770a 100644
--- a/auto/make
+++ b/auto/make
@@ -22,7 +22,7 @@
END
-if [ "$CC" = wcl386 ]; then
+if [ "$BMAKE" = wmake ]; then
echo MAKE = wmake >> $NGX_MAKEFILE
ngx_regex_cont=' '
diff --git a/auto/modules b/auto/modules
index 56dad56..6704046 100644
--- a/auto/modules
+++ b/auto/modules
@@ -127,6 +127,11 @@
HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE"
+if [ $HTTP_DAV = YES ]; then
+ HTTP_MODULES="$HTTP_MODULES $HTTP_DAV_MODULE"
+ HTTP_SRCS="$HTTP_SRCS $HTTP_DAV_SRCS"
+fi
+
if [ $HTTP_AUTOINDEX = YES ]; then
have=NGX_HTTP_AUTOINDEX . auto/have
HTTP_MODULES="$HTTP_MODULES $HTTP_AUTOINDEX_MODULE"
diff --git a/auto/options b/auto/options
index f80b5fc..bece290 100644
--- a/auto/options
+++ b/auto/options
@@ -53,6 +53,7 @@
HTTP_POSTPONE=NO
HTTP_REALIP=NO
HTTP_ADDITION=NO
+HTTP_DAV=NO
HTTP_ACCESS=YES
HTTP_AUTH_BASIC=YES
HTTP_USERID=YES
@@ -141,6 +142,8 @@
--with-http_ssl_module) HTTP_SSL=YES ;;
--with-http_realip_module) HTTP_REALIP=YES ;;
--with-http_addition_module) HTTP_ADDITION=YES ;;
+ --with-http_dav_module) HTTP_DAV=YES ;;
+
--without-http_charset_module) HTTP_CHARSET=NO ;;
--without-http_gzip_module) HTTP_GZIP=NO ;;
--without-http_ssi_module) HTTP_SSI=NO ;;
diff --git a/auto/sources b/auto/sources
index 4731f48..bcb71f3 100644
--- a/auto/sources
+++ b/auto/sources
@@ -323,6 +323,10 @@
HTTP_ADDITION_SRCS=src/http/modules/ngx_http_addition_filter_module.c
+HTTP_DAV_MODULE=ngx_http_dav_module
+HTTP_DAV_SRCS=src/http/modules/ngx_http_dav_module.c
+
+
HTTP_ACCESS_MODULE=ngx_http_access_module
HTTP_ACCESS_SRCS=src/http/modules/ngx_http_access_module.c
