Mercurial > hg > nginx-vendor-current
comparison src/event/ngx_event_pipe.c @ 664:f5b859b2f097 NGINX_1_1_16
nginx 1.1.16
*) Change: the simultaneous subrequest limit has been raised to 200.
*) Feature: the "from" parameter of the "disable_symlinks" directive.
*) Feature: the "return" and "error_page" directives can be used to
return 307 redirections.
*) Bugfix: a segmentation fault might occur in a worker process if the
"resolver" directive was used and there was no "error_log" directive
specified at global level.
Thanks to Roman Arutyunyan.
*) Bugfix: a segmentation fault might occur in a worker process if the
"proxy_http_version 1.1" or "fastcgi_keep_conn on" directives were
used.
*) Bugfix: memory leaks.
Thanks to Lanshun Zhou.
*) Bugfix: in the "disable_symlinks" directive.
*) Bugfix: on ZFS filesystem disk cache size might be calculated
incorrectly; the bug had appeared in 1.0.1.
*) Bugfix: nginx could not be built by the icc 12.1 compiler.
*) Bugfix: nginx could not be built by gcc on Solaris; the bug had
appeared in 1.1.15.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 29 Feb 2012 00:00:00 +0400 |
parents | d0f7a625f27c |
children | b5b7eea22fda |
comparison
equal
deleted
inserted
replaced
663:dd668cf20818 | 664:f5b859b2f097 |
---|---|
399 if (p->free_raw_bufs && p->length != -1) { | 399 if (p->free_raw_bufs && p->length != -1) { |
400 cl = p->free_raw_bufs; | 400 cl = p->free_raw_bufs; |
401 | 401 |
402 if (cl->buf->last - cl->buf->pos >= p->length) { | 402 if (cl->buf->last - cl->buf->pos >= p->length) { |
403 | 403 |
404 p->free_raw_bufs = cl->next; | |
405 | |
404 /* STUB */ cl->buf->num = p->num++; | 406 /* STUB */ cl->buf->num = p->num++; |
405 | 407 |
406 if (p->input_filter(p, cl->buf) == NGX_ERROR) { | 408 if (p->input_filter(p, cl->buf) == NGX_ERROR) { |
407 return NGX_ABORT; | 409 return NGX_ABORT; |
408 } | 410 } |
409 | 411 |
410 p->free_raw_bufs = cl->next; | |
411 ngx_free_chain(p->pool, cl); | 412 ngx_free_chain(p->pool, cl); |
412 } | 413 } |
413 } | 414 } |
414 | 415 |
415 if (p->length == 0) { | 416 if (p->length == 0) { |
966 p->free_raw_bufs = cl; | 967 p->free_raw_bufs = cl; |
967 | 968 |
968 return NGX_OK; | 969 return NGX_OK; |
969 } | 970 } |
970 | 971 |
971 /* the first free buf is partialy filled, thus add the free buf after it */ | 972 /* the first free buf is partially filled, thus add the free buf after it */ |
972 | 973 |
973 cl->next = p->free_raw_bufs->next; | 974 cl->next = p->free_raw_bufs->next; |
974 p->free_raw_bufs->next = cl; | 975 p->free_raw_bufs->next = cl; |
975 | 976 |
976 return NGX_OK; | 977 return NGX_OK; |