Mercurial > hg > nginx

comparison src/http/ngx_http_upstream_round_robin.c @ 1449:5f79db696606 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1444 merge: style fix
author Igor Sysoev <igor@sysoev.ru>
date Sat, 01 Sep 2007 09:55:41 +0000
parents 175edf225f10
children 9b10ba85b249
comparison
equal deleted inserted replaced
1448:efaf4d2b4d61 1449:5f79db696606
426 ssl_session = peer->ssl_session; 426 ssl_session = peer->ssl_session;
427 427
428 rc = ngx_ssl_set_session(pc->connection, ssl_session); 428 rc = ngx_ssl_set_session(pc->connection, ssl_session);
429 429
430 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, 430 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
431 "set session: %p:%d", 431 "set session: %p:%d",
432 ssl_session, ssl_session ? ssl_session->references : 0); 432 ssl_session, ssl_session ? ssl_session->references : 0);
433 433
434 /* ngx_unlock_mutex(rrp->peers->mutex); */ 434 /* ngx_unlock_mutex(rrp->peers->mutex); */
435 435
436 return rc; 436 return rc;
437 } 437 }
451 if (ssl_session == NULL) { 451 if (ssl_session == NULL) {
452 return; 452 return;
453 } 453 }
454 454
455 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, 455 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
456 "save session: %p:%d", ssl_session, ssl_session->references); 456 "save session: %p:%d", ssl_session, ssl_session->references);
457 457
458 peer = &rrp->peers->peer[rrp->current]; 458 peer = &rrp->peers->peer[rrp->current];
459 459
460 /* TODO: threads only mutex */ 460 /* TODO: threads only mutex */
461 /* ngx_lock_mutex(rrp->peers->mutex); */ 461 /* ngx_lock_mutex(rrp->peers->mutex); */
466 /* ngx_unlock_mutex(rrp->peers->mutex); */ 466 /* ngx_unlock_mutex(rrp->peers->mutex); */
467 467
468 if (old_ssl_session) { 468 if (old_ssl_session) {
469 469
470 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0, 470 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
471 "old session: %p:%d", 471 "old session: %p:%d",
472 old_ssl_session, old_ssl_session->references); 472 old_ssl_session, old_ssl_session->references);
473 473
474 /* TODO: may block */ 474 /* TODO: may block */
475 475
476 ngx_ssl_free_session(old_ssl_session); 476 ngx_ssl_free_session(old_ssl_session);