Attachment 231461 Details for Bug 338671 – Register the mod_ssl functions if not loaded

[patch] Register the mod_ssl functions if not loaded

mod_nss-proxy.patch (text/plain), 3.77 KB, created by Rob Crittenden on 2007-10-18 19:46:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Crittenden

Created: 2007-10-18 19:46:14 UTC

Size: 3.77 KB

patch

obsolete

>diff -u --recursive mod_nss-1.0.7/mod_nss.c mod_nss-1.0.7.proxy/mod_nss.c
>--- mod_nss-1.0.7/mod_nss.c	2007-05-31 17:36:03.000000000 -0400
>+++ mod_nss-1.0.7.proxy/mod_nss.c	2007-10-18 11:01:51.000000000 -0400
>@@ -200,6 +200,10 @@
>     return 1;
> }
> 
>+int ssl_proxy_enable(conn_rec *c) {
>+    return nss_proxy_enable(c);
>+}
>+
> int nss_engine_disable(conn_rec *c)
> {
>     SSLSrvConfigRec *sc = mySrvConfig(c->base_server);
>@@ -217,6 +221,10 @@
>     return 1;
> }
> 
>+int ssl_engine_disable(conn_rec *c) {
>+    return nss_engine_disable(c);
>+}
>+
> /* Callback for an incoming certificate that is not valid */
> 
> SECStatus NSSBadCertHandler(void *arg, PRFileDesc * socket)
>@@ -430,6 +438,12 @@
> 
>     APR_REGISTER_OPTIONAL_FN(nss_proxy_enable);
>     APR_REGISTER_OPTIONAL_FN(nss_engine_disable);
>+
>+    /* If mod_ssl is not loaded then mod_nss can work with mod_proxy */
>+    if (APR_RETRIEVE_OPTIONAL_FN(ssl_proxy_enable) == NULL)
>+        APR_REGISTER_OPTIONAL_FN(ssl_proxy_enable);
>+    if (APR_RETRIEVE_OPTIONAL_FN(ssl_engine_disable) == NULL)
>+        APR_REGISTER_OPTIONAL_FN(ssl_engine_disable);
> }
> 
> module AP_MODULE_DECLARE_DATA nss_module = {
>diff -u --recursive mod_nss-1.0.7/mod_nss.h mod_nss-1.0.7.proxy/mod_nss.h
>--- mod_nss-1.0.7/mod_nss.h	2007-05-31 17:36:03.000000000 -0400
>+++ mod_nss-1.0.7.proxy/mod_nss.h	2007-10-18 10:58:25.000000000 -0400
>@@ -419,24 +419,34 @@
> /*  Variables  */
> void         nss_var_register(void);
> char        *nss_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
>+char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
> void         nss_var_log_config_register(apr_pool_t *p);
> 
> APR_DECLARE_OPTIONAL_FN(char *, nss_var_lookup,
>                         (apr_pool_t *, server_rec *,
>                          conn_rec *, request_rec *, 
>                          char *));
>+APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup,
>+                        (apr_pool_t *, server_rec *,
>+                         conn_rec *, request_rec *, 
>+                         char *));
> 
> /* An optional function which returns non-zero if the given connection
>  * is using SSL/TLS. */
> APR_DECLARE_OPTIONAL_FN(int, nss_is_https, (conn_rec *));
>+APR_DECLARE_OPTIONAL_FN(int, ssl_is_https, (conn_rec *));
> 
> /* Proxy Support */
> int nss_proxy_enable(conn_rec *c);
> int nss_engine_disable(conn_rec *c);
>+int ssl_proxy_enable(conn_rec *c);
>+int ssl_engine_disable(conn_rec *c);
> 
> APR_DECLARE_OPTIONAL_FN(int, nss_proxy_enable, (conn_rec *));
>+APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));
> 
> APR_DECLARE_OPTIONAL_FN(int, nss_engine_disable, (conn_rec *));
>+APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
> 
> /* I/O */
> PRFileDesc * nss_io_new_fd();
>diff -u --recursive mod_nss-1.0.7/nss_engine_vars.c mod_nss-1.0.7.proxy/nss_engine_vars.c
>--- mod_nss-1.0.7/nss_engine_vars.c	2007-05-31 17:36:03.000000000 -0400
>+++ mod_nss-1.0.7.proxy/nss_engine_vars.c	2007-10-18 10:58:12.000000000 -0400
>@@ -46,10 +46,21 @@
>     return sslconn && sslconn->ssl;
> }
> 
>+static int ssl_is_https(conn_rec *c) {
>+    return nss_is_https(c);
>+}
>+
> void nss_var_register(void)
> {
>     APR_REGISTER_OPTIONAL_FN(nss_is_https);
>     APR_REGISTER_OPTIONAL_FN(nss_var_lookup);
>+
>+    /* These can only be registered if mod_ssl is not loaded */
>+    if (APR_RETRIEVE_OPTIONAL_FN(ssl_is_https) == NULL)
>+        APR_REGISTER_OPTIONAL_FN(ssl_is_https);
>+    if (APR_RETRIEVE_OPTIONAL_FN(ssl_var_lookup) == NULL)
>+        APR_REGISTER_OPTIONAL_FN(ssl_var_lookup);
>+
>     return;
> }
> 
>@@ -241,6 +252,10 @@
>     return result;
> }
> 
>+char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, char *var) {
>+    return nss_var_lookup(p, s, c, r, var);
>+}
>+
> static char *nss_var_lookup_header(apr_pool_t *p, request_rec *r, const char *name)
> {
>     char *hdr = NULL;

Actions: View | Diff

Attachments on bug 338671: 231461