You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/08/08 22:15:02 UTC
svn commit: r1370935 - in /tomcat/trunk/java/org/apache:
catalina/authenticator/AuthenticatorBase.java
catalina/connector/Request.java catalina/connector/Response.java
catalina/util/DateTool.java tomcat/util/http/FastHttpDateFormat.java
Author: markt
Date: Wed Aug 8 20:15:01 2012
New Revision: 1370935
URL: http://svn.apache.org/viewvc?rev=1370935&view=rev
Log:
Remove DateTool
Removed:
tomcat/trunk/java/org/apache/catalina/util/DateTool.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1370935&r1=1370934&r2=1370935&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java Wed Aug 8 20:15:01 2012
@@ -41,11 +41,11 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.Response;
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.util.DateTool;
import org.apache.catalina.util.SessionIdGenerator;
import org.apache.catalina.valves.ValveBase;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.res.StringManager;
@@ -186,7 +186,7 @@ public abstract class AuthenticatorBase
* "Expires" header always set to Date(1), so generate once only
*/
private static final String DATE_ONE =
- (new SimpleDateFormat(DateTool.HTTP_RESPONSE_DATE_HEADER,
+ (new SimpleDateFormat(FastHttpDateFormat.RFC1123_DATE,
Locale.US)).format(new Date(1));
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1370935&r1=1370934&r2=1370935&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Aug 8 20:15:01 2012
@@ -173,7 +173,7 @@ public class Request
* declare formats[] as a static variable.
*/
protected final SimpleDateFormat formats[] = {
- new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US),
+ new SimpleDateFormat(FastHttpDateFormat.RFC1123_DATE, 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)
};
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1370935&r1=1370934&r2=1370935&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Wed Aug 8 20:15:01 2012
@@ -45,7 +45,6 @@ import org.apache.catalina.Globals;
import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
import org.apache.catalina.security.SecurityUtil;
-import org.apache.catalina.util.DateTool;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.tomcat.util.buf.CharChunk;
@@ -979,7 +978,7 @@ public class Response
}
if (format == null) {
- format = new SimpleDateFormat(DateTool.HTTP_RESPONSE_DATE_HEADER,
+ format = new SimpleDateFormat(FastHttpDateFormat.RFC1123_DATE,
Locale.US);
format.setTimeZone(TimeZone.getTimeZone("GMT"));
}
@@ -1325,7 +1324,7 @@ public class Response
}
if (format == null) {
- format = new SimpleDateFormat(DateTool.HTTP_RESPONSE_DATE_HEADER,
+ format = new SimpleDateFormat(FastHttpDateFormat.RFC1123_DATE,
Locale.US);
format.setTimeZone(TimeZone.getTimeZone("GMT"));
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java?rev=1370935&r1=1370934&r2=1370935&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java Wed Aug 8 20:15:01 2012
@@ -40,17 +40,20 @@ public final class FastHttpDateFormat {
/**
- * HTTP date format.
+ * Only permitted HTTP date format specification when generating headers.
*/
+ public static final String RFC1123_DATE =
+ "EEE, dd MMM yyyy HH:mm:ss zzz";
+
private static final SimpleDateFormat format =
- new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
+ new SimpleDateFormat(RFC1123_DATE, Locale.US);
/**
* The set of SimpleDateFormat formats to use in getDateHeader().
*/
private static final SimpleDateFormat formats[] = {
- new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US),
+ new SimpleDateFormat(RFC1123_DATE, 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)
};
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1370935 - in /tomcat/trunk/java/org/apache: catalina/authenticator/AuthenticatorBase.java
catalina/connector/Request.java catalina/connector/Response.java catalina/util/DateTool.java
tomcat/util/http/FastHttpDateFormat.java
Posted by Mark Thomas <ma...@apache.org>.
On 08/08/2012 21:34, Konstantin Kolinko wrote:
> 2012/8/9 <ma...@apache.org>:
>> Author: markt
>> Date: Wed Aug 8 20:15:01 2012
>> New Revision: 1370935
>>
>> URL: http://svn.apache.org/viewvc?rev=1370935&view=rev
>> Log:
>> Remove DateTool
>>
>> Removed:
>> tomcat/trunk/java/org/apache/catalina/util/DateTool.java
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
>> tomcat/trunk/java/org/apache/catalina/connector/Request.java
>> tomcat/trunk/java/org/apache/catalina/connector/Response.java
>> tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
>
> (...)
>> --- tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java (original)
>> +++ tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java Wed Aug 8 20:15:01 2012
>> @@ -40,17 +40,20 @@ public final class FastHttpDateFormat {
>>
>>
>> /**
>> - * HTTP date format.
>> + * Only permitted HTTP date format specification when generating headers.
>
> You mean "The only".
I do. I'll clarify that comment.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1370935 - in /tomcat/trunk/java/org/apache:
catalina/authenticator/AuthenticatorBase.java catalina/connector/Request.java
catalina/connector/Response.java catalina/util/DateTool.java tomcat/util/http/FastHttpDateFormat.java
Posted by Konstantin Kolinko <kn...@gmail.com>.
2012/8/9 <ma...@apache.org>:
> Author: markt
> Date: Wed Aug 8 20:15:01 2012
> New Revision: 1370935
>
> URL: http://svn.apache.org/viewvc?rev=1370935&view=rev
> Log:
> Remove DateTool
>
> Removed:
> tomcat/trunk/java/org/apache/catalina/util/DateTool.java
> Modified:
> tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
> tomcat/trunk/java/org/apache/catalina/connector/Request.java
> tomcat/trunk/java/org/apache/catalina/connector/Response.java
> tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
(...)
> --- tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java Wed Aug 8 20:15:01 2012
> @@ -40,17 +40,20 @@ public final class FastHttpDateFormat {
>
>
> /**
> - * HTTP date format.
> + * Only permitted HTTP date format specification when generating headers.
You mean "The only".
E.g.:
"The only date format that is permitted when generating HTTP headers."
> */
> + public static final String RFC1123_DATE =
> + "EEE, dd MMM yyyy HH:mm:ss zzz";
> +
> private static final SimpleDateFormat format =
> - new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
> + new SimpleDateFormat(RFC1123_DATE, Locale.US);
>
>
> /**
> * The set of SimpleDateFormat formats to use in getDateHeader().
> */
> private static final SimpleDateFormat formats[] = {
> - new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US),
> + new SimpleDateFormat(RFC1123_DATE, 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)
> };
>
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org