]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
fixed early returns on connection shutdown that did not properly release locks
authorStefan Eissing <icing@apache.org>
Mon, 4 Jan 2016 16:36:05 +0000 (16:36 +0000)
committerStefan Eissing <icing@apache.org>
Mon, 4 Jan 2016 16:36:05 +0000 (16:36 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722916 13f79535-47bb-0310-9956-ffa450edef68

modules/http2/h2_mplx.c

index 014f3ae37d9ea09d820c91cd20c99ea66d32862d..53da5c56336e004938d4a8013af93b9c6cf90ee0 100644 (file)
@@ -705,9 +705,6 @@ apr_status_t h2_mplx_out_write(h2_mplx *m, int stream_id,
             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 *m, int stream_id, apr_table_t *trailers)
             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;