Changeset 60cf11c in mod_gnutls

Timestamp:

Jul 8, 2011, 5:04:16 PM (12 years ago)

Author:

Dash Shendy <neuromancer@…>

Branches:

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

Children:

8fffed1

Parents:

b4a875b

Message:

Proxy (TLS termination) patch

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

Location:

src

Files:

• gnutls_hooks.c (modified) (2 diffs)
• gnutls_io.c (modified) (1 diff)

src/gnutls_hooks.c

@@ -739 +739 @@
         _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);
 
-        if (c == NULL)
-                return DECLINED;
+        if (c == NULL) {
+                return DECLINED;
+        }
 
         sc = (mgs_srvconf_rec *) ap_get_module_config(c->base_server->
@@ -750 +751 @@
         }
 
-        if (c->remote_addr->hostname)
-                /* Connection initiated by Apache (mod_proxy) => ignore */
-                return OK;
-
+        if (c->remote_addr->hostname || apr_strnatcmp(c->remote_ip,c->local_ip) == 0) {
+        /* Connection initiated by Apache (mod_proxy) => ignore */
+                return OK;
+        }
+                
         ctxt = create_gnutls_handle(c->pool, c);
 

src/gnutls_io.c

@@ -667 +667 @@
 
         /* If Len = 0, we don't do anything. */
-        if (!len)
-                return 0;
-
+        if (!len || buffer == NULL) {
+                return 0;
+        }
         if (!ctxt->input_bb) {
                 ctxt->input_rc = APR_EOF;