www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

pass sc to myCtxConfig macro

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94337 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-03-30 06:38:10 +00:00
parent 97b59112b8
commit 663baf331b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ssl/mod_ssl.h
View File

@@ -192,7 +192,7 @@
#define myConnConfig(c) \ #define myConnConfig(c) \
(SSLConnRec *)ap_get_module_config(c->conn_config, &ssl_module) (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) \ #define myConnConfigSet(c, val) \
ap_set_module_config(c->conn_config, &ssl_module, val) ap_set_module_config(c->conn_config, &ssl_module, val)
#define mySrvConfig(srv) (SSLSrvConfigRec *)ap_get_module_config(srv->module_config, &ssl_module) #define mySrvConfig(srv) (SSLSrvConfigRec *)ap_get_module_config(srv->module_config, &ssl_module)

4
modules/ssl/ssl_engine_kernel.c
View File

@@ -1265,7 +1265,7 @@ int ssl_callback_SSLVerify(int ok, X509_STORE_CTX *ctx)
SSLSrvConfigRec *sc = mySrvConfig(s); SSLSrvConfigRec *sc = mySrvConfig(s);
SSLDirConfigRec *dc = r ? myDirConfig(r) : NULL; SSLDirConfigRec *dc = r ? myDirConfig(r) : NULL;
SSLConnRec *sslconn = myConnConfig(conn); SSLConnRec *sslconn = myConnConfig(conn);
modssl_ctx_t *mctx = myCtxConfig(sslconn); modssl_ctx_t *mctx = myCtxConfig(sslconn, sc);
/* Get verify ingredients */ /* Get verify ingredients */
int errnum = X509_STORE_CTX_get_error(ctx); 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; server_rec *s = c->base_server;
SSLSrvConfigRec *sc = mySrvConfig(s); SSLSrvConfigRec *sc = mySrvConfig(s);
SSLConnRec *sslconn = myConnConfig(c); SSLConnRec *sslconn = myConnConfig(c);
modssl_ctx_t *mctx = myCtxConfig(sslconn); modssl_ctx_t *mctx = myCtxConfig(sslconn, sc);
X509_OBJECT obj; X509_OBJECT obj;
X509_NAME *subject, *issuer; X509_NAME *subject, *issuer;
X509 *cert; X509 *cert;