tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters ChunkedInputFilter.java ChunkedOutputFilter.java
Date Mon, 24 Dec 2001 20:44:40 GMT
remm        01/12/24 12:44:40

  Modified:    http11/src/java/org/apache/coyote/http11
                        Http11Connector.java
  Added:       http11/src/java/org/apache/coyote/http11/filters
                        ChunkedInputFilter.java ChunkedOutputFilter.java
  Log:
  - Add placeholder code for chunking.
  
  Revision  Changes    Path
  1.5       +10 -4     jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Connector.java
  
  Index: Http11Connector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Connector.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Http11Connector.java	2001/12/09 22:10:47	1.4
  +++ Http11Connector.java	2001/12/24 20:44:40	1.5
  @@ -77,6 +77,8 @@
   import org.apache.coyote.Request;
   import org.apache.coyote.Response;
   
  +import org.apache.coyote.http11.filters.ChunkedInputFilter;
  +import org.apache.coyote.http11.filters.ChunkedOutputFilter;
   import org.apache.coyote.http11.filters.IdentityInputFilter;
   import org.apache.coyote.http11.filters.IdentityOutputFilter;
   import org.apache.coyote.http11.filters.VoidOutputFilter;
  @@ -406,7 +408,8 @@
           } else {
               // Unsupported protocol
               error = true;
  -            // FIXME: Find right status code
  +            // Send 505; Unsupported HTTP version
  +            response.setStatus(505);
           }
   
           // Check connection header
  @@ -463,7 +466,8 @@
                   if (!addInputFilter(inputFilters, encodingName)) {
                       // Unsupported transfer encoding
                       error = true;
  -                    // FIXME: Find right status code
  +                    // Send 501; Unimplemented
  +                    response.setStatus(502);
                   }
                   startPos = commaPos + 1;
                   commaPos = transferEncodingValue.indexOf(',', startPos);
  @@ -473,7 +477,8 @@
               if (!addInputFilter(inputFilters, encodingName)) {
                   // Unsupported transfer encoding
                   error = true;
  -                // FIXME: Find right status code
  +                // Send 501; Unimplemented
  +                response.setStatus(502);
               }
           }
   
  @@ -519,7 +524,8 @@
           outputBuffer.addFilter(new IdentityOutputFilter());
   
           // Create and add the chunked filters.
  -        // FIXME
  +        inputBuffer.addFilter(new ChunkedInputFilter());
  +        outputBuffer.addFilter(new ChunkedOutputFilter());
   
           // Create and add the void filter.
           outputBuffer.addFilter(new VoidOutputFilter());
  
  
  
  1.1                  jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
  
  Index: ChunkedInputFilter.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 apache@apache.org.
   *
   * 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.coyote.http11.filters;
  
  import java.io.IOException;
  
  import org.apache.tomcat.util.buf.ByteChunk;
  
  import org.apache.coyote.InputBuffer;
  import org.apache.coyote.Request;
  import org.apache.coyote.http11.InputFilter;
  
  /**
   * Chunked input filter.
   * 
   * @author Remy Maucherat
   */
  public class ChunkedInputFilter implements InputFilter {
  
  
      // -------------------------------------------------------------- Constants
  
  
      protected static final String ENCODING_NAME = "chunked";
      protected static final ByteChunk ENCODING = new ByteChunk();
  
  
      // ----------------------------------------------------- Static Initializer
  
  
      static {
          ENCODING.setBytes(ENCODING_NAME.getBytes(), 0, ENCODING_NAME.length());
      }
  
  
      // ----------------------------------------------------- Instance Variables
  
  
      /**
       * Remaining bytes in the current chunk.
       */
      protected long remaining = -1;
  
  
      /**
       * Next buffer in the pipeline.
       */
      protected InputBuffer buffer;
  
  
      // ------------------------------------------------------------- Properties
  
  
      // ---------------------------------------------------- InputBuffer Methods
  
  
      /**
       * Read bytes.
       * 
       * @return If the filter does request length control, this value is
       * significant; it should be the number of bytes consumed from the buffer,
       * up until the end of the current request body, or the buffer length, 
       * whichever is greater. If the filter does not do request body length
       * control, the returned value should be -1.
       */
      public int doRead(ByteChunk chunk)
          throws IOException {
  
          buffer.doRead(chunk);
  
          int result = chunk.getLength();
  
          if (result <= 0) {
              return -1;
          }
  
          return result;
  
      }
  
  
      // ---------------------------------------------------- InputFilter Methods
  
  
      /**
       * Read the content length from the request.
       */
      public void setRequest(Request request) {
      }
  
  
      /**
       * End the current request.
       */
      public long end()
          throws IOException {
  
          // FIXME: Consume extra bytes.
          // FIXME: If too many bytes were read, return the amount.
          return remaining;
  
      }
  
  
      /**
       * Set the next buffer in the filter pipeline.
       */
      public void setBuffer(InputBuffer buffer) {
          this.buffer = buffer;
      }
  
  
      /**
       * Make the filter ready to process the next request.
       */
      public void recycle() {
          remaining = 0;
      }
  
  
      /**
       * Return the name of the associated encoding; Here, the value is 
       * "identity".
       */
      public ByteChunk getEncodingName() {
          return ENCODING;
      }
  
  
  }
  
  
  
  1.1                  jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
  
  Index: ChunkedOutputFilter.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 apache@apache.org.
   *
   * 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.coyote.http11.filters;
  
  import java.io.IOException;
  
  import org.apache.tomcat.util.buf.ByteChunk;
  
  import org.apache.coyote.OutputBuffer;
  import org.apache.coyote.Response;
  import org.apache.coyote.http11.OutputFilter;
  
  /**
   * Chunked output filter.
   * 
   * @author Remy Maucherat
   */
  public class ChunkedOutputFilter implements OutputFilter {
  
  
      // -------------------------------------------------------------- Constants
  
  
      protected static final String ENCODING_NAME = "chunked";
      protected static final ByteChunk ENCODING = new ByteChunk();
  
  
      // ----------------------------------------------------- Static Initializer
  
  
      static {
          ENCODING.setBytes(ENCODING_NAME.getBytes(), 0, ENCODING_NAME.length());
      }
  
  
      // ----------------------------------------------------- Instance Variables
  
  
      /**
       * Next buffer in the pipeline.
       */
      protected OutputBuffer buffer;
  
  
      // ------------------------------------------------------------- Properties
  
  
      // --------------------------------------------------- OutputBuffer Methods
  
  
      /**
       * Write some bytes.
       * 
       * @return number of bytes written by the filter
       */
      public int doWrite(ByteChunk chunk)
          throws IOException {
  
          int result = chunk.getLength();
  
          if (result <= 0) {
              return -1;
          }
  
          // Write chunk header
          // FIXME
  
          buffer.doWrite(chunk);
  
          return result;
  
      }
  
  
      // --------------------------------------------------- OutputFilter Methods
  
  
      /**
       * Some filters need additional parameters from the response. All the 
       * necessary reading can occur in that method, as this method is called
       * after the response header processing is complete.
       */
      public void setResponse(Response response) {
      }
  
  
      /**
       * Set the next buffer in the filter pipeline.
       */
      public void setBuffer(OutputBuffer buffer) {
          this.buffer = buffer;
      }
  
  
      /**
       * End the current request. It is acceptable to write extra bytes using
       * buffer.doWrite during the execution of this method.
       */
      public long end()
          throws IOException {
  
          // Write end chunk
          // FIXME
          return 0;
  
      }
  
  
      /**
       * Make the filter ready to process the next request.
       */
      public void recycle() {
      }
  
  
      /**
       * Return the name of the associated encoding; Here, the value is 
       * "identity".
       */
      public ByteChunk getEncodingName() {
          return ENCODING;
      }
  
  
  }
  
  
  

--
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