[nginx] svn commit: r4250 - in branches/stable-1.0: . auto/cc src/http src/os/win32

[igor at sysoev.ru]

Author: is
Date: 2011-11-01 13:56:26 +0000 (Tue, 01 Nov 2011)
New Revision: 4250

Modified:
   branches/stable-1.0/
   branches/stable-1.0/auto/cc/name
   branches/stable-1.0/src/http/ngx_http.c
   branches/stable-1.0/src/os/win32/ngx_win32_config.h
Log:
Merging r4155, r4219, r4220, r4230:

Windows related fixes:

*) Fixed segmentation fault with empty config on Windows.
   See here for report:
   http://mailman.nginx.org/pipermail/nginx-ru/2011-September/043288.html

*) Recent SDKs allow to build IPV6 only for Windows XP or above.

*) Fixing conflict with SDK off_t definition.

*) Fix of building by Microsoft Visual C++ 10 compiler.



Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143,4147-4152,4154,4156-4157,4177,4183-4184,4186-4187,4191-4192,4199-4205,4207,4229,4235,4237
   + /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143,4147-4152,4154-4157,4177,4183-4184,4186-4187,4191-4192,4199-4205,4207,4219-4220,4229-4230,4235,4237

Modified: branches/stable-1.0/auto/cc/name
===================================================================
--- branches/stable-1.0/auto/cc/name	2011-11-01 13:49:31 UTC (rev 4249)
+++ branches/stable-1.0/auto/cc/name	2011-11-01 13:56:26 UTC (rev 4250)
@@ -25,6 +25,13 @@
 
 if [ "$CC" = cl ]; then
     if `$NGX_WINE $CC -v 2>&1 \
+        | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16' \
+        >/dev/null 2>&1`; then
+
+        NGX_CC_NAME=msvc10
+        echo " + using Microsoft Visual C++ 10 compiler"
+
+    else if `$NGX_WINE $CC -v 2>&1 \
         | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \
         >/dev/null 2>&1`; then
 
@@ -43,6 +50,7 @@
         echo " + using Microsoft Visual C++ compiler"
     fi
     fi
+    fi
 
 else
 if [ "$CC" = wcl386 ]; then

Modified: branches/stable-1.0/src/http/ngx_http.c
===================================================================
--- branches/stable-1.0/src/http/ngx_http.c	2011-11-01 13:49:31 UTC (rev 4249)
+++ branches/stable-1.0/src/http/ngx_http.c	2011-11-01 13:56:26 UTC (rev 4250)
@@ -1747,10 +1747,12 @@
 
 #if (NGX_WIN32)
     {
-    ngx_iocp_conf_t  *iocpcf;
+    ngx_iocp_conf_t  *iocpcf = NULL;
 
-    iocpcf = ngx_event_get_conf(cf->cycle->conf_ctx, ngx_iocp_module);
-    if (iocpcf->acceptex_read) {
+    if (ngx_get_conf(cf->cycle->conf_ctx, ngx_events_module)) {
+        iocpcf = ngx_event_get_conf(cf->cycle->conf_ctx, ngx_iocp_module);
+    }
+    if (iocpcf && iocpcf->acceptex_read) {
         ls->post_accept_buffer_size = cscf->client_header_buffer_size;
     }
     }

Modified: branches/stable-1.0/src/os/win32/ngx_win32_config.h
===================================================================
--- branches/stable-1.0/src/os/win32/ngx_win32_config.h	2011-11-01 13:49:31 UTC (rev 4249)
+++ branches/stable-1.0/src/os/win32/ngx_win32_config.h	2011-11-01 13:56:26 UTC (rev 4250)
@@ -9,7 +9,7 @@
 
 
 #define WIN32         0x0400
-#define _WIN32_WINNT  0x0500
+#define _WIN32_WINNT  0x0501
 
 
 #define STRICT
@@ -126,8 +126,11 @@
 typedef int                 intptr_t;
 typedef u_int               uintptr_t;
 
+/* Windows defines off_t as long, which is 32-bit */
+typedef __int64             off_t;
+#define _OFF_T_DEFINED
+
 typedef int                 ssize_t;
-typedef __int64             off_t;
 typedef uint32_t            in_addr_t;
 typedef u_short             in_port_t;
 typedef int                 sig_atomic_t;