reorder a bit of the server config structure, moving items that are

going to stay there to the top.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94263 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index 110c6ebb3b1cc2658790775af3e0dc2f9df9adf7..57ce2c38b6e62155c3d898ae30b4ca9f815fe6b5 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -483,24 +483,25 @@ typedef struct {
  */
 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;

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 879e8821dcfecada0b34a485dbeca9971f0b4924..8cd5664cef91c21afdc9bff131ccfe1f2fa7a4c3 100644 (file)
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -144,19 +144,22 @@ void *ssl_config_server_create(apr_pool_t *p, server_rec *s)
 
     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 @@ void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv)
     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);