tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/webapp/java WarpRequest.java
Date Wed, 31 Oct 2001 23:14:10 GMT
jfclere     01/10/31 15:14:10

  Modified:    webapp/apache-1.3 mod_webapp.c
               webapp/java WarpRequest.java
  Log:
  Fix the core problem
  PR: 4545
  
  Revision  Changes    Path
  1.28      +5 -2      jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c
  
  Index: mod_webapp.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/apache-1.3/mod_webapp.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_webapp.c	2001/10/29 14:21:05	1.27
  +++ mod_webapp.c	2001/10/31 23:14:10	1.28
  @@ -57,7 +57,7 @@
   
   /**
    * @author  Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
  - * @version $Id: mod_webapp.c,v 1.27 2001/10/29 14:21:05 jfclere Exp $
  + * @version $Id: mod_webapp.c,v 1.28 2001/10/31 23:14:10 jfclere Exp $
    */
   
   #include <httpd.h>
  @@ -476,7 +476,10 @@
   
           ssl_temp = (char *)ap_table_get(
               r->subprocess_env,"SSL_CIPHER_USEKEYSIZE");
  -        req->ssld->size = atoi(ssl_temp);
  +        if (ssl_temp)
  +            req->ssld->size = atoi(ssl_temp);
  +        else
  +            req->ssld->size = 0;
   
           req->ssld->cert = (char *)ap_table_get(
               r->subprocess_env,"SSL_CLIENT_CERT");
  
  
  
  1.13      +3 -2      jakarta-tomcat-connectors/webapp/java/WarpRequest.java
  
  Index: WarpRequest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/java/WarpRequest.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- WarpRequest.java	2001/10/29 14:21:05	1.12
  +++ WarpRequest.java	2001/10/31 23:14:10	1.13
  @@ -114,8 +114,9 @@
   
               super.setAttribute("javax.servlet.request.cipher_suite",
                   ssldata.ciph);
  -            super.setAttribute("javax.servlet.request.key_size",
  -                new Integer (ssldata.size));
  +            if (ssldata.size)
  +                super.setAttribute("javax.servlet.request.key_size",
  +                    new Integer (ssldata.size));
               super.setAttribute("javax.servlet.request.ssl_session",
                   ssldata.sess);
           }
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message