httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_io.c
Date Thu, 25 Mar 2004 19:36:32 GMT
jorton      2004/03/25 11:36:32

  Modified:    modules/ssl ssl_engine_io.c
  Log:
  * modules/ssl/ssl_engine_io.c (ssl_io_filter_cleanup): Don't try and
  send an SSL shutdown from a pool cleanup.
  
  Revision  Changes    Path
  1.122     +11 -13    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.121
  retrieving revision 1.122
  diff -w -d -u -r1.121 -r1.122
  --- ssl_engine_io.c	29 Feb 2004 00:29:20 -0000	1.121
  +++ ssl_engine_io.c	25 Mar 2004 19:36:32 -0000	1.122
  @@ -984,22 +984,20 @@
   
   static apr_status_t ssl_io_filter_cleanup(void *data)
   {
  -    apr_status_t ret;
  -    ssl_filter_ctx_t *filter_ctx = (ssl_filter_ctx_t *)data;
  -    conn_rec *c;
  +    ssl_filter_ctx_t *filter_ctx = data;
   
  -    if (!filter_ctx->pssl) {
  -        /* already been shutdown */
  -        return APR_SUCCESS;
  -    }
  +    if (filter_ctx->pssl) {
  +        conn_rec *c = (conn_rec *)SSL_get_app_data(filter_ctx->pssl);
  +        SSLConnRec *sslconn = myConnConfig(c);
   
  -    c = (conn_rec *)SSL_get_app_data(filter_ctx->pssl);
  -    if ((ret = ssl_filter_io_shutdown(filter_ctx, c, 0)) != APR_SUCCESS) {
  -        ap_log_error(APLOG_MARK, APLOG_INFO, ret, NULL,
  -                     "SSL filter error shutting down I/O");
  +        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
  +                     "SSL connection destroyed without being closed");
  +
  +        SSL_free(filter_ctx->pssl);
  +        sslconn->ssl = filter_ctx->pssl = NULL;
       }
   
  -    return ret;
  +    return APR_SUCCESS;
   }
   
   /*
  
  
  

Mime
View raw message