httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1722916 - /httpd/httpd/trunk/modules/http2/h2_mplx.c
Date Mon, 04 Jan 2016 16:36:05 GMT
Author: icing
Date: Mon Jan  4 16:36:05 2016
New Revision: 1722916

URL: http://svn.apache.org/viewvc?rev=1722916&view=rev
Log:
fixed early returns on connection shutdown that did not properly release locks

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

Modified: httpd/httpd/trunk/modules/http2/h2_mplx.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_mplx.c?rev=1722916&r1=1722915&r2=1722916&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_mplx.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_mplx.c Mon Jan  4 16:36:05 2016
@@ -705,9 +705,6 @@ apr_status_t h2_mplx_out_write(h2_mplx *
             H2_MPLX_IO_OUT(APLOG_TRACE2, m, io, "h2_mplx_out_write");
             
             have_out_data_for(m, stream_id);
-            if (m->aborted) {
-                return APR_ECONNABORTED;
-            }
         }
         else {
             status = APR_ECONNABORTED;
@@ -744,12 +741,6 @@ apr_status_t h2_mplx_out_close(h2_mplx *
             H2_MPLX_IO_OUT(APLOG_TRACE2, m, io, "h2_mplx_out_close");
             
             have_out_data_for(m, stream_id);
-            if (m->aborted) {
-                /* if we were the last output, the whole session might
-                 * have gone down in the meantime.
-                 */
-                return APR_SUCCESS;
-            }
         }
         else {
             status = APR_ECONNABORTED;



Mime
View raw message