From: Bradley Nicholes <bnicholes@apache.org>
Date: Wed, 13 Oct 2004 15:26:45 +0000 (+0000)
Subject: Add a check for SSL_ENABLED_OPTIONAL to the http_method and default_port hook so... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=577eaf7f3fd0213d1651f0ecf22e5e049ea52dfa;p=thirdparty%2Fapache%2Fhttpd.git

Add a check for SSL_ENABLED_OPTIONAL to the http_method and default_port hook so that they return the correct values for an upgradeable connection.


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

diff --git a/mod_ssl.c b/mod_ssl.c
index 0d93fea0edc..9b4b5f61c2b 100644
--- a/mod_ssl.c
+++ b/mod_ssl.c
@@ -400,7 +400,7 @@ static const char *ssl_hook_http_method(const request_rec *r)
 {
     SSLSrvConfigRec *sc = mySrvConfig(r->server);
 
-    if (sc->enabled == SSL_ENABLED_FALSE) {
+    if (sc->enabled == SSL_ENABLED_FALSE || sc->enabled == SSL_ENABLED_OPTIONAL) {
         return NULL;
     }
 
@@ -411,7 +411,7 @@ static apr_port_t ssl_hook_default_port(const request_rec *r)
 {
     SSLSrvConfigRec *sc = mySrvConfig(r->server);
 
-    if (sc->enabled == SSL_ENABLED_FALSE) {
+    if (sc->enabled == SSL_ENABLED_FALSE || sc->enabled == SSL_ENABLED_OPTIONAL) {
         return 0;
     }