Revert "Rollback SPDY module and SSL config (TLSv1, TLSv1.1)"
This reverts commit 33cd571e41.
This commit is contained in:
@@ -1940,13 +1940,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;
|
||||
@@ -2304,9 +2297,6 @@ ngx_http_subrequest(ngx_http_request_t *r,
|
||||
#if (NGX_HTTP_V2)
|
||||
sr->stream = r->stream;
|
||||
#endif
|
||||
#if (NGX_HTTP_SPDY)
|
||||
sr->spdy_stream = r->spdy_stream;
|
||||
#endif
|
||||
|
||||
sr->method = NGX_HTTP_GET;
|
||||
sr->http_version = r->http_version;
|
||||
@@ -4000,15 +3990,11 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||
}
|
||||
|
||||
if (ngx_strcmp(value[n].data, "spdy") == 0) {
|
||||
#if (NGX_HTTP_SPDY)
|
||||
lsopt.spdy = 1;
|
||||
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
|
||||
"invalid parameter \"spdy\": "
|
||||
"ngx_http_spdy_module was superseded "
|
||||
"by ngx_http_v2_module");
|
||||
continue;
|
||||
#else
|
||||
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||
"the \"spdy\" parameter requires "
|
||||
"ngx_http_spdy_module");
|
||||
return NGX_CONF_ERROR;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (ngx_strncmp(value[n].data, "so_keepalive=", 13) == 0) {
|
||||
|
||||
Reference in New Issue
Block a user