Commit 2fc6e485 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Add a check for SSL_ENABLED_OPTIONAL to the http_method and default_port hook... 

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
parent 931b1f83

mod_ssl.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }