You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@hyperreal.org on 1999/10/20 01:38:33 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/http HttpResponse.java

costin      99/10/19 16:38:33

  Modified:    src/share/org/apache/tomcat/core ResponseImpl.java
               src/share/org/apache/tomcat/service
                        Ajp11ConnectionHandler.java
               src/share/org/apache/tomcat/service/http HttpResponse.java
  Log:
  Bug fix in cookies - send V0 cookies in addition to v1. That solves
  a problem with J2EE login in Apache mode.
  ( the problem exists only when using Apache as a Web Server)
  
  Revision  Changes    Path
  1.2       +20 -3     jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java
  
  Index: ResponseImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResponseImpl.java	1999/10/09 00:30:16	1.1
  +++ ResponseImpl.java	1999/10/19 23:38:31	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v 1.1 1999/10/09 00:30:16 duncan Exp $
  - * $Revision: 1.1 $
  - * $Date: 1999/10/09 00:30:16 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v 1.2 1999/10/19 23:38:31 costin Exp $
  + * $Revision: 1.2 $
  + * $Date: 1999/10/19 23:38:31 $
    *
    * ====================================================================
    *
  @@ -290,12 +290,29 @@
               Cookie c  = (Cookie)cookieEnum.nextElement();
               headers.putHeader( CookieTools.getCookieHeaderName(c),
   			       CookieTools.getCookieHeaderValue(c));
  +	    if( c.getVersion() == 1 ) {
  +		// add a version 0 header too.
  +		// XXX what if the user set both headers??
  +		Cookie c0 = (Cookie)c.clone();
  +		c0.setVersion(0);            
  +		headers.putHeader( CookieTools.getCookieHeaderName(c0),
  +				   CookieTools.getCookieHeaderValue(c0));
  +	    }
           }
  +	// XXX duplicated code, ugly
           cookieEnum = userCookies.elements();
           while (cookieEnum.hasMoreElements()) {
               Cookie c  = (Cookie)cookieEnum.nextElement();
               headers.putHeader( CookieTools.getCookieHeaderName(c),
   			       CookieTools.getCookieHeaderValue(c));
  +	    if( c.getVersion() == 1 ) {
  +		// add a version 0 header too.
  +		// XXX what if the user set both headers??
  +		Cookie c0 = (Cookie)c.clone();
  +		c0.setVersion(0);            
  +		headers.putHeader( CookieTools.getCookieHeaderName(c0),
  +				   CookieTools.getCookieHeaderValue(c0));
  +	    }
           }
   	// XXX
           // do something with content encoding here
  
  
  
  1.2       +3 -4      jakarta-tomcat/src/share/org/apache/tomcat/service/Ajp11ConnectionHandler.java
  
  Index: Ajp11ConnectionHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Ajp11ConnectionHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Ajp11ConnectionHandler.java	1999/10/09 00:20:48	1.1
  +++ Ajp11ConnectionHandler.java	1999/10/19 23:38:32	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Ajp11ConnectionHandler.java,v 1.1 1999/10/09 00:20:48 duncan Exp $
  - * $Revision: 1.1 $
  - * $Date: 1999/10/09 00:20:48 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Ajp11ConnectionHandler.java,v 1.2 1999/10/19 23:38:32 costin Exp $
  + * $Revision: 1.2 $
  + * $Date: 1999/10/19 23:38:32 $
    *
    * ====================================================================
    *
  @@ -110,7 +110,6 @@
   	    AJPRequest request = new AJPRequest(socket); // todo: clean ConnectionHandler, make it abstract
   	    AJPResponse response = new AJPResponse();
               response.setOutputStream(socket.getOutputStream());
  -        
   	    int count = 1;
   
   	    request.setResponse(response);
  
  
  
  1.2       +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpResponse.java
  
  Index: HttpResponse.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpResponse.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HttpResponse.java	1999/10/09 00:20:49	1.1
  +++ HttpResponse.java	1999/10/19 23:38:32	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpResponse.java,v 1.1 1999/10/09 00:20:49 duncan Exp $
  - * $Revision: 1.1 $
  - * $Date: 1999/10/09 00:20:49 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/HttpResponse.java,v 1.2 1999/10/19 23:38:32 costin Exp $
  + * $Revision: 1.2 $
  + * $Date: 1999/10/19 23:38:32 $
    *
    * ====================================================================
    *
  @@ -128,7 +128,7 @@
           int size = headers.size();
           for (int i = 0; i < size; i++) {
               MimeHeaderField h = headers.getField(i);
  -            buf.append(h + "\r\n");
  +            buf.append(h).append("\r\n");
           }
           buf.append("\r\n");