httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1368447 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/proxy/mod_proxy_http.c
Date Thu, 02 Aug 2012 13:04:52 GMT
Author: jim
Date: Thu Aug  2 13:04:51 2012
New Revision: 1368447

URL: http://svn.apache.org/viewvc?rev=1368447&view=rev
Log:
Merge r1242798 from trunk:

* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
  Treat EAGAIN as an error for a blocking read from the input filter
  stack.

Submitted by: jorton
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1242798

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1368447&r1=1368446&r2=1368447&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Aug  2 13:04:51 2012
@@ -94,13 +94,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: rjung, sf, jim
      rjung: igalic: you applied it to trunk, care to vote?
 
-   * proxy: Treat EAGAIN as an error for a blocking read from the input filter
-     stack.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1242798
-     2.4.x patch: Trunk patch applies.
-     +1: rjung, sf, jim
-     rjung: jorton: you applied it to trunk, care to vote?
-
    * authz: pass the provider name to parse_require_line as pool userdata
      This allows a single C function to implement several authz providers.
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1351016

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c?rev=1368447&r1=1368446&r2=1368447&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c Thu Aug  2 13:04:51 2012
@@ -1964,8 +1964,9 @@ apr_status_t ap_proxy_http_process_respo
 
                     /* ap_get_brigade will return success with an empty brigade
                      * for a non-blocking read which would block: */
-                    if (APR_STATUS_IS_EAGAIN(rv)
-                        || (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb))) {
+                    if (mode == APR_NONBLOCK_READ
+                        && (APR_STATUS_IS_EAGAIN(rv)
+                            || (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)))) {
                         /* flush to the client and switch to blocking mode */
                         e = apr_bucket_flush_create(c->bucket_alloc);
                         APR_BRIGADE_INSERT_TAIL(bb, e);



Mime
View raw message