diff options
| author | Stefan Eissing <icing@apache.org> | 2015-09-21 12:59:50 +0200 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2015-09-21 12:59:50 +0200 |
| commit | 3c7bc8f5a0b8ec75ac47235d0c3988328a70ddff (patch) | |
| tree | 9790aced0b522655658b207a581127815ae87608 /modules/http2/h2_conn.c | |
| parent | removed wrong error supression in h2 connection writes (diff) | |
| download | apache2-3c7bc8f5a0b8ec75ac47235d0c3988328a70ddff.tar.xz apache2-3c7bc8f5a0b8ec75ac47235d0c3988328a70ddff.zip | |
no GOAWAYs on connection failures, sending last received stream id back in GOAWAY, no more flush attempts when session has already been aborted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1704262 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http2/h2_conn.c')
| -rw-r--r-- | modules/http2/h2_conn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/http2/h2_conn.c b/modules/http2/h2_conn.c index 38e5c11a28..8bffbc4269 100644 --- a/modules/http2/h2_conn.c +++ b/modules/http2/h2_conn.c @@ -288,24 +288,24 @@ apr_status_t h2_session_process(h2_session *session) || session->frames_received <= 1)? APR_BLOCK_READ : APR_NONBLOCK_READ); switch (status) { - case APR_SUCCESS: - /* successful read, reset our idle timers */ + case APR_SUCCESS: /* successful read, reset our idle timers */ have_read = 1; wait_micros = 0; break; - case APR_EAGAIN: + case APR_EAGAIN: /* non-blocking read, nothing there */ break; - case APR_EBADF: + case APR_EBADF: /* connection is not there any more */ case APR_EOF: case APR_ECONNABORTED: case APR_ECONNRESET: + case APR_TIMEUP: /* blocked read, timed out */ ap_log_cerror( APLOG_MARK, APLOG_DEBUG, status, session->c, "h2_session(%ld): reading", session->id); h2_session_abort(session, status, 0); break; default: - ap_log_cerror( APLOG_MARK, APLOG_WARNING, status, session->c, + ap_log_cerror( APLOG_MARK, APLOG_INFO, status, session->c, APLOGNO(02950) "h2_session(%ld): error reading, terminating", session->id); |