diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2021-02-17 14:48:35 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2021-02-17 14:48:35 +0300 |
| commit | 8ca2f73073da431d8e747589eac5b49a7c0faa5b (patch) | |
| tree | 6d5f46eb2dccc4cacc13a3e353f78f940f310bbb /src/http/ngx_http_core_module.c | |
| parent | b93b056261114022b08f11413f959d3af687b7a7 (diff) | |
| parent | 949c97007b9c6010e958c36653e33c3f5bf34540 (diff) | |
| download | nginx-8ca2f73073da431d8e747589eac5b49a7c0faa5b.tar.gz nginx-8ca2f73073da431d8e747589eac5b49a7c0faa5b.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index d4e1910bf..25339130e 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1782,7 +1782,7 @@ ngx_http_send_response(ngx_http_request_t *r, ngx_uint_t status, } } - if (r->method == NGX_HTTP_HEAD || (r != r->main && val.len == 0)) { + if (r != r->main && val.len == 0) { return ngx_http_send_header(r); } @@ -4106,14 +4106,6 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) #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) { |