diff options
| author | Stefan Eissing <icing@apache.org> | 2016-01-04 17:36:05 +0100 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2016-01-04 17:36:05 +0100 |
| commit | 8e833619dc6ddd39388922144ffdd5b8981cd345 (patch) | |
| tree | 52381573bdeb68231e053a05091e0b706fa6a5c2 /modules/http2/h2_mplx.c | |
| parent | joining zombie workers thread, as suggested by yann (diff) | |
| download | apache2-8e833619dc6ddd39388922144ffdd5b8981cd345.tar.xz apache2-8e833619dc6ddd39388922144ffdd5b8981cd345.zip | |
fixed early returns on connection shutdown that did not properly release locks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722916 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http2/h2_mplx.c')
| -rw-r--r-- | modules/http2/h2_mplx.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c index 014f3ae37d..53da5c5633 100644 --- a/modules/http2/h2_mplx.c +++ b/modules/http2/h2_mplx.c @@ -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; |