cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2003-03-28 Thread remm 
remm2003/03/28 05:57:56

  Modified:coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  - Fix dumb bug (when c-l is not set; oops).
  
  Revision  ChangesPath
  1.22  +6 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- CoyoteResponse.java   27 Mar 2003 22:36:21 -  1.21
  +++ CoyoteResponse.java   28 Mar 2003 13:57:55 -  1.22
  @@ -365,7 +365,8 @@
*/
   public boolean isAppCommitted() {
   return (this.appCommitted || isCommitted() || isSuspended()
  -|| (getContentCount() = getContentLength()));
  +|| ((getContentLength() != -1) 
  + (getContentCount() = getContentLength(;
   }
   
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2003-03-27 Thread remm 
remm2003/03/27 10:29:39

  Modified:coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  - If contentCount is equal to contentLength, the response is considered
committed.
  
  Revision  ChangesPath
  1.20  +6 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- CoyoteResponse.java   18 Mar 2003 10:54:54 -  1.19
  +++ CoyoteResponse.java   27 Mar 2003 18:29:39 -  1.20
  @@ -364,7 +364,8 @@
* Application commit flag accessor.
*/
   public boolean isAppCommitted() {
  -return (this.appCommitted || isCommitted() || isSuspended());
  +return (this.appCommitted || isCommitted() || isSuspended()
  +|| (getContentCount() == getContentLength()));
   }
   
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2003-03-27 Thread remm 
remm2003/03/27 14:36:21

  Modified:coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  - Improve the check to handle broken cases.
  
  Revision  ChangesPath
  1.21  +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CoyoteResponse.java   27 Mar 2003 18:29:39 -  1.20
  +++ CoyoteResponse.java   27 Mar 2003 22:36:21 -  1.21
  @@ -365,7 +365,7 @@
*/
   public boolean isAppCommitted() {
   return (this.appCommitted || isCommitted() || isSuspended()
  -|| (getContentCount() == getContentLength()));
  +|| (getContentCount() = getContentLength()));
   }
   
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2003-03-18 Thread remm 
remm2003/03/18 02:54:54

  Modified:coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  - Port patch.
  - Note: The appCommitted flag is not useful, but I'll leave it in in the event we 
want
to separate the application commit (calling flush) with the real socket commit.
I do not quite undestand why the application is allowed to make operations
which have direct impact on the network layer, without allowing the
container to optimize anything.
  
  Revision  ChangesPath
  1.19  +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- CoyoteResponse.java   9 Jan 2003 18:15:05 -   1.18
  +++ CoyoteResponse.java   18 Mar 2003 10:54:54 -  1.19
  @@ -364,7 +364,7 @@
* Application commit flag accessor.
*/
   public boolean isAppCommitted() {
  -return (this.appCommitted || isCommitted());
  +return (this.appCommitted || isCommitted() || isSuspended());
   }
   
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java OutputBuffer.java

2003-01-09 Thread remm 
remm2003/01/09 10:15:05

  Modified:coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java OutputBuffer.java
  Log:
  - Throw an exception when creating the writer if the encoding is invlaid.
  
  Revision  ChangesPath
  1.18  +5 -4  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- CoyoteResponse.java   3 Jan 2003 19:31:54 -   1.17
  +++ CoyoteResponse.java   9 Jan 2003 18:15:05 -   1.18
  @@ -629,6 +629,7 @@
   (sm.getString(coyoteResponse.getWriter.ise));
   
   usingWriter = true;
  +outputBuffer.checkConverter();
   return writer;
   
   }
  
  
  
  1.5   +15 -1 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/OutputBuffer.java
  
  Index: OutputBuffer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/OutputBuffer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OutputBuffer.java 5 Jan 2003 11:20:18 -   1.4
  +++ OutputBuffer.java 9 Jan 2003 18:15:05 -   1.5
  @@ -581,7 +581,17 @@
   }
   
   
  -protected void setConverter() {
  +public void checkConverter() 
  +throws IOException {
  +
  +if (!gotEnc)
  +setConverter();
  +
  +}
  +
  +
  +protected void setConverter() 
  +throws IOException {
   
   if (coyoteResponse != null)
   enc = coyoteResponse.getCharacterEncoding();
  @@ -594,6 +604,9 @@
   enc = DEFAULT_ENCODING;
   conv = (C2BConverter) encoders.get(enc);
   if (conv == null) {
  +conv = new C2BConverter(bb, enc);
  +encoders.put(enc, conv);
  +/*
   try {
   conv = new C2BConverter(bb, enc);
   encoders.put(enc, conv);
  @@ -608,6 +621,7 @@
   }
   }
   }
  +*/
   }
   }
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java CoyoteWriter.java

2002-12-19 Thread remm 
remm2002/12/19 01:08:50

  Modified:coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java CoyoteWriter.java
  Log:
  - Properly recycle writer after an error.
  
  Revision  ChangesPath
  1.16  +7 -4  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CoyoteResponse.java   4 Dec 2002 17:42:31 -   1.15
  +++ CoyoteResponse.java   19 Dec 2002 09:08:50 -  1.16
  @@ -332,6 +332,9 @@
   facade.clear();
   facade = null;
   }
  +
  +writer.recycle();
  +
   }
   
   
  
  
  
  1.3   +11 -0 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteWriter.java
  
  Index: CoyoteWriter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteWriter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CoyoteWriter.java 20 Nov 2002 13:47:48 -  1.2
  +++ CoyoteWriter.java 19 Dec 2002 09:08:50 -  1.3
  @@ -96,6 +96,17 @@
   }
   
   
  +//  Package Methods
  +
  +
  +/**
  + * Recycle.
  + */
  +void recycle() {
  +error = false;
  +}
  +
  +
   // - Writer Methods
   
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2002-12-04 Thread jfarcand 
jfarcand2002/12/04 09:42:32

  Modified:coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  Fix for bugtraq 4772112 encodeURL does not encode session with empty URL (rfc2396)
  
  Revision  ChangesPath
  1.15  +12 -6 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- CoyoteResponse.java   3 Dec 2002 16:37:59 -   1.14
  +++ CoyoteResponse.java   4 Dec 2002 17:42:31 -   1.15
  @@ -1033,10 +1033,16 @@
