From 7d84a7d3f316a65e5cd9d66a6a0040321819530a Mon Sep 17 00:00:00 2001 From: Bradley Nicholes Date: Wed, 13 Oct 2004 15:26:45 +0000 Subject: [PATCH] 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@105426 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/mod_ssl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index 0d93fea0ed..9b4b5f61c2 100644 --- a/modules/ssl/mod_ssl.c +++ b/modules/ssl/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; } -- 2.50.1