Mercurial > hg > nginx-quic
comparison src/http/ngx_http_core_module.c @ 8316:13f7085b90d2 quic
Merged with the default branch.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Wed, 17 Feb 2021 14:48:35 +0300 |
parents | 250974f8f8e7 de0b6f1fe4e4 |
children | f1986657fc26 |
comparison
equal
deleted
inserted
replaced
8296:d710c457171c | 8316:13f7085b90d2 |
---|---|
1780 if (ngx_http_set_content_type(r) != NGX_OK) { | 1780 if (ngx_http_set_content_type(r) != NGX_OK) { |
1781 return NGX_HTTP_INTERNAL_SERVER_ERROR; | 1781 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
1782 } | 1782 } |
1783 } | 1783 } |
1784 | 1784 |
1785 if (r->method == NGX_HTTP_HEAD || (r != r->main && val.len == 0)) { | 1785 if (r != r->main && val.len == 0) { |
1786 return ngx_http_send_header(r); | 1786 return ngx_http_send_header(r); |
1787 } | 1787 } |
1788 | 1788 |
1789 b = ngx_calloc_buf(r->pool); | 1789 b = ngx_calloc_buf(r->pool); |
1790 if (b == NULL) { | 1790 if (b == NULL) { |
4104 "ngx_http_v3_module"); | 4104 "ngx_http_v3_module"); |
4105 return NGX_CONF_ERROR; | 4105 return NGX_CONF_ERROR; |
4106 #endif | 4106 #endif |
4107 } | 4107 } |
4108 | 4108 |
4109 if (ngx_strcmp(value[n].data, "spdy") == 0) { | |
4110 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
4111 "invalid parameter \"spdy\": " | |
4112 "ngx_http_spdy_module was superseded " | |
4113 "by ngx_http_v2_module"); | |
4114 continue; | |
4115 } | |
4116 | |
4117 if (ngx_strncmp(value[n].data, "so_keepalive=", 13) == 0) { | 4109 if (ngx_strncmp(value[n].data, "so_keepalive=", 13) == 0) { |
4118 | 4110 |
4119 if (ngx_strcmp(&value[n].data[13], "on") == 0) { | 4111 if (ngx_strcmp(&value[n].data[13], "on") == 0) { |
4120 lsopt.so_keepalive = 1; | 4112 lsopt.so_keepalive = 1; |
4121 | 4113 |