Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 5121:c0f7b94e88ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Preliminary experimental support for SPDY draft 2.
author Valentin Bartenev <vbart@nginx.com>
date Wed, 20 Mar 2013 10:36:57 +0000
parents 08b36f2afc3f
children 9bcf89ca78d2
comparison
equal deleted inserted replaced
5120:7956af6b6a02 5121:c0f7b94e88ba
438 c = r->connection; 438 c = r->connection;
439 439
440 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, 440 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
441 "http init upstream, client timer: %d", c->read->timer_set); 441 "http init upstream, client timer: %d", c->read->timer_set);
442 442
443 #if (NGX_HTTP_SPDY)
444 if (r->spdy_stream) {
445 ngx_http_upstream_init_request(r);
446 return;
447 }
448 #endif
449
443 if (c->read->timer_set) { 450 if (c->read->timer_set) {
444 ngx_del_timer(c->read); 451 ngx_del_timer(c->read);
445 } 452 }
446 453
447 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) { 454 if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
1015 NGX_HTTP_CLIENT_CLOSED_REQUEST); 1022 NGX_HTTP_CLIENT_CLOSED_REQUEST);
1016 } 1023 }
1017 1024
1018 return; 1025 return;
1019 } 1026 }
1027
1028 #if (NGX_HTTP_SPDY)
1029 if (r->spdy_stream) {
1030 return;
1031 }
1032 #endif
1020 1033
1021 #if (NGX_HAVE_KQUEUE) 1034 #if (NGX_HAVE_KQUEUE)
1022 1035
1023 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { 1036 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
1024 1037