Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 6246:257b51c37c5a
The HTTP/2 implementation (RFC 7240, 7241).
The SPDY support is removed, as it's incompatible with the new module.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Fri, 11 Sep 2015 20:13:06 +0300 |
parents | 0e3a45ec2a3a |
children | 4d5ac1a31d44 |
comparison
equal
deleted
inserted
replaced
6245:3cf25d33886a | 6246:257b51c37c5a |
---|---|
473 c = r->connection; | 473 c = r->connection; |
474 | 474 |
475 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | 475 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
476 "http init upstream, client timer: %d", c->read->timer_set); | 476 "http init upstream, client timer: %d", c->read->timer_set); |
477 | 477 |
478 #if (NGX_HTTP_SPDY) | 478 #if (NGX_HTTP_V2) |
479 if (r->spdy_stream) { | 479 if (r->stream) { |
480 ngx_http_upstream_init_request(r); | 480 ngx_http_upstream_init_request(r); |
481 return; | 481 return; |
482 } | 482 } |
483 #endif | 483 #endif |
484 | 484 |
1149 } | 1149 } |
1150 | 1150 |
1151 return; | 1151 return; |
1152 } | 1152 } |
1153 | 1153 |
1154 #if (NGX_HTTP_SPDY) | 1154 #if (NGX_HTTP_V2) |
1155 if (r->spdy_stream) { | 1155 if (r->stream) { |
1156 return; | 1156 return; |
1157 } | 1157 } |
1158 #endif | 1158 #endif |
1159 | 1159 |
1160 #if (NGX_HAVE_KQUEUE) | 1160 #if (NGX_HAVE_KQUEUE) |