|
 |
af9b8b |
|
|
|
af9b8b |
Ugly hack to enable mod_ssl and mod_nss to "share" hooks.
|
|
|
af9b8b |
|
|
|
af9b8b |
--- httpd-2.4.6/modules/ssl/mod_ssl.c.sslmultiproxy
|
|
|
af9b8b |
+++ httpd-2.4.6/modules/ssl/mod_ssl.c
|
|
|
af9b8b |
@@ -369,6 +369,9 @@ static SSLConnRec *ssl_init_connection_c
|
|
|
af9b8b |
return sslconn;
|
|
|
af9b8b |
}
|
|
|
af9b8b |
|
|
|
af9b8b |
+static typeof(ssl_proxy_enable) *othermod_proxy_enable;
|
|
|
af9b8b |
+static typeof(ssl_engine_disable) *othermod_engine_disable;
|
|
|
af9b8b |
+
|
|
|
af9b8b |
int ssl_proxy_enable(conn_rec *c)
|
|
|
af9b8b |
{
|
|
|
af9b8b |
SSLSrvConfigRec *sc;
|
|
|
af9b8b |
@@ -377,6 +380,12 @@ int ssl_proxy_enable(conn_rec *c)
|
|
|
af9b8b |
sc = mySrvConfig(sslconn->server);
|
|
|
af9b8b |
|
|
|
af9b8b |
if (!sc->proxy_enabled) {
|
|
|
af9b8b |
+ if (othermod_proxy_enable) {
|
|
|
af9b8b |
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c,
|
|
|
af9b8b |
+ "mod_ssl proxy not configured, passing through to other module.");
|
|
|
af9b8b |
+ return othermod_proxy_enable(c);
|
|
|
af9b8b |
+ }
|
|
|
af9b8b |
+
|
|
|
af9b8b |
ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(01961)
|
|
|
af9b8b |
"SSL Proxy requested for %s but not enabled "
|
|
|
af9b8b |
"[Hint: SSLProxyEngine]", sc->vhost_id);
|
|
|
af9b8b |
@@ -396,6 +405,10 @@ int ssl_engine_disable(conn_rec *c)
|
|
|
af9b8b |
|
|
|
af9b8b |
SSLConnRec *sslconn = myConnConfig(c);
|
|
|
af9b8b |
|
|
|
af9b8b |
+ if (othermod_engine_disable) {
|
|
|
af9b8b |
+ othermod_engine_disable(c);
|
|
|
af9b8b |
+ }
|
|
|
af9b8b |
+
|
|
|
af9b8b |
if (sslconn) {
|
|
|
af9b8b |
sc = mySrvConfig(sslconn->server);
|
|
|
af9b8b |
}
|
|
|
af9b8b |
@@ -612,6 +625,9 @@ static void ssl_register_hooks(apr_pool_
|
|
|
af9b8b |
ap_hook_post_read_request(ssl_hook_ReadReq, pre_prr,NULL, APR_HOOK_MIDDLE);
|
|
|
af9b8b |
|
|
|
af9b8b |
ssl_var_register(p);
|
|
|
af9b8b |
+
|
|
|
af9b8b |
+ othermod_proxy_enable = APR_RETRIEVE_OPTIONAL_FN(ssl_proxy_enable);
|
|
|
af9b8b |
+ othermod_engine_disable = APR_RETRIEVE_OPTIONAL_FN(ssl_engine_disable);
|
|
|
af9b8b |
|
|
|
af9b8b |
APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable);
|
|
|
af9b8b |
APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
|
|
|
af9b8b |
--- httpd-2.4.6/modules/ssl/ssl_engine_vars.c.sslmultiproxy
|
|
|
af9b8b |
+++ httpd-2.4.6/modules/ssl/ssl_engine_vars.c
|
|
|
af9b8b |
@@ -53,10 +53,15 @@ static void ssl_var_lookup_ssl_cipher_b
|
|
|
af9b8b |
static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var);
|
|
|
af9b8b |
static char *ssl_var_lookup_ssl_compress_meth(SSL *ssl);
|
|
|
af9b8b |
|
|
|
af9b8b |
+static APR_OPTIONAL_FN_TYPE(ssl_is_https) *othermod_is_https;
|
|
|
af9b8b |
+static APR_OPTIONAL_FN_TYPE(ssl_var_lookup) *othermod_var_lookup;
|
|
|
af9b8b |
+
|
|
|
af9b8b |
static int ssl_is_https(conn_rec *c)
|
|
|
af9b8b |
{
|
|
|
af9b8b |
SSLConnRec *sslconn = myConnConfig(c);
|
|
|
af9b8b |
- return sslconn && sslconn->ssl;
|
|
|
af9b8b |
+
|
|
|
af9b8b |
+ return (sslconn && sslconn->ssl)
|
|
|
af9b8b |
+ || (othermod_is_https && othermod_is_https(c));
|
|
|
af9b8b |
}
|
|
|
af9b8b |
|
|
|
af9b8b |
static const char var_interface[] = "mod_ssl/" AP_SERVER_BASEREVISION;
|
|
|
af9b8b |
@@ -106,6 +111,9 @@ void ssl_var_register(apr_pool_t *p)
|
|
|
af9b8b |
{
|
|
|
af9b8b |
char *cp, *cp2;
|
|
|
af9b8b |
|
|
|
af9b8b |
+ othermod_is_https = APR_RETRIEVE_OPTIONAL_FN(ssl_is_https);
|
|
|
af9b8b |
+ othermod_var_lookup = APR_RETRIEVE_OPTIONAL_FN(ssl_var_lookup);
|
|
|
af9b8b |
+
|
|
|
af9b8b |
APR_REGISTER_OPTIONAL_FN(ssl_is_https);
|
|
|
af9b8b |
APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
|
|
|
af9b8b |
APR_REGISTER_OPTIONAL_FN(ssl_ext_list);
|
|
|
af9b8b |
@@ -241,6 +249,15 @@ char *ssl_var_lookup(apr_pool_t *p, serv
|
|
|
af9b8b |
*/
|
|
|
af9b8b |
if (result == NULL && c != NULL) {
|
|
|
af9b8b |
SSLConnRec *sslconn = myConnConfig(c);
|
|
|
af9b8b |
+
|
|
|
af9b8b |
+ if (strlen(var) > 4 && strcEQn(var, "SSL_", 4)
|
|
|
af9b8b |
+ && (!sslconn || !sslconn->ssl) && othermod_var_lookup) {
|
|
|
af9b8b |
+ /* For an SSL_* variable, if mod_ssl is not enabled for
|
|
|
af9b8b |
+ * this connection and another SSL module is present, pass
|
|
|
af9b8b |
+ * through to that module. */
|
|
|
af9b8b |
+ return othermod_var_lookup(p, s, c, r, var);
|
|
|
af9b8b |
+ }
|
|
|
af9b8b |
+
|
|
|
af9b8b |
if (strlen(var) > 4 && strcEQn(var, "SSL_", 4)
|
|
|
af9b8b |
&& sslconn && sslconn->ssl)
|
|
|
af9b8b |
result = ssl_var_lookup_ssl(p, c, r, var+4);
|