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.h ssl_engine_config.c
Date Thu, 28 Mar 2002 16:47:36 GMT
dougm       02/03/28 08:47:36

  Modified:    modules/ssl mod_ssl.h ssl_engine_config.c
  Log:
  reorder a bit of the server config structure, moving items that are
  going to stay there to the top.
  
  Revision  Changes    Path
  1.95      +6 -5      httpd-2.0/modules/ssl/mod_ssl.h
  
  Index: mod_ssl.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- mod_ssl.h	28 Mar 2002 00:34:13 -0000	1.94
  +++ mod_ssl.h	28 Mar 2002 16:47:36 -0000	1.95
  @@ -483,24 +483,25 @@
    */
   typedef struct {
       SSLModConfigRec *mc;
  +    BOOL         bEnabled;
       const char  *szVHostID;
       int          nVHostID_length;
  -    BOOL         bEnabled;
  +    const char  *szLogFile;
  +    apr_file_t  *fileLogFile;
  +    int          nLogLevel;
  +    int          nSessionCacheTimeout;
  +
       const char  *szPublicCertFiles[SSL_AIDX_MAX];
       const char  *szPrivateKeyFiles[SSL_AIDX_MAX];
       const char  *szCertificateChain;
       const char  *szCACertificatePath;
       const char  *szCACertificateFile;
  -    const char  *szLogFile;
       const char  *szCipherSuite;
  -    apr_file_t  *fileLogFile;
  -    int          nLogLevel;
       int          nVerifyDepth;
       ssl_verify_t nVerifyClient;
       X509        *pPublicCert[SSL_AIDX_MAX];
       EVP_PKEY    *pPrivateKey[SSL_AIDX_MAX];
       SSL_CTX     *pSSLCtx;
  -    int          nSessionCacheTimeout;
       int          nPassPhraseDialogType;
       const char  *szPassPhraseDialogPath;
       ssl_proto_t  nProtocol;
  
  
  
  1.47      +13 -9     httpd-2.0/modules/ssl/ssl_engine_config.c
  
  Index: ssl_engine_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_config.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- ssl_engine_config.c	27 Mar 2002 23:35:31 -0000	1.46
  +++ ssl_engine_config.c	28 Mar 2002 16:47:36 -0000	1.47
  @@ -144,19 +144,22 @@
   
       sc->mc                     = ssl_config_global_create(s);
       sc->bEnabled               = UNSET;
  +    sc->szVHostID              = NULL;
  +    sc->nVHostID_length        = 0;
  +    sc->szLogFile              = NULL;
  +    sc->fileLogFile            = NULL;
  +    sc->nLogLevel              = SSL_LOG_NONE;
  +    sc->nSessionCacheTimeout   = UNSET;
  +
       sc->szCACertificatePath    = NULL;
       sc->szCACertificateFile    = NULL;
       sc->szCertificateChain     = NULL;
  -    sc->szLogFile              = NULL;
       sc->szCipherSuite          = NULL;
  -    sc->nLogLevel              = SSL_LOG_NONE;
       sc->nVerifyDepth           = UNSET;
       sc->nVerifyClient          = SSL_CVERIFY_UNSET;
  -    sc->nSessionCacheTimeout   = UNSET;
       sc->nPassPhraseDialogType  = SSL_PPTYPE_UNSET;
       sc->szPassPhraseDialogPath = NULL;
       sc->nProtocol              = SSL_PROTOCOL_ALL;
  -    sc->fileLogFile            = NULL;
       sc->pSSLCtx                = NULL;
       sc->szCARevocationPath     = NULL;
       sc->szCARevocationFile     = NULL;
  @@ -193,21 +196,22 @@
       SSLSrvConfigRec *mrg  = (SSLSrvConfigRec *)apr_palloc(p, sizeof(*mrg));
   
       cfgMerge(mc, NULL);
  -    cfgMergeString(szVHostID);
       cfgMergeBool(bEnabled);
  +    cfgMergeString(szVHostID);
  +    cfgMergeString(szLogFile);
  +    cfgMerge(fileLogFile, NULL);
  +    cfgMerge(nLogLevel, SSL_LOG_NONE);
  +    cfgMergeInt(nSessionCacheTimeout);
  +
       cfgMergeString(szCACertificatePath);
       cfgMergeString(szCACertificateFile);
       cfgMergeString(szCertificateChain);
  -    cfgMergeString(szLogFile);
       cfgMergeString(szCipherSuite);
  -    cfgMerge(nLogLevel, SSL_LOG_NONE);
       cfgMergeInt(nVerifyDepth);
       cfgMerge(nVerifyClient, SSL_CVERIFY_UNSET);
  -    cfgMergeInt(nSessionCacheTimeout);
       cfgMerge(nPassPhraseDialogType, SSL_PPTYPE_UNSET);
       cfgMergeString(szPassPhraseDialogPath);
       cfgMerge(nProtocol, SSL_PROTOCOL_ALL);
  -    cfgMerge(fileLogFile, NULL);
       cfgMerge(pSSLCtx, NULL);
       cfgMerge(szCARevocationPath, NULL);
       cfgMerge(szCARevocationFile, NULL);
  
  
  

Mime
View raw message