httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_kernel.c
Date Sat, 30 Mar 2002 06:38:10 GMT
dougm       02/03/29 22:38:10

  Modified:    modules/ssl mod_ssl.h ssl_engine_kernel.c
  Log:
  pass sc to myCtxConfig macro
  
  Revision  Changes    Path
  1.111     +1 -1      httpd-2.0/modules/ssl/mod_ssl.h
  
  Index: mod_ssl.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- mod_ssl.h	30 Mar 2002 06:36:56 -0000	1.110
  +++ mod_ssl.h	30 Mar 2002 06:38:10 -0000	1.111
  @@ -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)
  
  
  
  1.65      +2 -2      httpd-2.0/modules/ssl/ssl_engine_kernel.c
  
  Index: ssl_engine_kernel.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- ssl_engine_kernel.c	30 Mar 2002 06:36:56 -0000	1.64
  +++ ssl_engine_kernel.c	30 Mar 2002 06:38:10 -0000	1.65
  @@ -1265,7 +1265,7 @@
       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 @@
       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;
  
  
  

Mime
View raw message