marcsaeg 01/07/29 17:57:34 Modified: src/share/org/apache/tomcat/service/http Tag: tomcat_32 HttpResponseAdapter.java src/share/org/apache/tomcat/util Tag: tomcat_32 DateTool.java MimeHeaderField.java Log: A Date: header is now sent in the response when Tomcat is running stand-alone. Also fixes a bug in the previous date formats that had a 5 digit date format (yyyyy) that caused a leading zero at the front of the years (e.g. 02001). PR: 345 Submitted by: GOMEZ Henri [[EMAIL PROTECTED]] Revision Changes Path No revision No revision 1.11.2.2 +4 -4 jakarta-tomcat/src/share/org/apache/tomcat/service/http/Attic/HttpResponseAdapter.java Index: HttpResponseAdapter.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/Attic/HttpResponseAdapter.java,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -r1.11.2.1 -r1.11.2.2 --- HttpResponseAdapter.java 2000/11/07 03:16:50 1.11.2.1 +++ HttpResponseAdapter.java 2001/07/30 00:57:34 1.11.2.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/Attic/HttpResponseAdapter.java,v 1.11.2.1 2000/11/07 03:16:50 craigmcc Exp $ - * $Revision: 1.11.2.1 $ - * $Date: 2000/11/07 03:16:50 $ + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/http/Attic/HttpResponseAdapter.java,v 1.11.2.2 2001/07/30 00:57:34 marcsaeg Exp $ + * $Revision: 1.11.2.2 $ + * $Date: 2001/07/30 00:57:34 $ * * ==================================================================== * @@ -143,7 +143,7 @@ // This avoids redundant setting of date ( very expensive ). // XXX XXX Check if IIS, NES do generate the date MimeHeaderField dateH= headers.find( "Date" ); - if( false && dateH == null ) { + if( dateH == null ) { // no date header set by user dateH=headers.putHeader(); dateH.setName("Date"); No revision No revision 1.2.2.1 +19 -5 jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/DateTool.java Index: DateTool.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/DateTool.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- DateTool.java 2000/05/24 16:34:20 1.2 +++ DateTool.java 2001/07/30 00:57:34 1.2.2.1 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/DateTool.java,v 1.2 2000/05/24 16:34:20 costin Exp $ - * $Revision: 1.2 $ - * $Date: 2000/05/24 16:34:20 $ + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/DateTool.java,v 1.2.2.1 2001/07/30 00:57:34 marcsaeg Exp $ + * $Revision: 1.2.2.1 $ + * $Date: 2001/07/30 00:57:34 $ * * ==================================================================== * @@ -94,7 +94,7 @@ /** format for RFC 1123 date string -- "Sun, 06 Nov 1994 08:49:37 GMT" */ public final static String RFC1123_PATTERN = - "EEE, dd MMM yyyyy HH:mm:ss z"; + "EEE, dd MMM yyyy HH:mm:ss z"; // format for RFC 1036 date string -- "Sunday, 06-Nov-94 08:49:37 GMT" private final static String rfc1036Pattern = @@ -102,7 +102,7 @@ // format for C asctime() date string -- "Sun Nov 6 08:49:37 1994" private final static String asctimePattern = - "EEE MMM d HH:mm:ss yyyyy"; + "EEE MMM d HH:mm:ss yyyy"; /** Pattern used for old cookies */ @@ -131,4 +131,18 @@ asctimeFormat.setTimeZone(GMT_ZONE); } + private static String rfc1123DS; + private static long rfc1123Sec; + + /** + */ + public static String format1123( Date d ) { + long dt = d.getTime() % 1000; + if ((rfc1123DS != null) && (dt == rfc1123Sec)) + return rfc1123DS; + + rfc1123DS = rfc1123Format.format( d ); + rfc1123Sec = dt; + return rfc1123DS; + } } 1.10.2.3 +4 -4 jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/MimeHeaderField.java Index: MimeHeaderField.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/MimeHeaderField.java,v retrieving revision 1.10.2.2 retrieving revision 1.10.2.3 diff -u -r1.10.2.2 -r1.10.2.3 --- MimeHeaderField.java 2000/11/10 06:42:52 1.10.2.2 +++ MimeHeaderField.java 2001/07/30 00:57:34 1.10.2.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/MimeHeaderField.java,v 1.10.2.2 2000/11/10 06:42:52 craigmcc Exp $ - * $Revision: 1.10.2.2 $ - * $Date: 2000/11/10 06:42:52 $ + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/MimeHeaderField.java,v 1.10.2.3 2001/07/30 00:57:34 marcsaeg Exp $ + * $Revision: 1.10.2.3 $ + * $Date: 2001/07/30 00:57:34 $ * * ==================================================================== * @@ -327,7 +327,7 @@ } String formatDate( Date value ) { - return DateTool.rfc1123Format.format(value); + return DateTool.format1123(value); } long parseDate( String s ) {