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@95604 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 97812e9ea9f92829cfc46553a7427d5899aa29ba..c03832b31fc75d84ac76acbc834ff67a53e06456 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/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;
     }