aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_core_module.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/http/ngx_http_core_module.c')
-rw-r--r--src/http/ngx_http_core_module.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 5cdf9873b..36f00f61e 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2132,13 +2132,6 @@ ngx_http_gzip_ok(ngx_http_request_t *r)
return NGX_DECLINED;
}
-#if (NGX_HTTP_SPDY)
- if (r->spdy_stream) {
- r->gzip_ok = 1;
- return NGX_OK;
- }
-#endif
-
ae = r->headers_in.accept_encoding;
if (ae == NULL) {
return NGX_DECLINED;
@@ -2480,8 +2473,8 @@ ngx_http_subrequest(ngx_http_request_t *r,
sr->request_body = r->request_body;
-#if (NGX_HTTP_SPDY)
- sr->spdy_stream = r->spdy_stream;
+#if (NGX_HTTP_V2)
+ sr->stream = r->stream;
#endif
sr->method = NGX_HTTP_GET;
@@ -4203,18 +4196,26 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
#endif
}
- if (ngx_strcmp(value[n].data, "spdy") == 0) {
-#if (NGX_HTTP_SPDY)
- lsopt.spdy = 1;
+ if (ngx_strcmp(value[n].data, "http2") == 0) {
+#if (NGX_HTTP_V2)
+ lsopt.http2 = 1;
continue;
#else
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "the \"spdy\" parameter requires "
- "ngx_http_spdy_module");
+ "the \"http2\" parameter requires "
+ "ngx_http_v2_module");
return NGX_CONF_ERROR;
#endif
}
+ if (ngx_strcmp(value[n].data, "spdy") == 0) {
+ ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+ "invalid parameter \"spdy\": "
+ "ngx_http_spdy_module was superseded "
+ "by ngx_http_v2_module");
+ continue;
+ }
+
if (ngx_strncmp(value[n].data, "so_keepalive=", 13) == 0) {
if (ngx_strcmp(&value[n].data[13], "on") == 0) {