Mercurial > hg > nginx

comparison src/http/ngx_http_request.c @ 8664:f61d347158d0 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Tue, 15 Dec 2020 16:55:43 +0000
parents 9dce2978e4fd 2fec22332ff4
children e1eb7f4ca9f1
comparison
equal deleted inserted replaced
8663:1823e2152fc4 8664:f61d347158d0
1296 r->uri.len = r->args_start - 1 - r->uri_start; 1296 r->uri.len = r->args_start - 1 - r->uri_start;
1297 } else { 1297 } else {
1298 r->uri.len = r->uri_end - r->uri_start; 1298 r->uri.len = r->uri_end - r->uri_start;
1299 } 1299 }
1300 1300
1301 if (r->complex_uri || r->quoted_uri) { 1301 if (r->complex_uri || r->quoted_uri || r->empty_path_in_uri) {
1302 1302
1303 r->uri.data = ngx_pnalloc(r->pool, r->uri.len + 1); 1303 if (r->empty_path_in_uri) {
1304 r->uri.len++;
1305 }
1306
1307 r->uri.data = ngx_pnalloc(r->pool, r->uri.len);
1304 if (r->uri.data == NULL) { 1308 if (r->uri.data == NULL) {
1305 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); 1309 ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
1306 return NGX_ERROR; 1310 return NGX_ERROR;
1307 } 1311 }
1308 1312
1322 } 1326 }
1323 1327
1324 r->unparsed_uri.len = r->uri_end - r->uri_start; 1328 r->unparsed_uri.len = r->uri_end - r->uri_start;
1325 r->unparsed_uri.data = r->uri_start; 1329 r->unparsed_uri.data = r->uri_start;
1326 1330
1327 r->valid_unparsed_uri = r->space_in_uri ? 0 : 1; 1331 r->valid_unparsed_uri = (r->space_in_uri || r->empty_path_in_uri) ? 0 : 1;
1328 1332
1329 if (r->uri_ext) { 1333 if (r->uri_ext) {
1330 if (r->args_start) { 1334 if (r->args_start) {
1331 r->exten.len = r->args_start - 1 - r->uri_ext; 1335 r->exten.len = r->args_start - 1 - r->uri_ext;
1332 } else { 1336 } else {
3551 3555
3552 if (rc == NGX_AGAIN) { 3556 if (rc == NGX_AGAIN) {
3553 c->ssl->handler = ngx_http_set_lingering_close; 3557 c->ssl->handler = ngx_http_set_lingering_close;
3554 return; 3558 return;
3555 } 3559 }
3556
3557 c->recv = ngx_recv;
3558 } 3560 }
3559 #endif 3561 #endif
3560 3562
3561 rev = c->read; 3563 rev = c->read;
3562 rev->handler = ngx_http_lingering_close_handler; 3564 rev->handler = ngx_http_lingering_close_handler;