tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi SSIServlet.java
Date Sun, 03 Apr 2005 18:55:30 GMT
markt       2005/04/03 11:55:30

  Modified:    catalina/src/share/org/apache/catalina/ssi SSIServlet.java
  Log:
  Partial fix for bug 10385. Forcing content type to "text/html;charset=UTF-8" broke
   more things than it fixed.
  
  Revision  Changes    Path
  1.5       +3 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java
  
  Index: SSIServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SSIServlet.java	30 Mar 2005 21:53:05 -0000	1.4
  +++ SSIServlet.java	3 Apr 2005 18:55:30 -0000	1.5
  @@ -153,20 +153,18 @@
                path.toUpperCase().startsWith("/WEB-INF") ||
                path.toUpperCase().startsWith("/META-INF") ) {
   
  -            res.sendError(res.SC_NOT_FOUND, path);
  +            res.sendError(HttpServletResponse.SC_NOT_FOUND, path);
           log( "Can't serve file: " + path );
               return;
           }
       
           URL resource = servletContext.getResource(path);
           if (resource==null) {
  -            res.sendError(res.SC_NOT_FOUND, path);
  +            res.sendError(HttpServletResponse.SC_NOT_FOUND, path);
           log( "Can't find file: " + path );
               return;
           }
   
  -        res.setContentType("text/html;charset=UTF-8");
  -
           if (expires != null) {
               res.setDateHeader("Expires", (
                   new java.util.Date()).getTime() + expires.longValue() * 1000);
  
  
  

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


Mime
View raw message