Commit 7e3f4fe9 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

pass sc to myCtxConfig macro 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94337 13f79535-47bb-0310-9956-ffa450edef68
parent a9bda397

mod_ssl.h

+1 −1
Changes for mod_ssl.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ 


#define myConnConfig(c) \

(SSLConnRec *)ap_get_module_config(c->conn_config, &ssl_module)

#define myCtxConfig(sslconn) (sslconn->is_proxy ? sc->proxy : sc->server)

#define myCtxConfig(sslconn, sc) (sslconn->is_proxy ? sc->proxy : sc->server)

#define myConnConfigSet(c, val) \

ap_set_module_config(c->conn_config, &ssl_module, val)

#define mySrvConfig(srv) (SSLSrvConfigRec *)ap_get_module_config(srv->module_config,  &ssl_module)

ssl_engine_kernel.c

+2 −2
Changes for ssl_engine_kernel.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ int ssl_callback_SSLVerify(int ok, X509_STORE_CTX *ctx) 
    SSLSrvConfigRec *sc = mySrvConfig(s);

    SSLDirConfigRec *dc = r ? myDirConfig(r) : NULL;

    SSLConnRec *sslconn = myConnConfig(conn);

    modssl_ctx_t *mctx  = myCtxConfig(sslconn);

    modssl_ctx_t *mctx  = myCtxConfig(sslconn, sc);



    /* Get verify ingredients */

    int errnum   = X509_STORE_CTX_get_error(ctx);
@@ -1371,7 +1371,7 @@ int ssl_callback_SSLVerify_CRL(int ok, X509_STORE_CTX *ctx, conn_rec *c) 
    server_rec *s       = c->base_server;

    SSLSrvConfigRec *sc = mySrvConfig(s);

    SSLConnRec *sslconn = myConnConfig(c);

    modssl_ctx_t *mctx  = myCtxConfig(sslconn);

    modssl_ctx_t *mctx  = myCtxConfig(sslconn, sc);

    X509_OBJECT obj;

    X509_NAME *subject, *issuer;

    X509 *cert;