httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Graham Leggett <minf...@sharp.fm>
Subject Re: svn commit: r1736216 - in /httpd/httpd/trunk: include/httpd.h modules/http/http_request.c server/mpm/event/event.c server/mpm/motorz/motorz.c server/mpm/simple/simple_io.c server/util_filter.c
Date Wed, 23 Mar 2016 01:11:28 GMT
On 22 Mar 2016, at 7:08 PM, ylavic@apache.org wrote:

> URL: http://svn.apache.org/viewvc?rev=1736216&view=rev
> Log:
> Follow up to r1734656: restore c->data_in_input_filters usage to
> see if it helps unblocking test framework.

I created an almost identical patch before doing an update, the only difference was this:

Index: modules/http/http_request.c
===================================================================
--- modules/http/http_request.c	(revision 1736263)
+++ modules/http/http_request.c	(working copy)
@@ -453,7 +453,7 @@
 
     ap_process_async_request(r);
 
-    if (!c->data_in_input_filters || ap_run_input_pending(c) != OK) {
+    if (!c->data_in_input_filters && ap_run_input_pending(c) != OK) {
         bb = apr_brigade_create(c->pool, c->bucket_alloc);
         b = apr_bucket_flush_create(c->bucket_alloc);
         APR_BRIGADE_INSERT_HEAD(bb, b);

I get hangs without the above patch on the test suite, but it runs clean with. Can you give
it a try?

Regards,
Graham
—


Mime
View raw message