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 ssl_engine_config.c
Date Fri, 29 Mar 2002 01:56:40 GMT
dougm       02/03/28 17:56:40

  Modified:    modules/ssl ssl_engine_config.c
  Log:
  inititialize and merge proxy config
  
  Revision  Changes    Path
  1.57      +32 -0     httpd-2.0/modules/ssl/ssl_engine_config.c
  
  Index: ssl_engine_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_config.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- ssl_engine_config.c	29 Mar 2002 01:42:04 -0000	1.56
  +++ ssl_engine_config.c	29 Mar 2002 01:56:40 -0000	1.57
  @@ -162,6 +162,22 @@
       mctx->auth.verify_mode    = SSL_CVERIFY_UNSET;
   }
   
  +static void modssl_ctx_init_proxy(SSLSrvConfigRec *sc,
  +                                  apr_pool_t *p)
  +{
  +    modssl_ctx_t *mctx;
  +
  +    mctx = sc->proxy = apr_palloc(p, sizeof(*sc->proxy));
  +
  +    modssl_ctx_init(mctx);
  +
  +    mctx->pkp = apr_palloc(p, sizeof(*mctx->pkp));
  +
  +    mctx->pkp->cert_file = NULL;
  +    mctx->pkp->cert_path = NULL;
  +    mctx->pkp->certs     = NULL;
  +}
  +
   static void modssl_ctx_init_server(SSLSrvConfigRec *sc,
                                      apr_pool_t *p)
   {
  @@ -200,6 +216,8 @@
       sc->log_level              = SSL_LOG_NONE;
       sc->session_cache_timeout  = UNSET;
   
  +    modssl_ctx_init_proxy(sc, p);
  +
       modssl_ctx_init_server(sc, p);
   
       return sc;
  @@ -232,6 +250,16 @@
       cfgMerge(auth.verify_mode, SSL_CVERIFY_UNSET);
   }
   
  +static void modssl_ctx_cfg_merge_proxy(modssl_ctx_t *base,
  +                                       modssl_ctx_t *add,
  +                                       modssl_ctx_t *mrg)
  +{
  +    modssl_ctx_cfg_merge(base, add, mrg);
  +
  +    cfgMergeString(pkp->cert_file);
  +    cfgMergeString(pkp->cert_path);
  +}
  +
   static void modssl_ctx_cfg_merge_server(modssl_ctx_t *base,
                                           modssl_ctx_t *add,
                                           modssl_ctx_t *mrg)
  @@ -255,6 +283,8 @@
       SSLSrvConfigRec *add  = (SSLSrvConfigRec *)addv;
       SSLSrvConfigRec *mrg  = (SSLSrvConfigRec *)apr_palloc(p, sizeof(*mrg));
   
  +    modssl_ctx_init_proxy(mrg, p);
  +
       modssl_ctx_init_server(mrg, p);
   
       cfgMerge(mc, NULL);
  @@ -262,6 +292,8 @@
       cfgMergeString(log_file_name);
       cfgMerge(log_level, SSL_LOG_NONE);
       cfgMergeInt(session_cache_timeout);
  +
  +    modssl_ctx_cfg_merge_proxy(base->proxy, add->proxy, mrg->proxy);
   
       modssl_ctx_cfg_merge_server(base->server, add->server, mrg->server);
   
  
  
  

Mime
View raw message