From: Cliff Woolley <jwoolley@apache.org>
Date: Tue, 11 Jun 2002 04:54:01 +0000 (+0000)
Subject: fix the infinite recursion problem with HTTP-on-the-HTTPS port.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54a12997e34dc599a2c3824dca22f720f9923bc2;p=thirdparty%2Fapache%2Fhttpd.git

fix the infinite recursion problem with HTTP-on-the-HTTPS port.

Reported by:  Paul J. Reder
Submitted by: Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95604 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/ssl_engine_kernel.c b/ssl_engine_kernel.c
index 97812e9ea9f..c03832b31fc 100644
--- a/ssl_engine_kernel.c
+++ b/ssl_engine_kernel.c
@@ -199,6 +199,13 @@ int ssl_hook_ReadReq(request_rec *r)
                               thisurl, thisurl);
 
         apr_table_setn(r->notes, "error-notes", errmsg);
+
+        /* Now that we have caught this error, forget it. we are done
+         * with using SSL on this request.
+         */
+        sslconn->non_ssl_request = 0;
+        
+
         return HTTP_BAD_REQUEST;
     }