www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Allow the enabled flag to be set to more that just TRUE or FALSE so that

Browse Source 
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
This commit is contained in:
Bradley Nicholes
2004-03-05 02:41:39 +00:00
parent 1c5889d105
commit 344ea84d8e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ssl/mod_ssl.c
View File

@@ -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);
}
}