File apache-tomcat-CVE-2010-3781.patch of Package tomcat6

Overview Repositories Revisions Requests Users Attributes Meta

File apache-tomcat-CVE-2010-3781.patch of Package tomcat6

Index: apache-tomcat-6.0.20-src/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- apache-tomcat-6.0.20-src/java/org/apache/catalina/core/StandardContext.java.orig	2011-02-11 09:33:24.618849798 +0100
+++ apache-tomcat-6.0.20-src/java/org/apache/catalina/core/StandardContext.java	2011-02-11 09:44:01.796374683 +0100
@@ -5012,11 +5012,11 @@
         dir.mkdirs();
 
         // Set the appropriate servlet context attribute
-        getServletContext().setAttribute(Globals.WORK_DIR_ATTR, dir);
-        if (getServletContext() instanceof ApplicationContext)
-            ((ApplicationContext) getServletContext()).setAttributeReadOnly
-                (Globals.WORK_DIR_ATTR);
-
+        if (context == null) {
+            getServletContext();
+        }
+        context.setAttribute(Globals.WORK_DIR_ATTR, dir);
+        context.setAttributeReadOnly(Globals.WORK_DIR_ATTR);
     }
 
 
Index: apache-tomcat-6.0.20-src/webapps/docs/changelog.xml
===================================================================
--- apache-tomcat-6.0.20-src/webapps/docs/changelog.xml.orig	2011-02-11 09:42:35.551191474 +0100
+++ apache-tomcat-6.0.20-src/webapps/docs/changelog.xml	2011-02-11 09:44:01.798374757 +0100
@@ -58,6 +58,9 @@
         <bug>42565</bug>: Make EL ternary expression without space before colon
         work. Patch provided by Lucas Galfaso. (markt)
       </fix>
+      <fix>
+        Code clean-up. Avoid some casts in StandardContext. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Webapps">

Places

File apache-tomcat-CVE-2010-3781.patch of Package tomcat6

Places