httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1707155 - /httpd/httpd/trunk/modules/http/http_request.c
Date Tue, 06 Oct 2015 22:04:24 GMT
Author: minfrin
Date: Tue Oct  6 22:04:24 2015
New Revision: 1707155

URL: http://svn.apache.org/viewvc?rev=1707155&view=rev
Log:
Make sure we free the main request rather than the final internal
redirect.

Modified:
    httpd/httpd/trunk/modules/http/http_request.c

Modified: httpd/httpd/trunk/modules/http/http_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_request.c?rev=1707155&r1=1707154&r2=1707155&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_request.c (original)
+++ httpd/httpd/trunk/modules/http/http_request.c Tue Oct  6 22:04:24 2015
@@ -256,14 +256,6 @@ AP_DECLARE(void) ap_process_request_afte
     apr_bucket *b;
     conn_rec *c = r->connection;
 
-    /* Find the last request, taking into account internal
-     * redirects. We want to send the EOR bucket at the end of
-     * all the buckets so it does not jump the queue.
-     */
-    while (r->next) {
-        r = r->next;
-    }
-
     /* Send an EOR bucket through the output filter chain.  When
      * this bucket is destroyed, the request will be logged and
      * its pool will be freed
@@ -272,6 +264,14 @@ AP_DECLARE(void) ap_process_request_afte
     b = ap_bucket_eor_create(c->bucket_alloc, r);
     APR_BRIGADE_INSERT_HEAD(bb, b);
 
+    /* Find the last request, taking into account internal
+     * redirects. We want to send the EOR bucket at the end of
+     * all the buckets so it does not jump the queue.
+     */
+    while (r->next) {
+        r = r->next;
+    }
+
     ap_pass_brigade(r->output_filters, bb);
 
     /* The EOR bucket has either been handled by an output filter (eg.



Mime
View raw message