Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_upstream_round_robin.c @ 332:3a91bfeffaba NGINX_0_6_10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.10 *) Feature: the "open_file_cache", "open_file_cache_retest", and "open_file_cache_errors" directives. *) Bugfix: socket leak; bug appeared in 0.6.7. *) Bugfix: a charset set by the "charset" directive was not appended to the "Content-Type" header set by $r->send_http_header(). *) Bugfix: a segmentation fault might occur in worker process if /dev/poll method was used.
author Igor Sysoev <http://sysoev.ru>
date Mon, 03 Sep 2007 00:00:00 +0400
parents 5e3b425174f6
children 3f511163d908
comparison
equal deleted inserted replaced
331:b69d5e83bf82 332:3a91bfeffaba
606 ssl_session = peer->ssl_session; 606 ssl_session = peer->ssl_session;
607 607
608 rc = ngx_ssl_set_session(pc->connection, ssl_session); 608 rc = ngx_ssl_set_session(pc->connection, ssl_session);
609 609
610 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, 610 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
611 "set session: %p:%d", 611 "set session: %p:%d",
612 ssl_session, ssl_session ? ssl_session->references : 0); 612 ssl_session, ssl_session ? ssl_session->references : 0);
613 613
614 /* ngx_unlock_mutex(rrp->peers->mutex); */ 614 /* ngx_unlock_mutex(rrp->peers->mutex); */
615 615
616 return rc; 616 return rc;
617 } 617 }
631 if (ssl_session == NULL) { 631 if (ssl_session == NULL) {
632 return; 632 return;
633 } 633 }
634 634
635 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, 635 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
636 "save session: %p:%d", ssl_session, ssl_session->references); 636 "save session: %p:%d", ssl_session, ssl_session->references);
637 637
638 peer = &rrp->peers->peer[rrp->current]; 638 peer = &rrp->peers->peer[rrp->current];
639 639
640 /* TODO: threads only mutex */ 640 /* TODO: threads only mutex */
641 /* ngx_lock_mutex(rrp->peers->mutex); */ 641 /* ngx_lock_mutex(rrp->peers->mutex); */
646 /* ngx_unlock_mutex(rrp->peers->mutex); */ 646 /* ngx_unlock_mutex(rrp->peers->mutex); */
647 647
648 if (old_ssl_session) { 648 if (old_ssl_session) {
649 649
650 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, 650 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
651 "old session: %p:%d", 651 "old session: %p:%d",
652 old_ssl_session, old_ssl_session->references); 652 old_ssl_session, old_ssl_session->references);
653 653
654 /* TODO: may block */ 654 /* TODO: may block */
655 655
656 ngx_ssl_free_session(old_ssl_session); 656 ngx_ssl_free_session(old_ssl_session);