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

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

Browse Source 
to change anyhow.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94266 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-03-28 17:23:50 +00:00
parent 388657af76
commit e90c7fb27f
2 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/ssl/mod_ssl.h
View File

@@ -70,9 +70,6 @@
* CFLAGS="-DSSL_EXPERIMENTAL_xxxx_IGNORE". * CFLAGS="-DSSL_EXPERIMENTAL_xxxx_IGNORE".
*/ */
#ifdef SSL_EXPERIMENTAL #ifdef SSL_EXPERIMENTAL
#ifndef SSL_EXPERIMENTAL_PROXY_IGNORE
#define SSL_EXPERIMENTAL_PROXY
#endif
#ifdef SSL_ENGINE #ifdef SSL_ENGINE
#ifndef SSL_EXPERIMENTAL_ENGINE_IGNORE #ifndef SSL_EXPERIMENTAL_ENGINE_IGNORE
#define SSL_EXPERIMENTAL_ENGINE #define SSL_EXPERIMENTAL_ENGINE
@@ -503,19 +500,6 @@ typedef struct {
const char *szCARevocationPath; const char *szCARevocationPath;
const char *szCARevocationFile; const char *szCARevocationFile;
X509_STORE *pRevocationStore; 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; } SSLSrvConfigRec;
/* /*
@@ -701,11 +685,6 @@ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup,
conn_rec *, request_rec *, conn_rec *, request_rec *,
char *)); char *));
/* Proxy Extensions */
#if 0 /* XXX */
void ssl_ext_proxy_register(apr_pool_t *p);
#endif /* -0- */
/* I/O */ /* I/O */
void ssl_io_filter_init(conn_rec *, SSL *); void ssl_io_filter_init(conn_rec *, SSL *);
void ssl_io_filter_register(apr_pool_t *); void ssl_io_filter_register(apr_pool_t *);

24
modules/ssl/ssl_engine_config.c
View File

@@ -165,18 +165,6 @@ void *ssl_config_server_create(apr_pool_t *p, server_rec *s)
sc->szCARevocationFile = NULL; sc->szCARevocationFile = NULL;
sc->pRevocationStore = 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->szPublicCertFiles, 0, sizeof(sc->szPublicCertFiles));
memset((void*)sc->szPrivateKeyFiles, 0, sizeof(sc->szPrivateKeyFiles)); memset((void*)sc->szPrivateKeyFiles, 0, sizeof(sc->szPrivateKeyFiles));
memset(sc->pPublicCert, 0, sizeof(sc->pPublicCert)); 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); 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; return mrg;
} }