svn commit: r1293832 - in /tomcat/trunk: java/org/apache/catalina/filters/ExpiresFilter.java webapps/docs/config/filter.xml

[rjung]

Author: rjung
Date: Sun Feb 26 13:29:48 2012
New Revision: 1293832

URL: http://svn.apache.org/viewvc?rev=1293832&view=rev
Log:
BZ 52760: Fix expires filter mime type in javascript
examples.

We use the official mime type application/javascript
instead of text/javascript in the respnse headers.

Modified:
    tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
    tomcat/trunk/webapps/docs/config/filter.xml

Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1293832&r1=1293831&r2=1293832&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Sun Feb 26 
13:29:48 2012
@@ -95,7 +95,7 @@ import org.apache.juli.logging.LogFactor
  *          <param-value>access plus 10 minutes</param-value>
  *       </init-param>
  *       <init-param>
- *          <param-name>ExpiresByType text/javascript</param-name>
+ *          <param-name>ExpiresByType 
application/javascript</param-name>
  *          <param-value>access plus 10 minutes</param-value>
  *       </init-param>
  *    </filter>
@@ -380,7 +380,7 @@ import org.apache.juli.logging.LogFactor
  *    byType={
  *       image=ExpiresConfiguration[startingPoint=ACCESS_TIME, duration=[10 
MINUTE]],
  *       text/css=ExpiresConfiguration[startingPoint=ACCESS_TIME, duration=[10 
MINUTE]],
- *       text/javascript=ExpiresConfiguration[startingPoint=ACCESS_TIME, 
duration=[10 MINUTE]]}]
+ *       
application/javascript=ExpiresConfiguration[startingPoint=ACCESS_TIME, 
duration=[10 MINUTE]]}]
  * </pre></code>
  * <p>
  * Sample of per-request log message where <tt>ExpiresFilter</tt> adds an

Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1293832&r1=1293831&r2=1293832&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Sun Feb 26 13:29:48 2012
@@ -209,7 +209,7 @@
     &lt;param-value&gt;access plus 10 minutes&lt;/param-value&gt;
  &lt;/init-param&gt;
  &lt;init-param&gt;
-    &lt;param-name&gt;ExpiresByType text/javascript&lt;/param-name&gt;
+    &lt;param-name&gt;ExpiresByType application/javascript&lt;/param-name&gt;
     &lt;param-value&gt;access plus 10 minutes&lt;/param-value&gt;
  &lt;/init-param&gt;
 &lt;/filter&gt;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org