httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_vars.c
Date Thu, 04 Mar 2004 07:59:30 GMT
jorton      2004/03/03 23:59:30

  Modified:    modules/ssl ssl_engine_vars.c
  Log:
  * modules/ssl/ssl_engine_vars (ssl_var_lookup): Fix potential
  segfaults if called with r=NULL, c!=NULL, spotted by André.
  
  Revision  Changes    Path
  1.37      +4 -4      httpd-2.0/modules/ssl/ssl_engine_vars.c
  
  Index: ssl_engine_vars.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_vars.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -w -d -u -r1.36 -r1.37
  --- ssl_engine_vars.c	28 Feb 2004 23:03:15 -0000	1.36
  +++ ssl_engine_vars.c	4 Mar 2004 07:59:30 -0000	1.37
  @@ -130,6 +130,10 @@
               result = apr_psprintf(p, "%u", ap_get_server_port(r));
           else if (strcEQ(var, "SERVER_PROTOCOL"))
               result = r->protocol;
  +        else if (strcEQ(var, "REMOTE_USER"))
  +            result = r->user;
  +        else if (strcEQ(var, "AUTH_TYPE"))
  +            result = r->ap_auth_type;
       }
   
       /*
  @@ -139,10 +143,6 @@
           SSLConnRec *sslconn = myConnConfig(c);
           if (strcEQ(var, "REMOTE_ADDR"))
               result = c->remote_ip;
  -        else if (strcEQ(var, "REMOTE_USER"))
  -            result = r->user;
  -        else if (strcEQ(var, "AUTH_TYPE"))
  -            result = r->ap_auth_type;
           else if (strlen(var) > 4 && strcEQn(var, "SSL_", 4) 
                    && sslconn && sslconn->ssl)
               result = ssl_var_lookup_ssl(p, c, var+4);
  
  
  

Mime
View raw message