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 ssl_engine_init.c ssl_scache.c
Date Wed, 27 Mar 2002 23:25:58 GMT
dougm       02/03/27 15:25:58

  Modified:    modules/ssl ssl_engine_init.c ssl_scache.c
  Log:
  move warning about session cache not being configured to ssl_scache_init
  
  Revision  Changes    Path
  1.66      +0 -11     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.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- ssl_engine_init.c	27 Mar 2002 23:19:08 -0000	1.65
  +++ ssl_engine_init.c	27 Mar 2002 23:25:57 -0000	1.66
  @@ -272,17 +272,6 @@
   #endif
   
       /*
  -     * Warn the user that he should use the session cache.
  -     * But we can operate without it, of course.
  -     */
  -    if (mc->nSessionCacheMode == SSL_SCMODE_UNSET) {
  -        ssl_log(base_server, SSL_LOG_WARN,
  -                "Init: Session Cache is not configured "
  -                "[hint: SSLSessionCache]");
  -        mc->nSessionCacheMode = SSL_SCMODE_NONE;
  -    }
  -
  -    /*
        * initialize the mutex handling
        */
       if (!ssl_mutex_init(base_server, p)) {
  
  
  
  1.11      +12 -1     httpd-2.0/modules/ssl/ssl_scache.c
  
  Index: ssl_scache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_scache.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ssl_scache.c	14 Mar 2002 23:31:23 -0000	1.10
  +++ ssl_scache.c	27 Mar 2002 23:25:58 -0000	1.11
  @@ -73,6 +73,18 @@
   {
       SSLModConfigRec *mc = myModConfig(s);
   
  +    /*
  +     * Warn the user that he should use the session cache.
  +     * But we can operate without it, of course.
  +     */
  +    if (mc->nSessionCacheMode == SSL_SCMODE_UNSET) {
  +        ssl_log(s, SSL_LOG_WARN,
  +                "Init: Session Cache is not configured "
  +                "[hint: SSLSessionCache]");
  +        mc->nSessionCacheMode = SSL_SCMODE_NONE;
  +        return;
  +    }
  +
       if (mc->nSessionCacheMode == SSL_SCMODE_DBM)
           ssl_scache_dbm_init(s, p);
       else if ((mc->nSessionCacheMode == SSL_SCMODE_SHMHT) ||
  @@ -91,7 +103,6 @@
           else if (mc->nSessionCacheMode == SSL_SCMODE_SHMCB)
               ssl_scache_shmcb_init(s, p);
       }
  -    return;
   }
   
   void ssl_scache_kill(server_rec *s)
  
  
  

Mime
View raw message