Mercurial > hg > nginx-vendor-current
comparison src/http/ngx_http_copy_filter_module.c @ 660:d0f7a625f27c NGINX_1_1_14
nginx 1.1.14
*) Feature: multiple "limit_req" limits may be used simultaneously.
*) Bugfix: in error handling while connecting to a backend.
Thanks to Piotr Sikora.
*) Bugfix: in AIO error handling on FreeBSD.
*) Bugfix: in the OpenSSL library initialization.
*) Bugfix: the "proxy_redirect" directives might not be correctly
inherited.
*) Bugfix: memory leak during reconfiguration if the "pcre_jit"
directive was used.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 30 Jan 2012 00:00:00 +0400 |
parents | 6f21ae02fb01 |
children | 9fbf3ad94cbf |
comparison
equal
deleted
inserted
replaced
659:d48f991d7bd0 | 660:d0f7a625f27c |
---|---|
1 | 1 |
2 /* | 2 /* |
3 * Copyright (C) Igor Sysoev | 3 * Copyright (C) Igor Sysoev |
4 * Copyright (C) Nginx, Inc. | |
4 */ | 5 */ |
5 | 6 |
6 | 7 |
7 #include <ngx_config.h> | 8 #include <ngx_config.h> |
8 #include <ngx_core.h> | 9 #include <ngx_core.h> |
187 continue; | 188 continue; |
188 } | 189 } |
189 | 190 |
190 rc = n; | 191 rc = n; |
191 | 192 |
192 if (file->aio) { | 193 if (rc == NGX_AGAIN) { |
193 file->aio->data = r; | 194 file->aio->data = r; |
194 file->aio->handler = ngx_http_copy_aio_sendfile_event_handler; | 195 file->aio->handler = ngx_http_copy_aio_sendfile_event_handler; |
195 | 196 |
196 r->main->blocked++; | 197 r->main->blocked++; |
197 r->aio = 1; | 198 r->aio = 1; |