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-4.0/catalina/src/share/org/apache/catalina/connector/http HttpProcessor.java HttpResponseStream.java
Date Sat, 03 Nov 2001 02:24:19 GMT
remm        01/11/02 18:24:19

  Modified:    catalina/src/share/org/apache/catalina/connector/http Tag:
                        tomcat_40_branch HttpProcessor.java
                        HttpResponseStream.java
  Log:
  - Port from HEAD:
    - If the client announced it was closing the connection, repeat the
      connection: close in the response.
    - Don't remove the transfer encoding header if chunking is disabled.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.36.2.2  +5 -4      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
  
  Index: HttpProcessor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
  retrieving revision 1.36.2.1
  retrieving revision 1.36.2.2
  diff -u -r1.36.2.1 -r1.36.2.2
  --- HttpProcessor.java	2001/10/04 19:26:36	1.36.2.1
  +++ HttpProcessor.java	2001/11/03 02:24:18	1.36.2.2
  @@ -1,6 +1,6 @@
  -/* * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.36.2.1 2001/10/04 19:26:36 remm Exp $
  - * $Revision: 1.36.2.1 $
  - * $Date: 2001/10/04 19:26:36 $
  +/* * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.36.2.2 2001/11/03 02:24:18 remm Exp $
  + * $Revision: 1.36.2.2 $
  + * $Date: 2001/11/03 02:24:18 $
    *
    * ====================================================================
    *
  @@ -106,7 +106,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.36.2.1 $ $Date: 2001/10/04 19:26:36 $
  + * @version $Revision: 1.36.2.2 $ $Date: 2001/11/03 02:24:18 $
    */
   
   final class HttpProcessor
  @@ -652,6 +652,7 @@
                   if (header.valueEquals
                       (DefaultHeaders.CONNECTION_CLOSE_VALUE)) {
                       keepAlive = false;
  +                    response.setHeader("Connection", "close");
                   }
                   //request.setConnection(header);
                   /*
  
  
  
  1.7.2.2   +6 -7      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
  
  Index: HttpResponseStream.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- HttpResponseStream.java	2001/10/04 19:26:29	1.7.2.1
  +++ HttpResponseStream.java	2001/11/03 02:24:18	1.7.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.7.2.1 2001/10/04 19:26:29 remm Exp $
  - * $Revision: 1.7.2.1 $
  - * $Date: 2001/10/04 19:26:29 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.7.2.2 2001/11/03 02:24:18 remm Exp $
  + * $Revision: 1.7.2.2 $
  + * $Date: 2001/11/03 02:24:18 $
    *
    * ====================================================================
    *
  @@ -219,15 +219,14 @@
               // If we should chunk, but chunking is forbidden by the connector,
               // we close the connection
               response.setHeader("Connection", "close");
  -        } else {
  -            response.removeHeader("Connection", "close");
           }
           // Don't chunk is the connection will be closed
           useChunking = (useChunking && !response.isCloseConnection());
  -        if (useChunking)
  +        if (useChunking) {
               response.setHeader("Transfer-Encoding", "chunked");
  -        else
  +        } else if (response.isChunkingAllowed()) {
               response.removeHeader("Transfer-Encoding", "chunked");
  +        }
       }
   
   
  
  
  

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