diff options
| author | Bradley Nicholes <bnicholes@apache.org> | 2004-03-05 03:41:39 +0100 |
|---|---|---|
| committer | Bradley Nicholes <bnicholes@apache.org> | 2004-03-05 03:41:39 +0100 |
| commit | 344ea84d8e3a92239f06b3b35af025653aaf9ca6 (patch) | |
| tree | 94e929cd4cbb4a38dc8f4b235b949b41913771ae /modules | |
| parent | * modules/ssl/ssl_engine_init.c (ssl_init_Engine): Log the OpenSSL (diff) | |
| download | apache2-344ea84d8e3a92239f06b3b35af025653aaf9ca6.tar.xz apache2-344ea84d8e3a92239f06b3b35af025653aaf9ca6.zip | |
Allow the enabled flag to be set to more that just TRUE or FALSE so that
the OPTIONAL flag is correctly merged within the
ssl_config_server_merge() function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102859 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ssl/mod_ssl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index 06e475d93b..4c8fb13e34 100644 --- a/modules/ssl/mod_ssl.c +++ b/modules/ssl/mod_ssl.c @@ -313,7 +313,7 @@ int ssl_engine_disable(conn_rec *c) SSLConnRec *sslconn; - if (!sc->enabled) { + if (sc->enabled == SSL_ENABLED_FALSE) { return 0; } @@ -396,7 +396,7 @@ static const char *ssl_hook_http_method(const request_rec *r) { SSLSrvConfigRec *sc = mySrvConfig(r->server); - if (sc->enabled == FALSE) { + if (sc->enabled == SSL_ENABLED_FALSE) { return NULL; } @@ -407,7 +407,7 @@ static apr_port_t ssl_hook_default_port(const request_rec *r) { SSLSrvConfigRec *sc = mySrvConfig(r->server); - if (sc->enabled == FALSE) { + if (sc->enabled == SSL_ENABLED_FALSE) { return 0; } @@ -422,7 +422,7 @@ static int ssl_hook_pre_connection(conn_rec *c, void *csd) /* * Immediately stop processing if SSL is disabled for this connection */ - if (!(sc && (sc->enabled == TRUE || + if (!(sc && (sc->enabled == SSL_ENABLED_TRUE || (sslconn && sslconn->is_proxy)))) { return DECLINED; @@ -457,7 +457,7 @@ static void ssl_hook_Insert_Filter(request_rec *r) { SSLSrvConfigRec *sc = mySrvConfig(r->server); - if (sc->enabled == UNSET) { + if (sc->enabled == SSL_ENABLED_OPTIONAL) { ap_add_output_filter("UPGRADE_FILTER", NULL, r, r->connection); } } |