]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
mod_session_crypto: Make sure we try to initialise twice, so we don't
authorGraham Leggett <minfrin@apache.org>
Wed, 11 Dec 2013 23:14:46 +0000 (23:14 +0000)
committerGraham Leggett <minfrin@apache.org>
Wed, 11 Dec 2013 23:14:46 +0000 (23:14 +0000)
succeed in configtest but fail on restart.

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

modules/session/mod_session_crypto.c

index 984a048762ec3c98ee10c5b48ddb8fbbee9b7566..79a9ca3b729027f24ea8945cbfb090bfbc86a321 100644 (file)
@@ -407,13 +407,6 @@ static int session_crypto_init(apr_pool_t *p, apr_pool_t *plog,
     session_crypto_conf *conf = ap_get_module_config(s->module_config,
             &session_crypto_module);
 
-    /* session_crypto_init() will be called twice. Don't bother
-     * going through all of the initialization on the first call
-     * because it will just be thrown away.*/
-    if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
-        return OK;
-    }
-
     if (conf->library) {
 
         const apu_err_t *err = NULL;