]> git.kaiwu.me - nginx.git/commit
projects / nginx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4332c96) | patch
Merging r4155, r4219, r4220, r4230:
authorIgor Sysoev <igor@sysoev.ru>
Tue, 1 Nov 2011 13:56:26 +0000 (13:56 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Tue, 1 Nov 2011 13:56:26 +0000 (13:56 +0000)
commit07eb7bec1f2c2d440fc87d89c09681e5b6939f94
tree9807c370b073b8f332d9366b552aad073324d752tree | snapshot
parent4332c96e3853fb0c3eaa3b9e7a3df1a61618056ecommit | diff
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.
auto/cc/name diff | blob | history
src/http/ngx_http.c diff | blob | history
src/os/win32/ngx_win32_config.h diff | blob | history
nginx upstream