cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp13Packet.java

[hgomez]

hgomez      01/09/14 08:57:45

  Modified:    src/share/org/apache/tomcat/modules/server Ajp13Packet.java
  Log:
  Fix for bug #2927.
  When a non ajp13 packet header is sent on an ajp13
  connection, we don't try to dump it (it's just only 4 bytes !=)
  
  Revision  Changes    Path
  1.4       +7 -3      
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Packet.java
  
  Index: Ajp13Packet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Packet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Ajp13Packet.java  2001/08/29 05:08:07     1.3
  +++ Ajp13Packet.java  2001/09/14 15:57:45     1.4
  @@ -140,14 +140,18 @@
       public int checkIn() {
        pos = 0;
        int mark = getInt();
  -     len      = getInt();
        
        if( mark != 0x1234 ) {
            // XXX Logging
  -         System.out.println("BAD packet " + mark);
  -         dump( "In: " );
  +        System.err.println( "Ajp13Packet: invalid packet header : " + mark);
  +        // We only get 4 bytes, not necessary to dump this stuff with dump
  +         // dump( "In: " );
  +        // Bug #2927
            return -1;
        }
  +
  +     len = getInt();
  +
        return len;
       }