httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl mod_ssl.c ssl_engine_io.c
Date Fri, 24 Aug 2001 18:06:47 GMT
dougm       01/08/24 11:06:47

  Modified:    modules/ssl mod_ssl.c ssl_engine_io.c
  Log:
  enable i/o debugging
  
  Revision  Changes    Path
  1.28      +1 -6      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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_ssl.c	2001/08/24 00:09:30	1.27
  +++ mod_ssl.c	2001/08/24 18:06:47	1.28
  @@ -285,12 +285,7 @@
        */
       SSL_set_tmp_rsa_callback(ssl, ssl_callback_TmpRSA);
       SSL_set_tmp_dh_callback(ssl,  ssl_callback_TmpDH);
  -#if 0 /* XXX */
  -    if (sc->nLogLevel >= SSL_LOG_DEBUG) {
  -        BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb);
  -        BIO_set_callback_arg(SSL_get_rbio(ssl), ssl);
  -    }
  -#endif
  +
       /*
        * Predefine some client verification results
        */
  
  
  
  1.34      +9 -0      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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- ssl_engine_io.c	2001/08/24 17:17:35	1.33
  +++ ssl_engine_io.c	2001/08/24 18:06:47	1.34
  @@ -414,6 +414,7 @@
   
   void ssl_io_filter_init(conn_rec *c, SSL *ssl)
   {
  +    SSLSrvConfigRec *sc = mySrvConfig(c->base_server);
       SSLFilterRec *filter;
   
       filter = apr_pcalloc(c->pool, sizeof(SSLFilterRec));
  @@ -428,6 +429,14 @@
   
       apr_pool_cleanup_register(c->pool, (void*)filter,
                                 ssl_io_filter_cleanup, apr_pool_cleanup_null);
  +
  +    if (sc->nLogLevel >= SSL_LOG_DEBUG) {
  +        /* XXX: this will currently get wiped out if renegotiation
  +         * happens in ssl_hook_Access
  +         */
  +        BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb);
  +        BIO_set_callback_arg(SSL_get_rbio(ssl), ssl);
  +    }
   
       return;
   }
  
  
  

Mime
View raw message