httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl mod_ssl.c
Date Fri, 05 Mar 2004 02:41:39 GMT
bnicholes    2004/03/04 18:41:39

  Modified:    modules/ssl mod_ssl.c
  Log:
  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.
  
  Revision  Changes    Path
  1.97      +5 -5      httpd-2.0/modules/ssl/mod_ssl.c
  
  Index: mod_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.c,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- mod_ssl.c	28 Feb 2004 18:06:34 -0000	1.96
  +++ mod_ssl.c	5 Mar 2004 02:41:39 -0000	1.97
  @@ -313,7 +313,7 @@
   
       SSLConnRec *sslconn;
   
  -    if (!sc->enabled) {
  +    if (sc->enabled == SSL_ENABLED_FALSE) {
           return 0;
       }
   
  @@ -396,7 +396,7 @@
   {
       SSLSrvConfigRec *sc = mySrvConfig(r->server);
   
  -    if (sc->enabled == FALSE) {
  +    if (sc->enabled == SSL_ENABLED_FALSE) {
           return NULL;
       }
   
  @@ -407,7 +407,7 @@
   {
       SSLSrvConfigRec *sc = mySrvConfig(r->server);
   
  -    if (sc->enabled == FALSE) {
  +    if (sc->enabled == SSL_ENABLED_FALSE) {
           return 0;
       }
   
  @@ -422,7 +422,7 @@
       /*
        * 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 @@
   {
       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);
       }
   }
  
  
  

Mime
View raw message