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/arch/netware mod_nw_ssl.c
Date Wed, 27 Oct 2004 15:14:51 GMT
bnicholes    2004/10/27 08:14:51

  Modified:    modules/arch/netware mod_nw_ssl.c
  Log:
  Add the check for an upgraded https connection when responding to the state of a connection
  
  Revision  Changes    Path
  1.23      +9 -7      httpd-2.0/modules/arch/netware/mod_nw_ssl.c
  
  Index: mod_nw_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/netware/mod_nw_ssl.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_nw_ssl.c	14 Oct 2004 17:10:30 -0000	1.22
  +++ mod_nw_ssl.c	27 Oct 2004 15:14:51 -0000	1.23
  @@ -789,7 +789,9 @@
   
   static int ssl_is_https(conn_rec *c)
   {
  -    return isSecureConn (c->base_server, c);
  +    secsocket_data *csd_data = (secsocket_data*)ap_get_module_config(c->conn_config,
&nwssl_module);
  +
  +    return isSecureConn (c->base_server, c) || (csd_data && csd_data->is_secure);
   }
   
   /* This function must remain safe to use for a non-SSL connection. */
  @@ -836,6 +838,12 @@
                   result = apr_table_get(r->headers_in, "Proxy-Connection");
               else if (strcEQ(var, "HTTP_ACCEPT"))
                   result = apr_table_get(r->headers_in, "Accept");
  +            else if (strcEQ(var, "HTTPS")) {
  +                if (isSecure(r) || isSecureUpgraded(r))
  +                    result = "on";
  +                else
  +                    result = "off";
  +            }
               else if (strlen(var) > 5 && strcEQn(var, "HTTP:", 5))
                   /* all other headers from which we are still not know about */
                   result = apr_table_get(r->headers_in, var+5);
  @@ -908,12 +916,6 @@
   			result = NULL;
           else if (strcEQ(var, "REMOTE_ADDR"))
               result = c->remote_ip;
  -        else if (strcEQ(var, "HTTPS")) {
  -			if (isSecureConn (s, c))
  -                result = "on";
  -            else
  -                result = "off";
  -        }
       }
   
       /*
  
  
  

Mime
View raw message