ripping out some proxy stuff that isn't currently in use and is going

to change anyhow.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94266 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index 2ba6eaf439df0ff42c4f88247b0e70f66a33f575..6597a8b150140739bdc41615fa130d1263dea197 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -70,9 +70,6 @@
  * CFLAGS="-DSSL_EXPERIMENTAL_xxxx_IGNORE".
  */
 #ifdef SSL_EXPERIMENTAL
-#ifndef SSL_EXPERIMENTAL_PROXY_IGNORE
-#define SSL_EXPERIMENTAL_PROXY
-#endif
 #ifdef SSL_ENGINE
 #ifndef SSL_EXPERIMENTAL_ENGINE_IGNORE
 #define SSL_EXPERIMENTAL_ENGINE
@@ -503,19 +500,6 @@ typedef struct {
     const char  *szCARevocationPath;
     const char  *szCARevocationFile;
     X509_STORE  *pRevocationStore;
-#ifdef SSL_EXPERIMENTAL_PROXY
-    /* Configuration details for proxy operation */
-    ssl_proto_t  nProxyProtocol;
-    int          bProxyVerify;
-    int          nProxyVerifyDepth;
-    const char  *szProxyCACertificatePath;
-    const char  *szProxyCACertificateFile;
-    const char  *szProxyClientCertificateFile;
-    const char  *szProxyClientCertificatePath;
-    const char  *szProxyCipherSuite;
-    SSL_CTX     *pSSLProxyCtx;
-    STACK_OF(X509_INFO) *skProxyClientCerts;
-#endif
 } SSLSrvConfigRec;
 
 /*
@@ -701,11 +685,6 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup,
                          conn_rec *, request_rec *,
                          char *));
 
-/*  Proxy Extensions  */
-#if 0 /* XXX */
-void         ssl_ext_proxy_register(apr_pool_t *p);
-#endif /* -0- */
-
 /*  I/O  */
 void         ssl_io_filter_init(conn_rec *, SSL *);
 void         ssl_io_filter_register(apr_pool_t *);

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index fc5c7e143aa6278f191a8dcc0fc5dc8b07583f3d..d4e65568152bc33b559f2ef63123b42660ca877f 100644 (file)
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -165,18 +165,6 @@ void *ssl_config_server_create(apr_pool_t *p, server_rec *s)
     sc->szCARevocationFile     = NULL;
     sc->pRevocationStore       = NULL;
 
-#ifdef SSL_EXPERIMENTAL_PROXY
-    sc->nProxyVerifyDepth             = UNSET;
-    sc->szProxyCACertificatePath      = NULL;
-    sc->szProxyCACertificateFile      = NULL;
-    sc->szProxyClientCertificateFile  = NULL;
-    sc->szProxyClientCertificatePath  = NULL;
-    sc->szProxyCipherSuite            = NULL;
-    sc->nProxyProtocol                = SSL_PROTOCOL_ALL & ~SSL_PROTOCOL_TLSV1;
-    sc->bProxyVerify                  = UNSET;
-    sc->pSSLProxyCtx                  = NULL;
-#endif
-
     memset((void*)sc->szPublicCertFiles, 0, sizeof(sc->szPublicCertFiles));
     memset((void*)sc->szPrivateKeyFiles, 0, sizeof(sc->szPrivateKeyFiles));
     memset(sc->pPublicCert,       0, sizeof(sc->pPublicCert));
@@ -224,18 +212,6 @@ void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv)
         cfgMerge(pPrivateKey[i], NULL);
     }
 
-#ifdef SSL_EXPERIMENTAL_PROXY
-    cfgMergeInt(nProxyVerifyDepth);
-    cfgMergeString(szProxyCACertificatePath);
-    cfgMergeString(szProxyCACertificateFile);
-    cfgMergeString(szProxyClientCertificateFile);
-    cfgMergeString(szProxyClientCertificatePath);
-    cfgMergeString(szProxyCipherSuite);
-    cfgMerge(nProxyProtocol, (SSL_PROTOCOL_ALL & ~SSL_PROTOCOL_TLSV1));
-    cfgMergeBool(bProxyVerify);
-    cfgMerge(pSSLProxyCtx, NULL);
-#endif
-
     return mrg;
 }