* @param url URL to be encoded
*/
   public String encodeURL(String url) {
  -
  -if (isEncodeable(toAbsolute(url))) {
  +
  +String absolute = toAbsolute(url);
  +if (isEncodeable(absolute)) {
   HttpServletRequest hreq =
   (HttpServletRequest) request.getRequest();
  +
  +// W3c spec clearly said 
  +if (url.equalsIgnoreCase()){
  +url = absolute;
  +}
   return (toEncoded(url, hreq.getSession().getId()));
   } else {
   return (url);
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2002-12-03 Thread jfarcand 
jfarcand2002/12/03 08:04:02

  Modified:coyote/src/java/org/apache/coyote Response.java
   coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  As Bill's recommends, do not set a default locale in Response directly.
  
  Revision  ChangesPath
  1.18  +4 -10 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java
  
  Index: Response.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Response.java 3 Dec 2002 02:29:14 -   1.17
  +++ Response.java 3 Dec 2002 16:04:02 -   1.18
  @@ -92,13 +92,7 @@
   
   // - Instance Variables
   
  -
  -/**
  - * Default locale
  - */
  -private static Locale DEFAULT_LOCALE = new Locale(en, US);
  -
  -
  +   
   /**
* Status code.
*/
  @@ -148,7 +142,7 @@
   protected String contentLanguage = null;
   protected String characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
   protected int contentLength = -1;
  -private Locale locale = DEFAULT_LOCALE;
  +private Locale locale = null;
   
   /**
* Holds request error exception.
  @@ -317,7 +311,7 @@
   // Reset the headers only if this is the main request,
   // not for included
   contentType = Constants.DEFAULT_CONTENT_TYPE;
  -locale = DEFAULT_LOCALE;
  +locale = null;
   contentLanguage = null;
   characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
   contentLength = -1;
  @@ -531,7 +525,7 @@
   
   contentType = Constants.DEFAULT_CONTENT_TYPE;
   contentLanguage = null;
  -locale = DEFAULT_LOCALE;
  +locale = null;
   characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
   contentLength = -1;
   status = 200;
  
  
  
  1.13  +14 -6 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CoyoteResponse.java   3 Dec 2002 02:29:14 -   1.12
  +++ CoyoteResponse.java   3 Dec 2002 16:04:02 -   1.13
  @@ -136,7 +136,12 @@
   
   // - Instance Variables
   
  +   /**
  + * Default locale as mandated by the spec.
  + */
  +private static Locale DEFAULT_LOCALE = new Locale(en, US);
   
  +
   /**
* The date format we will use for creating date headers.
*/
  @@ -326,13 +331,13 @@
   error = false;
   isContentTypeSet = false;
   isCharacterEncodingSet = false;
  +
   cookies.clear();
   
   if ((Constants.SECURITY)  (facade != null)) {
   facade.clear();
   facade = null;
   }
  -
   }
   
   
  @@ -607,6 +612,10 @@
* Return the Locale assigned to this response.
*/
   public Locale getLocale() {
  +// Lazy setting. If the local is null, then return the default one.
  +if ( coyoteResponse.getLocale() == null){
  +coyoteResponse.setLocale(DEFAULT_LOCALE);
  +}
   return (coyoteResponse.getLocale());
   }
   
  @@ -652,7 +661,6 @@
   
   coyoteResponse.reset();
   outputBuffer.reset();
  -
   }
   
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2002-12-03 Thread jfarcand 
jfarcand2002/12/03 08:37:59

  Modified:coyote/src/java/org/apache/coyote Response.java
   coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  Go back and set the locale in Response (required by 2.3 and 2.4).  Watchdog is 
falling if the getLocale returns null ;-)
  
  Revision  ChangesPath
  1.19  +9 -3  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java
  
  Index: Response.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Response.java 3 Dec 2002 16:04:02 -   1.18
  +++ Response.java 3 Dec 2002 16:37:59 -   1.19
  @@ -92,6 +92,12 @@
   
   // - Instance Variables
   
  +
  +   /**
  + * Default locale as mandated by the spec.
  + */
  +private static Locale DEFAULT_LOCALE = new Locale(en, US);
  +
  
   /**
* Status code.
  @@ -142,7 +148,7 @@
   protected String contentLanguage = null;
   protected String characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
   protected int contentLength = -1;
  -private Locale locale = null;
  +private Locale locale = DEFAULT_LOCALE;
   
   /**
* Holds request error exception.
  @@ -311,7 +317,7 @@
   // Reset the headers only if this is the main request,
   // not for included
   contentType = Constants.DEFAULT_CONTENT_TYPE;
  -locale = null;
  +locale = DEFAULT_LOCALE;
   contentLanguage = null;
   characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
   contentLength = -1;
  @@ -525,7 +531,7 @@
   
   contentType = Constants.DEFAULT_CONTENT_TYPE;
   contentLanguage = null;
  -locale = null;
  +locale = DEFAULT_LOCALE;
   characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
   contentLength = -1;
   status = 200;
  
  
  
  1.14  +4 -14 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CoyoteResponse.java   3 Dec 2002 16:04:02 -   1.13
  +++ CoyoteResponse.java   3 Dec 2002 16:37:59 -   1.14
  @@ -136,12 +136,6 @@
   
   // - Instance Variables
   
  -   /**
  - * Default locale as mandated by the spec.
  - */
  -private static Locale DEFAULT_LOCALE = new Locale(en, US);
  -
  -
   /**
* The date format we will use for creating date headers.
*/
  @@ -612,10 +606,6 @@
