httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_io.c
Date Thu, 16 Aug 2001 21:11:30 GMT
trawick     01/08/16 14:11:30

  Modified:    .        CHANGES
               modules/ssl ssl_engine_io.c
  Log:
  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
  
  Revision  Changes    Path
  1.304     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.303
  retrieving revision 1.304
  diff -u -r1.303 -r1.304
  --- CHANGES	2001/08/16 20:07:35	1.303
  +++ CHANGES	2001/08/16 21:11:30	1.304
  @@ -1,5 +1,8 @@
   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.
  
  
  
  1.21      +2 -1      httpd-2.0/modules/ssl/ssl_engine_io.c
  
  Index: ssl_engine_io.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_io.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ssl_engine_io.c	2001/08/16 19:56:47	1.20
  +++ ssl_engine_io.c	2001/08/16 21:11:30	1.21
  @@ -265,7 +265,8 @@
   
   	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
  
  
  

Mime
View raw message