Commit 5135610e authored by Joe Orton's avatar Joe Orton
Browse files

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLSessionCache): Don't fix 

  the socache instance for the lifetime of the process since it is
  allocated out of pconf.


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

modules/ssl/ssl_engine_config.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -956,10 +956,6 @@ const char *ssl_cmd_SSLSessionCache(cmd_parms *cmd, 
        return err;

        return err;

    }

    }





    if (ssl_config_global_isfixed(mc)) {

        return NULL;

    }



    /* The OpenSSL session cache mode must have both the flags

    /* The OpenSSL session cache mode must have both the flags

     * SSL_SESS_CACHE_SERVER and SSL_SESS_CACHE_NO_INTERNAL set if a

     * SSL_SESS_CACHE_SERVER and SSL_SESS_CACHE_NO_INTERNAL set if a

     * session cache is configured; NO_INTERNAL prevents the

     * session cache is configured; NO_INTERNAL prevents the
@@ -989,7 +985,7 @@ const char *ssl_cmd_SSLSessionCache(cmd_parms *cmd, 
            /* Cache found; create it, passing anything beyond the colon. */

            /* Cache found; create it, passing anything beyond the colon. */

            mc->sesscache_mode = enabled_flags;

            mc->sesscache_mode = enabled_flags;

            err = mc->sesscache->create(&mc->sesscache_context, sep + 1, 

            err = mc->sesscache->create(&mc->sesscache_context, sep + 1, 

                                        cmd->pool, mc->pPool);

                                        cmd->temp_pool, cmd->pool);

        }

        }

        else {

        else {

            apr_array_header_t *name_list;

            apr_array_header_t *name_list;