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

2002-02-20 Thread billbarker

billbarker02/02/20 19:04:20

  Modified:src/share/org/apache/tomcat/modules/server Ajp13Packet.java
  Log:
  Sanity check the output dump when debugging Ajp13.
  
  The problem is that on read, 'len' includes the header, and on write it doesn't.  
Now it won't try and dump past the end of the output.
  
  Fix for bug #6579.
  Reported by: Hans Schmid [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.5   +5 -2  
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Ajp13Packet.java  14 Sep 2001 15:57:45 -  1.4
  +++ Ajp13Packet.java  21 Feb 2002 03:04:20 -  1.5
  @@ -385,14 +385,17 @@
   }
   
   private void hexLine( int start , StringBuffer sb) {
  + int pkgEnd = len + 4;
  + if( pkgEnd  buff.length )
  + pkgEnd = buff.length;
for( int i=start; i start+16 ; i++ ) {
  - if( i  len + 4)
  + if( i  pkgEnd)
sb.append( hex( buff[i] ) +  );
else 
sb.append( );
}
sb.append( | );
  - for( int i=start; i  start+16  i  len + 4; i++ ) {
  + for( int i=start; i  start+16  i  pkgEnd; i++ ) {
char c=(char)buff[i];
if( ! Character.isISOControl(c) 
Character.isDefined(c) )
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]




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

2001-09-14 Thread 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  ChangesPath
  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;
   }
   
  
  
  



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

2001-06-24 Thread costin

costin  01/06/24 15:42:39

  Added:   src/share/org/apache/tomcat/modules/server Ajp13Packet.java
  Log:
  Moved from Ajp13.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13Packet.java
  
  Index: Ajp13Packet.java
  ===
  /*
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *any, must include the following acknowlegement:
   *   This product includes software developed by the
   *Apache Software Foundation (http://www.apache.org/).
   *Alternately, this acknowlegement may appear in the software itself,
   *if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names The Jakarta Project, Tomcat, and Apache Software
   *Foundation must not be used to endorse or promote products derived
   *from this software without prior written permission. For written
   *permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called Apache
   *nor may Apache appear in their names without prior written
   *permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * http://www.apache.org/.
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */
  
  package org.apache.tomcat.modules.server;
  
  import java.io.IOException;
  import java.io.UnsupportedEncodingException;
  import java.io.InputStream;
  import java.io.OutputStream;
  import java.net.Socket;
  import java.util.Enumeration;
  
  import org.apache.tomcat.core.*;
  import org.apache.tomcat.util.*;
  import org.apache.tomcat.util.http.MimeHeaders;
  import org.apache.tomcat.util.buf.MessageBytes;
  import org.apache.tomcat.util.http.HttpMessages;
  
  /* Frozen, bug fixes only: all active development goes in
   jakarta-tomcat-connectors/jk/org/apache/ajp/Ajp14*
  */
  
  /**
   * A single packet for communication between the web server and the
   * container.  Designed to be reused many times with no creation of
   * garbage.  Understands the format of data types for these packets.
   * Can be used (somewhat confusingly) for both incoming and outgoing
   * packets.  
   *
   * @author Dan Milstein [[EMAIL PROTECTED]]
   * @author Keith Wannamaker [[EMAIL PROTECTED]]
   */
  public class Ajp13Packet {
  byte buff[]; // Holds the bytes of the packet
  int pos; // The current read or write position in the buffer
  OutputBuffer ob;
  
  int len; 
  // This actually means different things depending on whether the
  // packet is read or write.  For read, it's the length of the
  // payload (excluding the header).  For write, it's the length of
  // the packet as a whole (counting the header).  Oh, well.
  
  /**
   * Create a new packet with an internal buffer of given size.
   */
  public Ajp13Packet( int size ) {
buff = new byte[size];
  }
  
  public Ajp13Packet( byte b[] ) {
buff = b;
  }
  
  public Ajp13Packet( OutputBuffer ob ) {
this.ob=ob;