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 CHANGES
Date Fri, 24 Aug 2001 23:25:14 GMT
dougm       01/08/24 16:25:14

  Modified:    modules/ssl ssl_engine_init.c
               .        CHANGES
  Log:
  force OpenSSL to ignore process local-caching and to always
  get/set/delete sessions using mod_ssl's callbacks
  Submitted by:   Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
  Reviewed by:    dougm
  
  Revision  Changes    Path
  1.13      +13 -4     httpd-2.0/modules/ssl/ssl_engine_init.c
  
  Index: ssl_engine_init.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ssl_engine_init.c	2001/08/24 23:17:22	1.12
  +++ ssl_engine_init.c	2001/08/24 23:25:14	1.13
  @@ -468,6 +468,7 @@
       BOOL bSkipFirst;
       int isca, pathlen;
       int i, n;
  +    long cache_mode;
   
       /*
        * Create the server host:port string because we need it a lot
  @@ -529,10 +530,18 @@
        * Configure additional context ingredients
        */
       SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE);
  -    if (mc->nSessionCacheMode == SSL_SCMODE_NONE)
  -        SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
  -    else
  -        SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_SERVER);
  +    if (mc->nSessionCacheMode == SSL_SCMODE_NONE) {
  +        cache_mode = SSL_SESS_CACHE_OFF;
  +    }
  +    else {
  +        /* SSL_SESS_CACHE_NO_INTERNAL_LOOKUP will force OpenSSL
  +         * to ignore process local-caching and
  +         * to always get/set/delete sessions using mod_ssl's callbacks.
  +         */
  +        cache_mode = SSL_SESS_CACHE_SERVER|SSL_SESS_CACHE_NO_INTERNAL_LOOKUP;
  +    }
  +
  +    SSL_CTX_set_session_cache_mode(ctx, cache_mode);
   
       /*
        *  Configure callbacks for SSL context
  
  
  
  1.327     +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.326
  retrieving revision 1.327
  diff -u -r1.326 -r1.327
  --- CHANGES	2001/08/24 16:49:34	1.326
  +++ CHANGES	2001/08/24 23:25:14	1.327
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.25-dev
   
  +  *) force OpenSSL to ignore process local-caching and to always
  +     get/set/delete sessions using mod_ssl's callbacks
  +     [Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>,
  +      Geoff Thorpe <geoff@geoffthorpe.net>]
  +
     *) Make the worker MPM shutdown and restart cleanly.  This also
        cleans up some race conditions, and gets the worker using
        pools more cleanly.  [Aaron Bannert <aaron@clove.org>]
  
  
  

Mime
View raw message