details: https://hg.nginx.org/nginx/rev/de0b6f1fe4e4
branches:
changeset: 7770:de0b6f1fe4e4
user: Maxim Dounin <mdounin@mdounin.ru>
date: Thu Feb 11 21:52:19 2021 +0300
description:
HTTP/2: removed SPDY directives handling.

The spdy_* directives are not available since introduction of HTTP/2 module
in nginx 1.9.5 more than five years ago.

diffstat:

src/http/ngx_http_core_module.c | 8 ----
src/http/v2/ngx_http_v2_module.c | 69 ----------------------------------------
2 files changed, 0 insertions(+), 77 deletions(-)

diffs (108 lines):

diff -r 0a5687a458de -r de0b6f1fe4e4 src/http/ngx_http_core_module.c
--- a/src/http/ngx_http_core_module.c Thu Feb 11 21:52:17 2021 +0300
+++ b/src/http/ngx_http_core_module.c Thu Feb 11 21:52:19 2021 +0300
@@ -4078,14 +4078,6 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx
#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) {
diff -r 0a5687a458de -r de0b6f1fe4e4 src/http/v2/ngx_http_v2_module.c
--- a/src/http/v2/ngx_http_v2_module.c Thu Feb 11 21:52:17 2021 +0300
+++ b/src/http/v2/ngx_http_v2_module.c Thu Feb 11 21:52:19 2021 +0300
@@ -36,8 +36,6 @@ static char *ngx_http_v2_preread_size(ng
static char *ngx_http_v2_streams_index_mask(ngx_conf_t *cf, void *post,
void *data);
static char *ngx_http_v2_chunk_size(ngx_conf_t *cf, void *post, void *data);
-static char *ngx_http_v2_spdy_deprecated(ngx_conf_t *cf, ngx_command_t *cmd,
- void *conf);


static ngx_conf_post_t ngx_http_v2_recv_buffer_size_post =
@@ -152,62 +150,6 @@ static ngx_command_t ngx_http_v2_comman
0,
NULL },

- { ngx_string("spdy_recv_buffer_size"),
- NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
- ngx_http_v2_spdy_deprecated,
- NGX_HTTP_MAIN_CONF_OFFSET,
- 0,
- NULL },
-
- { ngx_string("spdy_pool_size"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
- ngx_http_v2_spdy_deprecated,
- NGX_HTTP_SRV_CONF_OFFSET,
- 0,
- NULL },
-
- { ngx_string("spdy_max_concurrent_streams"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
- ngx_http_v2_spdy_deprecated,
- NGX_HTTP_SRV_CONF_OFFSET,
- 0,
- NULL },
-
- { ngx_string("spdy_streams_index_size"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
- ngx_http_v2_spdy_deprecated,
- NGX_HTTP_SRV_CONF_OFFSET,
- 0,
- NULL },
-
- { ngx_string("spdy_recv_timeout"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
- ngx_http_v2_spdy_deprecated,
- NGX_HTTP_SRV_CONF_OFFSET,
- 0,
- NULL },
-
- { ngx_string("spdy_keepalive_timeout"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
- ngx_http_v2_spdy_deprecated,
- NGX_HTTP_SRV_CONF_OFFSET,
- 0,
- NULL },
-
- { ngx_string("spdy_headers_comp"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
- ngx_http_v2_spdy_deprecated,
- NGX_HTTP_SRV_CONF_OFFSET,
- 0,
- NULL },
-
- { ngx_string("spdy_chunk_size"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
- ngx_http_v2_spdy_deprecated,
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- NULL },
-
ngx_null_command
};

@@ -597,14 +539,3 @@ ngx_http_v2_chunk_size(ngx_conf_t *cf, v

return NGX_CONF_OK;
}
-
-
-static char *
-ngx_http_v2_spdy_deprecated(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
- ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
- "invalid directive \"%V\": ngx_http_spdy_module "
- "was superseded by ngx_http_v2_module", &cmd->name);
-
- return NGX_CONF_OK;
-}
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel