Mercurial > hg > nginx

comparison src/http/ngx_http_request.c @ 8330:5b7ec588de48 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, 14 Apr 2020 19:35:20 +0300
parents 5649079a41f4 1d207b77b44a
children 44cac24aaa44
comparison
equal deleted inserted replaced
8329:7bd334b8d91a 8330:5b7ec588de48
2628 ngx_http_finalize_request(r, ngx_http_special_response_handler(r, rc)); 2628 ngx_http_finalize_request(r, ngx_http_special_response_handler(r, rc));
2629 return; 2629 return;
2630 } 2630 }
2631 2631
2632 if (r != r->main) { 2632 if (r != r->main) {
2633 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 2633
2634 2634 if (r->buffered || r->postponed) {
2635 if (r->background) { 2635
2636 if (ngx_http_set_write_handler(r) != NGX_OK) {
2637 ngx_http_terminate_request(r, 0);
2638 }
2639
2640 return;
2641 }
2642
2643 pr = r->parent;
2644
2645 if (r == c->data || r->background) {
2646
2636 if (!r->logged) { 2647 if (!r->logged) {
2648
2649 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
2650
2637 if (clcf->log_subrequest) { 2651 if (clcf->log_subrequest) {
2638 ngx_http_log_request(r); 2652 ngx_http_log_request(r);
2639 } 2653 }
2640 2654
2641 r->logged = 1; 2655 r->logged = 1;
2645 "subrequest: \"%V?%V\" logged again", 2659 "subrequest: \"%V?%V\" logged again",
2646 &r->uri, &r->args); 2660 &r->uri, &r->args);
2647 } 2661 }
2648 2662
2649 r->done = 1; 2663 r->done = 1;
2650 ngx_http_finalize_connection(r); 2664
2651 return; 2665 if (r->background) {
2652 } 2666 ngx_http_finalize_connection(r);
2653 2667 return;
2654 if (r->buffered || r->postponed) { 2668 }
2655
2656 if (ngx_http_set_write_handler(r) != NGX_OK) {
2657 ngx_http_terminate_request(r, 0);
2658 }
2659
2660 return;
2661 }
2662
2663 pr = r->parent;
2664
2665 if (r == c->data) {
2666 2669
2667 r->main->count--; 2670 r->main->count--;
2668
2669 if (!r->logged) {
2670 if (clcf->log_subrequest) {
2671 ngx_http_log_request(r);
2672 }
2673
2674 r->logged = 1;
2675
2676 } else {
2677 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
2678 "subrequest: \"%V?%V\" logged again",
2679 &r->uri, &r->args);
2680 }
2681
2682 r->done = 1;
2683 2671
2684 if (pr->postponed && pr->postponed->request == r) { 2672 if (pr->postponed && pr->postponed->request == r) {
2685 pr->postponed = pr->postponed->next; 2673 pr->postponed = pr->postponed->next;
2686 } 2674 }
2687 2675