Commit 4ae92425 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

check for timeout on socket read when we check for ECONNRESET and eof 

previously, we'd die on an assert() (really nasty for threaded MPM) when
we hit a keepalive timeout for a browser like netscape which keeps the
connection open


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90244 13f79535-47bb-0310-9956-ffa450edef68
parent 7140625f

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.25-dev



  *) Fix an assertion failure in mod_ssl when the keepalive timeout is  

     reached.  [Jeff Trawick]



Changes with Apache 2.0.24



  *) Fixed the segfaults in mod_mime introduced by hash tables in 2.0.20.

modules/ssl/ssl_engine_io.c

+2 −1
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ static apr_status_t churn (SSLFilterRec *pRec, 


	if(len == 0) {

	    /* Lazy frickin browsers just reset instead of shutting down. */

            if(ret == APR_EOF || APR_STATUS_IS_ECONNRESET(ret)) {

            /* also gotta handle timeout of keepalive connections */

            if(ret == APR_EOF || APR_STATUS_IS_ECONNRESET(ret) || ret == APR_TIMEUP) {

		if(APR_BRIGADE_EMPTY(pRec->pbbPendingInput))

		    return APR_EOF;

		else