Mercurial > hg > nginx

comparison src/core/ngx_cycle.c @ 5430:d8ee8ef5dcde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Core: apply missed options to sockets added during binary upgrade. The accept_filter and deferred options were not applied to sockets that were added to configuration during binary upgrade cycle. Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
author Piotr Sikora <piotr@cloudflare.com>
date Thu, 24 Oct 2013 14:18:37 -0700
parents 3d2d3e1cf427
children d39ef821d03e
comparison
equal deleted inserted replaced
5429:e6a1623f87bc 5430:d8ee8ef5dcde
543 } 543 }
544 } 544 }
545 545
546 if (nls[n].fd == (ngx_socket_t) -1) { 546 if (nls[n].fd == (ngx_socket_t) -1) {
547 nls[n].open = 1; 547 nls[n].open = 1;
548 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
549 if (nls[n].accept_filter) {
550 nls[n].add_deferred = 1;
551 }
552 #endif
553 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
554 if (nls[n].deferred_accept) {
555 nls[n].add_deferred = 1;
556 }
557 #endif
548 } 558 }
549 } 559 }
550 560
551 } else { 561 } else {
552 ls = cycle->listening.elts; 562 ls = cycle->listening.elts;