diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2014-02-20 16:32:52 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2014-02-21 14:20:19 -0500 |
| commit | 6ea9bd897f3cfc1526067b52868d31ee3da19cc1 (patch) | |
| tree | 0b77a10ffa7ab22ba248a7c1038e04bbd43ebee3 /mod_nss.h | |
| parent | 8eff5df729dcad9c229e637b752b762a4ad5472a (diff) | |
| download | mod_nss-6ea9bd897f3cfc1526067b52868d31ee3da19cc1.tar.gz mod_nss-6ea9bd897f3cfc1526067b52868d31ee3da19cc1.tar.xz mod_nss-6ea9bd897f3cfc1526067b52868d31ee3da19cc1.zip | |
Work with mod_proxy when mod_ssl is also loaded.
There is a single-set of hooks in mod_proxy so if mod_ssl was even
loaded,even if not being used, it would grab those hooks and mod_nss
would not work.
Resolves #1021469
Diffstat (limited to 'mod_nss.h')
| -rw-r--r-- | mod_nss.h | 17 |
1 files changed, 4 insertions, 13 deletions
@@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef __MOD_SSL_H__ -#define __MOD_SSL_H__ +#ifndef __MOD_NSS_H__ +#define __MOD_NSS_H__ /* Apache headers */ #include "httpd.h" @@ -25,6 +25,7 @@ #include "http_connection.h" #include "http_request.h" #include "http_protocol.h" +#include "mod_ssl.h" #include "util_script.h" #include "util_filter.h" #include "mpm.h" @@ -438,34 +439,24 @@ int nss_hook_ReadReq(request_rec *r); /* 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(); @@ -495,4 +486,4 @@ void nss_die(void); /* NSS callback */ SECStatus nss_AuthCertificate(void *arg, PRFileDesc *socket, PRBool checksig, PRBool isServer); -#endif /* __MOD_SSL_H__ */ +#endif /* __MOD_NSS_H__ */ |