httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1723102 - /httpd/httpd/trunk/modules/http2/h2_session.c
Date Tue, 05 Jan 2016 15:39:56 GMT
Author: icing
Date: Tue Jan  5 15:39:56 2016
New Revision: 1723102

URL: http://svn.apache.org/viewvc?rev=1723102&view=rev
Log:
no more blocking reads for aborted sessions

Modified:
    httpd/httpd/trunk/modules/http2/h2_session.c

Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1723102&r1=1723101&r2=1723102&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Tue Jan  5 15:39:56 2016
@@ -1628,7 +1628,7 @@ static apr_status_t h2_session_read(h2_s
          * We just pull at the filter chain to make it happen */
         status = ap_get_brigade(c->input_filters,
                                 session->bbtmp, AP_MODE_READBYTES,
-                                block? APR_BLOCK_READ : APR_NONBLOCK_READ,
+                                (block && !session->aborted)? APR_BLOCK_READ :
APR_NONBLOCK_READ,
                                 APR_BUCKET_BUFF_SIZE);
         /* get rid of any possible data we do not expect to get */
         apr_brigade_cleanup(session->bbtmp); 
@@ -1672,6 +1672,10 @@ static apr_status_t h2_session_read(h2_s
                  * status. */
                 return rstatus;
         }
+        
+        if (session->aborted) {
+            break;
+        }
     }
     return rstatus;
 }



Mime
View raw message