You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by na...@locus.apache.org on 2000/05/06 21:41:30 UTC

cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector HttpRequestBase.java HttpResponseBase.java

nacho       00/05/06 12:41:29

  Modified:    proposals/catalina/src/share/org/apache/tomcat/connector
                        HttpRequestBase.java HttpResponseBase.java
  Log:
  added Locale.US to date formats, watchdog passed on my setup
  
  Revision  Changes    Path
  1.8       +10 -9     jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpRequestBase.java
  
  Index: HttpRequestBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpRequestBase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HttpRequestBase.java	2000/05/02 22:02:22	1.7
  +++ HttpRequestBase.java	2000/05/06 19:41:28	1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpRequestBase.java,v 1.7 2000/05/02 22:02:22 craigmcc Exp $
  - * $Revision: 1.7 $
  - * $Date: 2000/05/02 22:02:22 $
  + * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpRequestBase.java,v 1.8 2000/05/06 19:41:28 nacho Exp $
  + * $Revision: 1.8 $
  + * $Date: 2000/05/06 19:41:28 $
    *
    * ====================================================================
    *
  @@ -73,6 +73,7 @@
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Vector;
  +import java.util.Locale;
   import javax.servlet.RequestDispatcher;
   import javax.servlet.ServletInputStream;
   import javax.servlet.http.Cookie;
  @@ -92,7 +93,7 @@
    * be implemented.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.7 $ $Date: 2000/05/02 22:02:22 $
  + * @version $Revision: 1.8 $ $Date: 2000/05/06 19:41:28 $
    */
   
   public class HttpRequestBase
  @@ -132,9 +133,9 @@
        * The set of SimpleDateFormat formats to use in getDateHeader().
        */
       protected static SimpleDateFormat formats[] = {
  -	new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz"),
  -	new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz"),
  -	new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy")
  +	new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz",Locale.US),
  +	new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz",Locale.US),
  +	new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy",Locale.US)
       };
   
   
  @@ -703,9 +704,9 @@
   	for (int i = 0; i < formats.length; i++) {
   	    try {
   		Date date = formats[i].parse(value);
  -		return (date.getTime());
  +    return (date.getTime());
   	    } catch (ParseException e) {
  -		;
  +        ;
   	    }
   	}
   	throw new IllegalArgumentException(value);
  
  
  
  1.6       +5 -5      jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpResponseBase.java
  
  Index: HttpResponseBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpResponseBase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HttpResponseBase.java	2000/04/30 01:23:20	1.5
  +++ HttpResponseBase.java	2000/05/06 19:41:29	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpResponseBase.java,v 1.5 2000/04/30 01:23:20 craigmcc Exp $
  - * $Revision: 1.5 $
  - * $Date: 2000/04/30 01:23:20 $
  + * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/connector/HttpResponseBase.java,v 1.6 2000/05/06 19:41:29 nacho Exp $
  + * $Revision: 1.6 $
  + * $Date: 2000/05/06 19:41:29 $
    *
    * ====================================================================
    *
  @@ -93,7 +93,7 @@
    * methods need to be implemented.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.5 $ $Date: 2000/04/30 01:23:20 $
  + * @version $Revision: 1.6 $ $Date: 2000/05/06 19:41:29 $
    */
   
   public class HttpResponseBase
  @@ -114,7 +114,7 @@
        * The date format we will use for creating date headers.
        */
       protected static final SimpleDateFormat format =
  -	new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz");
  +	new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz",Locale.US);
       static {
   	format.setTimeZone(TimeZone.getTimeZone("GMT"));
       };