Mercurial > hg > nginx

comparison src/http/v2/ngx_http_v2_module.c @ 7770:de0b6f1fe4e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Feb 2021 21:52:19 +0300
parents 641306096f5b
children 02be1baed382
comparison
equal deleted inserted replaced
7769:0a5687a458de 7770:de0b6f1fe4e4
34 static char *ngx_http_v2_pool_size(ngx_conf_t *cf, void *post, void *data); 34 static char *ngx_http_v2_pool_size(ngx_conf_t *cf, void *post, void *data);
35 static char *ngx_http_v2_preread_size(ngx_conf_t *cf, void *post, void *data); 35 static char *ngx_http_v2_preread_size(ngx_conf_t *cf, void *post, void *data);
36 static char *ngx_http_v2_streams_index_mask(ngx_conf_t *cf, void *post, 36 static char *ngx_http_v2_streams_index_mask(ngx_conf_t *cf, void *post,
37 void *data); 37 void *data);
38 static char *ngx_http_v2_chunk_size(ngx_conf_t *cf, void *post, void *data); 38 static char *ngx_http_v2_chunk_size(ngx_conf_t *cf, void *post, void *data);
39 static char *ngx_http_v2_spdy_deprecated(ngx_conf_t *cf, ngx_command_t *cmd,
40 void *conf);
41 39
42 40
43 static ngx_conf_post_t ngx_http_v2_recv_buffer_size_post = 41 static ngx_conf_post_t ngx_http_v2_recv_buffer_size_post =
44 { ngx_http_v2_recv_buffer_size }; 42 { ngx_http_v2_recv_buffer_size };
45 static ngx_conf_post_t ngx_http_v2_pool_size_post = 43 static ngx_conf_post_t ngx_http_v2_pool_size_post =
146 NULL }, 144 NULL },
147 145
148 { ngx_string("http2_push"), 146 { ngx_string("http2_push"),
149 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, 147 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
150 ngx_http_v2_push, 148 ngx_http_v2_push,
151 NGX_HTTP_LOC_CONF_OFFSET,
152 0,
153 NULL },
154
155 { ngx_string("spdy_recv_buffer_size"),
156 NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
157 ngx_http_v2_spdy_deprecated,
158 NGX_HTTP_MAIN_CONF_OFFSET,
159 0,
160 NULL },
161
162 { ngx_string("spdy_pool_size"),
163 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
164 ngx_http_v2_spdy_deprecated,
165 NGX_HTTP_SRV_CONF_OFFSET,
166 0,
167 NULL },
168
169 { ngx_string("spdy_max_concurrent_streams"),
170 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
171 ngx_http_v2_spdy_deprecated,
172 NGX_HTTP_SRV_CONF_OFFSET,
173 0,
174 NULL },
175
176 { ngx_string("spdy_streams_index_size"),
177 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
178 ngx_http_v2_spdy_deprecated,
179 NGX_HTTP_SRV_CONF_OFFSET,
180 0,
181 NULL },
182
183 { ngx_string("spdy_recv_timeout"),
184 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
185 ngx_http_v2_spdy_deprecated,
186 NGX_HTTP_SRV_CONF_OFFSET,
187 0,
188 NULL },
189
190 { ngx_string("spdy_keepalive_timeout"),
191 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
192 ngx_http_v2_spdy_deprecated,
193 NGX_HTTP_SRV_CONF_OFFSET,
194 0,
195 NULL },
196
197 { ngx_string("spdy_headers_comp"),
198 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
199 ngx_http_v2_spdy_deprecated,
200 NGX_HTTP_SRV_CONF_OFFSET,
201 0,
202 NULL },
203
204 { ngx_string("spdy_chunk_size"),
205 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
206 ngx_http_v2_spdy_deprecated,
207 NGX_HTTP_LOC_CONF_OFFSET, 149 NGX_HTTP_LOC_CONF_OFFSET,
208 0, 150 0,
209 NULL }, 151 NULL },
210 152
211 ngx_null_command 153 ngx_null_command
595 *sp = NGX_HTTP_V2_MAX_FRAME_SIZE; 537 *sp = NGX_HTTP_V2_MAX_FRAME_SIZE;
596 } 538 }
597 539
598 return NGX_CONF_OK; 540 return NGX_CONF_OK;
599 } 541 }
600
601
602 static char *
603 ngx_http_v2_spdy_deprecated(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
604 {
605 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
606 "invalid directive \"%V\": ngx_http_spdy_module "
607 "was superseded by ngx_http_v2_module", &cmd->name);
608
609 return NGX_CONF_OK;
610 }