* Return the Locale assigned to this response.
*/
   public Locale getLocale() {
  -// Lazy setting. If the local is null, then return the default one.
  -if ( coyoteResponse.getLocale() == null){
  -coyoteResponse.setLocale(DEFAULT_LOCALE);
  -}
   return (coyoteResponse.getLocale());
   }
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java OutputBuffer.java

2002-11-11 Thread remm 
remm2002/11/11 03:01:05

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteResponse.java OutputBuffer.java
   coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java OutputBuffer.java
  Log:
  - Properly compute the size of the content sent (previously, only the bytes
were counted).
  - Fix bug 14281.
  - Patch submitted by Eloy Lafuente stronk7 at si.unirioja.es
  
  Revision  ChangesPath
  1.29  +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- CoyoteResponse.java   6 Nov 2002 09:26:42 -   1.28
  +++ CoyoteResponse.java   11 Nov 2002 11:01:04 -  1.29
   -330,7 +330,7 
* Return the number of bytes actually written to the output stream.
*/
   public int getContentCount() {
  -return outputBuffer.getBytesWritten();
  +return outputBuffer.getContentWritten();
   }
   
   
  
  
  
  1.9   +5 -0  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/OutputBuffer.java
  
  Index: OutputBuffer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/OutputBuffer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- OutputBuffer.java 6 Nov 2002 09:26:42 -   1.8
  +++ OutputBuffer.java 11 Nov 2002 11:01:04 -  1.9
   -639,6 +639,11 
   }
   
   
  +public int getContentWritten() {
  +return bytesWritten + charsWritten;
  +}
  +
  +
   /** 
* True if this buffer hasn't been used ( since recycle() ) -
* i.e. no chars or bytes have been added to the buffer.  
  
  
  
  1.11  +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CoyoteResponse.java   5 Nov 2002 18:44:55 -   1.10
  +++ CoyoteResponse.java   11 Nov 2002 11:01:04 -  1.11
   -330,7 +330,7 
* Return the number of bytes actually written to the output stream.
*/
   public int getContentCount() {
  -return outputBuffer.getBytesWritten();
  +return outputBuffer.getContentWritten();
   }
   
   
  
  
  
  1.3   +5 -0  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/OutputBuffer.java
  
  Index: OutputBuffer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/OutputBuffer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OutputBuffer.java 5 Nov 2002 18:44:55 -   1.2
  +++ OutputBuffer.java 11 Nov 2002 11:01:05 -  1.3
   -639,6 +639,11 
   }
   
   
  +public int getContentWritten() {
  +return bytesWritten + charsWritten;
  +}
  +
  +
   /** 
* True if this buffer hasn't been used ( since recycle() ) -
* i.e. no chars or bytes have been added to the buffer.  
  
  
  

--
To unsubscribe, e-mail:   mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2002-10-03 Thread billbarker 

billbarker2002/10/03 20:36:27

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteResponse.java
   coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  Change the URL from Java's to Craig's.
  
  This means that we don't need a protocol handler for whichever protocol we get asked 
to deal with (e.g. https).
  
  Revision  ChangesPath
  1.26  +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- CoyoteResponse.java   12 Sep 2002 06:42:11 -  1.25
  +++ CoyoteResponse.java   4 Oct 2002 03:36:27 -   1.26
  @@ -69,7 +69,6 @@
   import java.io.OutputStream;
   import java.io.PrintWriter;
   import java.net.MalformedURLException;
  -import java.net.URL;
   import java.text.SimpleDateFormat;
   import java.util.ArrayList;
   import java.util.Date;
  @@ -95,6 +94,7 @@
   import org.apache.tomcat.util.buf.UEncoder;
   import org.apache.tomcat.util.http.MimeHeaders;
   import org.apache.tomcat.util.http.ServerCookie;
  +import org.apache.tomcat.util.net.URL;
   
   import org.apache.coyote.Response;
   
  
  
  
  1.8   +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CoyoteResponse.java   5 Sep 2002 07:58:42 -   1.7
  +++ CoyoteResponse.java   4 Oct 2002 03:36:27 -   1.8
  @@ -69,7 +69,6 @@
   import java.io.OutputStream;
   import java.io.PrintWriter;
   import java.net.MalformedURLException;
  -import java.net.URL;
   import java.text.SimpleDateFormat;
   import java.util.ArrayList;
   import java.util.Date;
  @@ -95,6 +94,7 @@
   import org.apache.tomcat.util.buf.UEncoder;
   import org.apache.tomcat.util.http.MimeHeaders;
   import org.apache.tomcat.util.http.ServerCookie;
  +import org.apache.tomcat.util.net.URL;
   
   import org.apache.coyote.Response;
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2002-09-05 Thread remm 

remm2002/09/05 00:58:42

  Modified:coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  - Implement what Bill suggested, using MimeHeaders.values(String). Sorry
for implementing it the wrong way the first time around.
  - This fixes the case sensitivity issue, and it also puts all the logic back
into MimeHeaders where it belongs.
  
  Revision  ChangesPath
  1.7   +7 -8  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CoyoteResponse.java   4 Sep 2002 18:54:02 -   1.6
  +++ CoyoteResponse.java   5 Sep 2002 07:58:42 -   1.7
  @@ -814,11 +814,10 @@
*/
   public String[] getHeaderValues(String name) {
   
  -MimeHeaders headers = coyoteResponse.getMimeHeaders();
  +Enumeration enum = coyoteResponse.getMimeHeaders().values(name);
   Vector result = new Vector();
  -for (int i = 0; i  headers.size(); i++) {
  -if (name.equals( headers.getName(i).toString() ))
  -result.addElement( headers.getValue(i).toString() );
  +while (enum.hasMoreElements()) {
  +result.addElement(enum.nextElement());
   }
   String[] resultArray = new String[result.size()];
   result.copyInto(resultArray);
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2002-09-04 Thread bobh 

bobh2002/09/04 11:48:08

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteResponse.java
   coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
   - I noticed that RequestDumperValve was unhappy, so I investigaged and found
  that getHeaderValues(String name) was not even using the name parameter.  This
  fixes that.
  
  Revision  ChangesPath
  1.21  +12 -9 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CoyoteResponse.java   4 Aug 2002 19:39:49 -   1.20
  +++ CoyoteResponse.java   4 Sep 2002 18:48:08 -   1.21
  @@ -79,6 +79,7 @@
   import java.util.Locale;
   import java.util.Map;
   import java.util.TimeZone;
  +import java.util.Vector;
   
   import javax.servlet.ServletContext;
   import javax.servlet.ServletException;
  @@ -789,12 +790,14 @@
   public String[] getHeaderValues(String name) {
   
   MimeHeaders headers = coyoteResponse.getMimeHeaders();
  -int n = headers.size();
  -String[] result = new String[n];
  -for (int i = 0; i  n; i++) {
  -result[i] = headers.getValue(i).toString();
  + Vector result = new Vector();
  +for (int i = 0; i  headers.size(); i++) {
  + if (name.equals( headers.getName(i).toString() ))
  + result.addElement( headers.getValue(i).toString() );
   }
  -return result;
  +String[] resultArray = new String[result.size()];
  +result.copyInto(resultArray);
  +return resultArray;
   
   }
   
  
  
  
  1.5   +12 -9 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CoyoteResponse.java   13 Aug 2002 20:44:13 -  1.4
  +++ CoyoteResponse.java   4 Sep 2002 18:48:08 -   1.5
  @@ -79,6 +79,7 @@
   import java.util.Locale;
   import java.util.Map;
   import java.util.TimeZone;
  +import java.util.Vector;
   
   import javax.servlet.ServletContext;
   import javax.servlet.ServletException;
  @@ -814,12 +815,14 @@
   public String[] getHeaderValues(String name) {
   
   MimeHeaders headers = coyoteResponse.getMimeHeaders();
  -int n = headers.size();
  -String[] result = new String[n];
  -for (int i = 0; i  n; i++) {
  -result[i] = headers.getValue(i).toString();
  + Vector result = new Vector();
  +for (int i = 0; i  headers.size(); i++) {
  + if (name.equals( headers.getName(i).toString() ))
  + result.addElement( headers.getValue(i).toString() );
   }
  -return result;
  +String[] resultArray = new String[result.size()];
  +result.copyInto(resultArray);
  +return resultArray;
   
   }
   
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2002-09-04 Thread bobh 

bobh2002/09/04 11:54:02

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteResponse.java
   coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  - Oops, fix the tabs (I also fixed my .emacs to prevent this from
  happening again.)
  
  Revision  ChangesPath
  1.22  +7 -7  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- CoyoteResponse.java   4 Sep 2002 18:48:08 -   1.21
  +++ CoyoteResponse.java   4 Sep 2002 18:54:02 -   1.22
  @@ -790,10 +790,10 @@
   public String[] getHeaderValues(String name) {
   
   MimeHeaders headers = coyoteResponse.getMimeHeaders();
  - Vector result = new Vector();
  +Vector result = new Vector();
   for (int i = 0; i  headers.size(); i++) {
  - if (name.equals( headers.getName(i).toString() ))
  - result.addElement( headers.getValue(i).toString() );
  +if (name.equals( headers.getName(i).toString() ))
  +result.addElement( headers.getValue(i).toString() );
   }
   String[] resultArray = new String[result.size()];
   result.copyInto(resultArray);
  
  
  
  1.6   +7 -7  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CoyoteResponse.java   4 Sep 2002 18:48:08 -   1.5
  +++ CoyoteResponse.java   4 Sep 2002 18:54:02 -   1.6
  @@ -815,10 +815,10 @@
   public String[] getHeaderValues(String name) {
   
   MimeHeaders headers = coyoteResponse.getMimeHeaders();
  - Vector result = new Vector();
  +Vector result = new Vector();
   for (int i = 0; i  headers.size(); i++) {
  - if (name.equals( headers.getName(i).toString() ))
  - result.addElement( headers.getValue(i).toString() );
  +if (name.equals( headers.getName(i).toString() ))
  +result.addElement( headers.getValue(i).toString() );
   }
   String[] resultArray = new String[result.size()];
   result.copyInto(resultArray);
  
  
  

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

Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2002-09-04 Thread Bill Barker 


- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Wednesday, September 04, 2002 11:48 AM
Subject: cvs commit:
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java


 bobh2002/09/04 11:48:08

   Modified:coyote/src/java/org/apache/coyote/tomcat4
 CoyoteResponse.java
coyote/src/java/org/apache/coyote/tomcat5
 CoyoteResponse.java
   Log:
- I noticed that RequestDumperValve was unhappy, so I investigaged and
found
   that getHeaderValues(String name) was not even using the name parameter.
This
   fixes that.

   Revision  ChangesPath
   1.21  +12 -9
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRe
sponse.java

   Index: CoyoteResponse.java
   ===
   RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
4/CoyoteResponse.java,v
   retrieving revision 1.20
   retrieving revision 1.21
   diff -u -r1.20 -r1.21
   --- CoyoteResponse.java 4 Aug 2002 19:39:49 - 1.20
   +++ CoyoteResponse.java 4 Sep 2002 18:48:08 - 1.21
   @@ -79,6 +79,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
   +import java.util.Vector;

import javax.servlet.ServletContext;
import javax.servlet.ServletException;
   @@ -789,12 +790,14 @@
public String[] getHeaderValues(String name) {

MimeHeaders headers = coyoteResponse.getMimeHeaders();
   -int n = headers.size();
   -String[] result = new String[n];
   -for (int i = 0; i  n; i++) {
   -result[i] = headers.getValue(i).toString();
   + Vector result = new Vector();
   +for (int i = 0; i  headers.size(); i++) {
   + if (name.equals( headers.getName(i).toString() ))
   + result.addElement( headers.getValue(i).toString() );
}
   -return result;
   +String[] resultArray = new String[result.size()];
   +result.copyInto(resultArray);
   +return resultArray;

}


Headers are case-insensitive, so this still doesn't work.  You're probably
better off using MimeHeaders.values(String).




   1.5   +12 -9
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRe
sponse.java

   Index: CoyoteResponse.java
   ===
   RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat
5/CoyoteResponse.java,v
   retrieving revision 1.4
   retrieving revision 1.5
   diff -u -r1.4 -r1.5
   --- CoyoteResponse.java 13 Aug 2002 20:44:13 - 1.4
   +++ CoyoteResponse.java 4 Sep 2002 18:48:08 - 1.5
   @@ -79,6 +79,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
   +import java.util.Vector;

import javax.servlet.ServletContext;
import javax.servlet.ServletException;
   @@ -814,12 +815,14 @@
public String[] getHeaderValues(String name) {

MimeHeaders headers = coyoteResponse.getMimeHeaders();
   -int n = headers.size();
   -String[] result = new String[n];
   -for (int i = 0; i  n; i++) {
   -result[i] = headers.getValue(i).toString();
   + Vector result = new Vector();
   +for (int i = 0; i  headers.size(); i++) {
   + if (name.equals( headers.getName(i).toString() ))
   + result.addElement( headers.getValue(i).toString() );
}
   -return result;
   +String[] resultArray = new String[result.size()];
   +result.copyInto(resultArray);
   +return resultArray;

}





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



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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2002-08-13 Thread patrickl 

patrickl2002/08/13 13:44:14

  Modified:coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  Use SC_FOUND instead of SC_MOVED_TEMPORARILY in accordance with section 15.1.5 of 
the Servlet 2.4 specification
  
  Revision  ChangesPath
  1.4   +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CoyoteResponse.java   9 Aug 2002 16:23:25 -   1.3
  +++ CoyoteResponse.java   13 Aug 2002 20:44:13 -  1.4
  @@ -1120,7 +1120,7 @@
   // Generate a temporary redirect to the specified location
   try {
   String absolute = toAbsolute(location);
  -setStatus(SC_MOVED_TEMPORARILY);
  +setStatus(SC_FOUND);
   setHeader(Location, absolute);
   } catch (IllegalArgumentException e) {
   setStatus(SC_NOT_FOUND);
  
  
  

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

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteResponse.java

2002-08-09 Thread patrickl 

patrickl2002/08/09 09:23:25

  Modified:coyote/src/java/org/apache/coyote Response.java
   coyote/src/java/org/apache/coyote/tomcat5
CoyoteResponse.java
  Log:
  In the Servlet 2.4 spec section 5.4 on i18n, the deployment descriptor gets new 
stuff for mapping locale to character encoding.
  
  Revision  ChangesPath
  1.13  +4 -3  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java
  
  Index: Response.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Response.java 1 Aug 2002 17:20:36 -   1.12
  +++ Response.java 9 Aug 2002 16:23:25 -   1.13
  @@ -455,8 +455,6 @@
   if (isCommitted())
   return;
   
  -characterEncoding = charset;
  -
   String type = this.contentType;
   int start = type.indexOf(charset=);
   if ( start != -1 ) {
  @@ -468,8 +466,11 @@
   type = type.substring(0,start+8)
   +charset;
   this.contentType = type;
  -
  +} else {
  +type += charset= + charset;
   }
  +setContentType( type );
  +
   }
   
   public String getCharacterEncoding() {
  
  
  
  1.3   +10 -4 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteResponse.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CoyoteResponse.java   8 Aug 2002 04:08:41 -   1.2
  +++ CoyoteResponse.java   9 Aug 2002 16:23:25 -   1.3
  @@ -753,6 +753,12 @@
   
   coyoteResponse.setLocale(locale);
   
  +CharsetMapper cm = context.getCharsetMapper();
  +String charset = cm.getCharset( locale );
  +
  +if ( charset != null )
  +setCharacterEncoding( charset);
  +
   }
   
   
  
  
  

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