Changeset 37f8282 in mod_gnutls for src/mod_gnutls.c

Timestamp:

Dec 7, 2011, 12:22:48 AM (9 years ago)

Author:

Dash Shendy <neuromancer@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream

Children:

694fc04

Parents:

33826c5

Message:

mod_proxy support continued

Signed-off-by: Dash Shendy <neuromancer@…>

File:

• src/mod_gnutls.c (modified) (5 diffs)

src/mod_gnutls.c

@@ -21 +21 @@
 
 static void gnutls_hooks(apr_pool_t * p) {
-
-    ap_hook_open_logs(mgs_hook_open_logs, NULL, NULL,APR_HOOK_MIDDLE);
+    
     /* Try Run Post-Config Hook After mod_proxy */
     static const char * const aszPre[] = { "mod_proxy.c", NULL };
@@ -33 +32 @@
 #endif
     /* Default Port Hook */
-    ap_hook_default_port(nss_hook_default_port,  NULL,NULL, APR_HOOK_MIDDLE);
+    ap_hook_default_port(mgs_hook_default_port,  NULL,NULL, APR_HOOK_MIDDLE);
     /* Pre-Connect Hook */
-    ap_hook_pre_connection(mgs_hook_default_port, NULL, NULL, APR_HOOK_MIDDLE);
+    ap_hook_pre_connection(mgs_hook_pre_connection, NULL, NULL, APR_HOOK_MIDDLE);
     /* Pre-Config Hook */
     ap_hook_pre_config(mgs_hook_pre_config, NULL, NULL,
@@ -68 +67 @@
     mgs_srvconf_rec *sc = (mgs_srvconf_rec *) 
             ap_get_module_config(c->base_server->module_config, &gnutls_module);
-    if(sc->enabled == GNUTLS_ENABLED_FALSE || sc->non_ssl_request) {
+    if(sc->enabled == 0 || sc->non_ssl_request == 1) {
         /* SSL/TLS Disabled or Plain HTTP Connection Detected */
         return 0;
@@ -92 +91 @@
     mgs_srvconf_rec *sc = (mgs_srvconf_rec *) 
             ap_get_module_config(c->base_server->module_config, &gnutls_module);
-    return sc->proxy_enabled;
+    sc->proxy_enabled = 1;
+    sc->enabled = 0;
+    return 1;
 }
 
@@ -99 +100 @@
     NULL,
     RSRC_CONF | OR_AUTHCFG,
-    "Set Verification Requirements of the Client Certificate"),
+    "Enable SSL Proxy Engine"),
     AP_INIT_TAKE1("GnuTLSClientVerify", mgs_set_client_verify,
     NULL,