diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2015-09-11 20:13:06 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2015-09-11 20:13:06 +0300 |
| commit | ee37ff613fe2a746e23040a7a8aba64063123175 (patch) | |
| tree | 1277a631ca6e5d1581cb366afd63bbb474ab1c46 /src/http/ngx_http_upstream.c | |
| parent | 2c9691431229bfe33e81c5a03a70792548b28e22 (diff) | |
| download | nginx-ee37ff613fe2a746e23040a7a8aba64063123175.tar.gz nginx-ee37ff613fe2a746e23040a7a8aba64063123175.tar.bz2 | |
The HTTP/2 implementation (RFC 7240, 7241).
The SPDY support is removed, as it's incompatible with the new module.
Diffstat (limited to 'src/http/ngx_http_upstream.c')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 31d5c7b1b..153059699 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -475,8 +475,8 @@ ngx_http_upstream_init(ngx_http_request_t *r) ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http init upstream, client timer: %d", c->read->timer_set); -#if (NGX_HTTP_SPDY) - if (r->spdy_stream) { +#if (NGX_HTTP_V2) + if (r->stream) { ngx_http_upstream_init_request(r); return; } @@ -1151,8 +1151,8 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, return; } -#if (NGX_HTTP_SPDY) - if (r->spdy_stream) { +#if (NGX_HTTP_V2) + if (r->stream) { return; } #endif |