Commit a169e0a8 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

init proxy context


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94292 13f79535-47bb-0310-9956-ffa450edef68
parent 623c0f41
Loading
Loading
Loading
Loading
+16 −6
Changes for ssl_engine_init.c: 16 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -310,12 +310,6 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
         * it or give out some information about what we're
         * configuring.
         */
        if (!sc->enabled) {
            continue;
        }

        ssl_log(s, SSL_LOG_INFO|SSL_INIT,
                "Configuring server for SSL protocol");

        /*
         * Read the server certificate and key
@@ -901,6 +895,14 @@ static void ssl_init_server_certs(server_rec *s,
    }
}

static void ssl_init_proxy_ctx(server_rec *s,
                               apr_pool_t *p,
                               apr_pool_t *ptemp,
                               SSLSrvConfigRec *sc)
{
    ssl_init_ctx(s, p, ptemp, sc->proxy);
}

static void ssl_init_server_ctx(server_rec *s,
                                apr_pool_t *p,
                                apr_pool_t *ptemp,
@@ -921,9 +923,17 @@ void ssl_init_ConfigureServer(server_rec *s,
                              apr_pool_t *ptemp,
                              SSLSrvConfigRec *sc)
{
    if (sc->enabled) {
        ssl_log(s, SSL_LOG_INFO|SSL_INIT,
                "Configuring server for SSL protocol");
        ssl_init_server_ctx(s, p, ptemp, sc);
    }

    if (1) { /* XXX: add directive */
        ssl_init_proxy_ctx(s, p, ptemp, sc);
    }
}

void ssl_init_CheckServers(server_rec *base_server, apr_pool_t *p)
{
    server_rec *s, *ps;