From 8a2b2fb4fbd1801a5fb70d86384f2c6fd13c32c3 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 14 Apr 2006 09:53:38 +0000
Subject: 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.
---
 auto/cc/msvc | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'auto/cc/msvc')

diff --git a/auto/cc/msvc b/auto/cc/msvc
index 2f1e8bcd5..5c8acc1b1 100644
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -116,19 +116,25 @@ ngx_binout="-Fe"
 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="\\"
-- 
cgit