Mercurial > hg > nginx
annotate auto/os/win32 @ 4957:7556a7acb14f stable-1.2
Merge of r4921, r4922, r4923, r4924, r4925: request body fixes.
*) Request body: fixed "501 Not Implemented" error handling.
It is not about "Method" but a generic message, and is expected to be used
e.g. if specified Transfer-Encoding is not supported. Fixed message to
match RFC 2616.
Additionally, disable keepalive on such errors as we won't be able to read
request body correctly if we don't understand Transfer-Encoding used.
*) Request body: $request_body variable generalization.
The $request_body variable was assuming there can't be more than two
buffers. While this is currently true due to request body reading
implementation details, this is not a good thing to depend on and may
change in the future.
*) Request body: code duplication reduced, no functional changes.
The r->request_body_in_file_only with empty body case is now handled in
ngx_http_write_request_body().
*) Request body: fixed socket leak on errors.
The r->main->count reference counter was always incremented in
ngx_http_read_client_request_body(), while it is only needs to be
incremented on positive returns.
*) Request body: properly handle events while discarding body.
An attempt to call ngx_handle_read_event() before actually reading
data from a socket might result in read event being disabled, which is
wrong. Catched by body.t test on Solaris.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 11 Dec 2012 13:18:50 +0000 |
parents | d620f497c50f |
children | 3d2d3e1cf427 |
rev | line source |
---|---|
455 | 1 |
2 # Copyright (C) Igor Sysoev | |
4412 | 3 # Copyright (C) Nginx, Inc. |
455 | 4 |
5 | |
509 | 6 have=NGX_WIN32 . auto/have_headers |
455 | 7 |
8 CORE_INCS="$WIN32_INCS" | |
9 CORE_DEPS="$WIN32_DEPS" | |
10 CORE_SRCS="$WIN32_SRCS $IOCP_SRCS" | |
11 OS_CONFIG="$WIN32_CONFIG" | |
2731
06d53ecd70c8
*) move advapi32.lib to core libs since it's required for Registry and Event Log
Igor Sysoev <igor@sysoev.ru>
parents:
509
diff
changeset
|
12 CORE_LIBS="$CORE_LIBS advapi32.lib ws2_32.lib" |
461 | 13 NGX_ICONS="$NGX_WIN32_ICONS" |
2813
c00763aa5e1b
divide select module into two modules: Unix and Win32 ones
Igor Sysoev <igor@sysoev.ru>
parents:
2731
diff
changeset
|
14 SELECT_SRCS=$WIN32_SELECT_SRCS |
455 | 15 |
16 EVENT_MODULES="$EVENT_MODULES $IOCP_MODULE" | |
17 EVENT_FOUND=YES | |
18 | |
19 if [ $EVENT_SELECT = NO ]; then | |
20 CORE_SRCS="$CORE_SRCS $SELECT_SRCS" | |
21 EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE" | |
22 fi | |
23 | |
2814 | 24 if [ $NGX_IPV6 = YES ]; then |
25 have=NGX_HAVE_INET6 . auto/have | |
26 fi | |
27 | |
469 | 28 have=NGX_HAVE_AIO . auto/have |
29 have=NGX_HAVE_IOCP . auto/have |