cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c

[jfclere]

jfclere     01/09/14 04:15:00

  Modified:    jk/java/org/apache/ajp Ajp13.java
               jk/native/common jk_ajp_common.c
  Log:
  Arrange the KEY_SIZE_ATTR. (Note it is for TC4.0).
  
  Revision  Changes    Path
  1.12      +5 -2      jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13.java
  
  Index: Ajp13.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Ajp13.java        2001/09/13 14:29:51     1.11
  +++ Ajp13.java        2001/09/14 11:15:00     1.12
  @@ -131,6 +131,7 @@
       public static final byte SC_A_SSL_CERT      = 7;
       public static final byte SC_A_SSL_CIPHER    = 8;
       public static final byte SC_A_SSL_SESSION   = 9;
  +    public static final byte SC_A_SSL_KEYSIZE   = 11;
   
       // Used for attributes which are not in the list above
       public static final byte SC_A_REQ_ATTRIBUTE = 10; 
  @@ -403,8 +404,6 @@
                isSSL = true;
                req.setAttribute("javax.servlet.request.X509Certificate",
                                 msg.getString());
  -                req.setAttribute("javax.servlet.request.key_size",
  -                                 new Integer (msg.getLen()));
                   break;
                
            case SC_A_SSL_CIPHER   :
  @@ -424,6 +423,10 @@
                                 msg.getString());
                   break;
   
  +         case SC_A_SSL_KEYSIZE :
  +                req.setAttribute("javax.servlet.request.key_size",
  +                                 new Integer (msg.getInt()));
  +                break;
            default:
                if (decodeMoreHeaders(req, attributeCode, msg) != 500)
                    break;
  
  
  
  1.11      +3 -2      jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
  
  Index: jk_ajp_common.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_ajp_common.c   2001/09/10 21:51:57     1.10
  +++ jk_ajp_common.c   2001/09/14 11:15:00     1.11
  @@ -59,7 +59,7 @@
    * Description: common stuff for bi-directional protocols ajp13/ajp14.     *
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           *
    * Author:      Henri Gomez <[EMAIL PROTECTED]>                               *
  - * Version:     $Revision: 1.10 $                                           *
  + * Version:     $Revision: 1.11 $                                           *
    ***************************************************************************/
   
   
  @@ -364,8 +364,9 @@
       /*
        * ssl_key_size is required by Servlet 2.3 API
        * added support only in ajp14 mode
  +     * JFC removed: ae->proto == AJP14_PROTO
        */
  -    if ((ae->proto == AJP14_PROTO) && (s->ssl_key_size != -1)) {
  +    if (s->ssl_key_size != -1) {
           if (jk_b_append_byte(msg, SC_A_SSL_KEY_SIZE) ||
               jk_b_append_int(msg, (unsigned short) s->ssl_key_size)) {
               jk_log(l, JK_LOG_ERROR, "Error ajp_marshal_into_msgb - Error appending 
the SSL key size\n");