You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by do...@apache.org on 2001/11/28 05:31:35 UTC

cvs commit: httpd-2.0/modules/ssl mod_ssl.c

dougm       01/11/27 20:31:35

  Modified:    modules/ssl mod_ssl.c
  Log:
  remove unused ssl::handshake::timeout references
  (core handles all timeouts)
  
  Revision  Changes    Path
  1.38      +0 -14     httpd-2.0/modules/ssl/mod_ssl.c
  
  Index: mod_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- mod_ssl.c	2001/11/22 02:44:35	1.37
  +++ mod_ssl.c	2001/11/28 04:31:34	1.38
  @@ -284,13 +284,6 @@
   
       SSL_set_verify_result(ssl, X509_V_OK);
   
  -    /*
  -     * We have to manage a I/O timeout ourself, because Apache
  -     * does it the first time when reading the request, but we're
  -     * working some time before this happens.
  -     */
  -    ssl_util_setmodconfig(c->base_server, "ssl::handshake::timeout", (void *)FALSE);
  -
       ssl_io_filter_init(c, ssl);
   
       return APR_SUCCESS;
  @@ -363,13 +356,6 @@
                    */
                   ap_remove_output_filter(pRec->pOutputFilter);
                   return HTTP_BAD_REQUEST;
  -            }
  -            else if (ssl_util_getmodconfig_ssl(pRec->pssl, "ssl::handshake::timeout")
  -               == (void *)TRUE) {
  -                ssl_log(c->base_server, SSL_LOG_ERROR,
  -                        "SSL handshake timed out (client %s, server %s)",
  -                        c->remote_ip != NULL ? c->remote_ip : "unknown", 
  -                        ssl_util_vhostid(c->pool,c->base_server));
               }
               else if ((SSL_get_error(pRec->pssl, n) == SSL_ERROR_SYSCALL) 
                   && (errno != EINTR)) {