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 Sun, 29 Feb 2004 00:29:20 GMT
jorton      2004/02/28 16:29:20

  Modified:    modules/ssl ssl_engine_io.c
  Log:
  * modules/ssl/ssl_engine_io.c (ssl_io_filter_disable,
  ssl_io_filter_error): Clear the SSL * pointer in the SSLConnRec too.
  
  Revision  Changes    Path
  1.121     +3 -2      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.120
  retrieving revision 1.121
  diff -w -d -u -r1.120 -r1.121
  --- ssl_engine_io.c	28 Feb 2004 18:06:34 -0000	1.120
  +++ ssl_engine_io.c	29 Feb 2004 00:29:20 -0000	1.121
  @@ -824,10 +824,11 @@
                                  sizeof(HTTP_ON_HTTPS_PORT) - 1, \
                                  alloc)
   
  -static void ssl_io_filter_disable(ap_filter_t *f)
  +static void ssl_io_filter_disable(SSLConnRec *sslconn, ap_filter_t *f)
   {
       bio_filter_in_ctx_t *inctx = f->ctx;
       SSL_free(inctx->ssl);
  +    sslconn->ssl = NULL;
       inctx->ssl = NULL;
       inctx->filter_ctx->pssl = NULL;
   }
  @@ -849,7 +850,7 @@
               ssl_log_ssl_error(APLOG_MARK, APLOG_INFO, f->c->base_server);
   
               sslconn->non_ssl_request = 1;
  -            ssl_io_filter_disable(f);
  +            ssl_io_filter_disable(sslconn, f);
   
               /* fake the request line */
               bucket = HTTP_ON_HTTPS_PORT_BUCKET(f->c->bucket_alloc);
  
  
  

Mime
View raw message