httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject svn commit: r371415 - /httpd/httpd/branches/async-read-dev/modules/ssl/ssl_engine_io.c
Date Sun, 22 Jan 2006 23:06:26 GMT
Author: brianp
Date: Sun Jan 22 15:06:24 2006
New Revision: 371415

URL: http://svn.apache.org/viewcvs?rev=371415&view=rev
Log:
reverting vetoed commit r371227

Modified:
    httpd/httpd/branches/async-read-dev/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/branches/async-read-dev/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/async-read-dev/modules/ssl/ssl_engine_io.c?rev=371415&r1=371414&r2=371415&view=diff
==============================================================================
--- httpd/httpd/branches/async-read-dev/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/branches/async-read-dev/modules/ssl/ssl_engine_io.c Sun Jan 22 15:06:24 2006
@@ -459,7 +459,6 @@
     apr_read_type_e block = inctx->block;
     SSLConnRec *sslconn = myConnConfig(inctx->f->c);
 
-    fprintf(stderr, "block mode is %d\n", (block == APR_BLOCK_READ ? 1 : 0));
     inctx->rc = APR_SUCCESS;
 
     /* OpenSSL catches this case, so should we. */
@@ -1282,11 +1281,6 @@
         return APR_ENOTIMPL;
     }
 
-    /* XXX: for now, do blocking reads even if running in
-     * an asynchronous httpd.  mod_ssl will need some changes
-     * to deal with EAGAIN properly.
-     */
-    block = APR_BLOCK_READ;
     inctx->mode = mode;
     inctx->block = block;
 



Mime
View raw message