[jboss-cvs] Repository SVN: r27662 - in apache-tomcat/5.0.30.patch07-brew: lib and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 9 10:14:47 EDT 2009
Author: permaine
Date: 2009-07-09 10:14:47 -0400 (Thu, 09 Jul 2009)
New Revision: 27662
Modified:
apache-tomcat/5.0.30.patch07-brew/component-info.xml
apache-tomcat/5.0.30.patch07-brew/lib/catalina-manager.jar
apache-tomcat/5.0.30.patch07-brew/lib/catalina-optional.jar
apache-tomcat/5.0.30.patch07-brew/lib/catalina.jar
apache-tomcat/5.0.30.patch07-brew/lib/jasper-compiler.jar
apache-tomcat/5.0.30.patch07-brew/lib/jasper-runtime.jar
apache-tomcat/5.0.30.patch07-brew/lib/jsp-api.jar
apache-tomcat/5.0.30.patch07-brew/lib/naming-common.jar
apache-tomcat/5.0.30.patch07-brew/lib/naming-resources.jar
apache-tomcat/5.0.30.patch07-brew/lib/servlet-api.jar
apache-tomcat/5.0.30.patch07-brew/lib/servlets-common.jar
apache-tomcat/5.0.30.patch07-brew/lib/servlets-default.jar
apache-tomcat/5.0.30.patch07-brew/lib/servlets-invoker.jar
apache-tomcat/5.0.30.patch07-brew/lib/servlets-webdav.jar
apache-tomcat/5.0.30.patch07-brew/lib/tomcat-coyote.jar
apache-tomcat/5.0.30.patch07-brew/lib/tomcat-http11.jar
apache-tomcat/5.0.30.patch07-brew/lib/tomcat-jk2.jar
apache-tomcat/5.0.30.patch07-brew/lib/tomcat-util.jar
apache-tomcat/5.0.30.patch07-brew/src/tomcat5-5.0.30-CVE-2008-5515.patch
Log:
Reuploading 5.0.30.patch07-brew
Modified: apache-tomcat/5.0.30.patch07-brew/component-info.xml
===================================================================
--- apache-tomcat/5.0.30.patch07-brew/component-info.xml 2009-07-09 12:17:48 UTC (rev 27661)
+++ apache-tomcat/5.0.30.patch07-brew/component-info.xml 2009-07-09 14:14:47 UTC (rev 27662)
@@ -4,9 +4,9 @@
licenseType="apache-2.0"
version="5.0.30.patch07-brew"
projectHome="http://jakarta.apache.org/tomcat/index.html"
- description="Tomcat 5.0 servlet 2.4 web container+patches(JBAS-2775,CVE-2005-3510, CVE-2006-3835, CVE-2005-2090, CVE-2006-7195, CVE-2006-7196, CVE-2007-0450, CVE-2007-1858) and also patches for CVE-2007-3382, CVE-2007-3385 and CVE-2007-2450 and a fix for CVE-2007-5461, and also CVE-2007-1358, 2008-0128, CVE-2007-2449, CVE-2007-1355, CVE-2005-4838, plus CVE-2008-1232, CVE-2008-2370, and CVE-2008-2938, CVE-2008-3271, CVS-2007-5333">
+ description="Tomcat 5.0 servlet 2.4 web container+patches(JBAS-2775,CVE-2005-3510, CVE-2006-3835, CVE-2005-2090, CVE-2006-7195, CVE-2006-7196, CVE-2007-0450, CVE-2007-1858) and also patches for CVE-2007-3382, CVE-2007-3385 and CVE-2007-2450 and a fix for CVE-2007-5461, and also CVE-2007-1358, 2008-0128, CVE-2007-2449, CVE-2007-1355, CVE-2005-4838, plus CVE-2008-1232, CVE-2008-2370, and CVE-2008-2938, CVE-2008-3271, CVS-2007-5333, CVE-2008-5515, CVE-2009-0783, CVE-2009-0033">
<!-- cvsroot=":ext:cvs.devel.redhat.com:/cvs/dist/tomcat5"
- tag="tomcat5-5_0_30-0jpp_15rh"
+ tag="tomcat5-5_0_30-0jpp_16rh"
-->
<artifact id="catalina-manager.jar"/>
<artifact id="catalina-optional.jar"/>
Modified: apache-tomcat/5.0.30.patch07-brew/lib/catalina-manager.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/catalina-optional.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/catalina.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/jasper-compiler.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/jasper-runtime.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/jsp-api.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/naming-common.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/naming-resources.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/servlet-api.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/servlets-common.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/servlets-default.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/servlets-invoker.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/servlets-webdav.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/tomcat-coyote.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/tomcat-http11.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/tomcat-jk2.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/lib/tomcat-util.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.0.30.patch07-brew/src/tomcat5-5.0.30-CVE-2008-5515.patch
===================================================================
--- apache-tomcat/5.0.30.patch07-brew/src/tomcat5-5.0.30-CVE-2008-5515.patch 2009-07-09 12:17:48 UTC (rev 27661)
+++ apache-tomcat/5.0.30.patch07-brew/src/tomcat5-5.0.30-CVE-2008-5515.patch 2009-07-09 14:14:47 UTC (rev 27662)
@@ -1,5 +1,5 @@
---- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java 2009-06-09 17:08:55.000000000 +0200
-+++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java 2009-06-09 17:20:24.000000000 +0200
+--- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java 2009-06-09 17:08:55.000000000 +0200
++++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java 2009-06-09 17:20:24.000000000 +0200
@@ -43,6 +43,7 @@
import org.apache.catalina.Wrapper;
import org.apache.catalina.deploy.ApplicationParameter;
@@ -99,48 +99,8 @@
* Merge the context initialization parameters specified in the application
* deployment descriptor with the application parameters described in the
* server configuration, respecting the <code>override</code> property of
---- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java 2004-11-24 17:55:08.000000000 +0100
-+++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java.orig 2009-06-09 17:15:44.000000000 +0200
-@@ -378,10 +378,21 @@
- throw new IllegalArgumentException
- (sm.getString
- ("applicationContext.requestDispatcher.iae", path));
-+
-+ // Get query string
-+ String queryString = null;
-+ int pos = path.indexOf('?');
-+ if (pos >= 0) {
-+ queryString = path.substring(pos + 1);
-+ path = path.substring(0, pos);
-+ }
-+
- path = normalize(path);
- if (path == null)
- return (null);
-
-+ pos = path.length();
-+
- // Retrieve the thread local URI
- MessageBytes uriMB = (MessageBytes) localUriMB.get();
- if (uriMB == null) {
-@@ -393,15 +404,6 @@
- uriMB.recycle();
- }
-
-- // Get query string
-- String queryString = null;
-- int pos = path.indexOf('?');
-- if (pos >= 0) {
-- queryString = path.substring(pos + 1);
-- } else {
-- pos = path.length();
-- }
--
- // Retrieve the thread local mapping data
- MappingData mappingData = (MappingData) localMappingData.get();
- if (mappingData == null) {
---- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java 2004-11-24 17:55:08.000000000 +0100
-+++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java 2009-06-09 17:20:24.000000000 +0200
+--- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java 2004-11-24 17:55:08.000000000 +0100
++++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java 2009-06-09 17:20:24.000000000 +0200
@@ -316,10 +316,9 @@
int pos = requestPath.lastIndexOf('/');
String relative = null;
@@ -154,8 +114,8 @@
}
return (context.getServletContext().getRequestDispatcher(relative));
---- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java 2009-06-09 17:08:55.000000000 +0200
-+++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java 2009-06-09 17:53:38.000000000 +0200
+--- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java 2009-06-09 17:08:55.000000000 +0200
++++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java 2009-06-09 17:53:38.000000000 +0200
@@ -1502,7 +1502,7 @@
}
@@ -174,8 +134,8 @@
generatedXML.writeElement(null, "href", XMLWriter.CLOSING);
---- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java 2004-11-24 17:55:14.000000000 +0100
-+++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java 2009-06-09 17:20:48.000000000 +0200
+--- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java 2004-11-24 17:55:14.000000000 +0100
++++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java 2009-06-09 17:20:48.000000000 +0200
@@ -24,6 +24,8 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -203,8 +163,8 @@
if (isVirtualWebappRelative) {
path = normalized;
} else {
---- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletRequestUtil.java 2004-11-24 17:55:14.000000000 +0100
-+++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletRequestUtil.java 2009-06-09 17:20:48.000000000 +0200
+--- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletRequestUtil.java 2004-11-24 17:55:14.000000000 +0100
++++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletRequestUtil.java 2009-06-09 17:20:48.000000000 +0200
@@ -41,7 +41,7 @@
if ((result == null) || (result.equals(""))) {
result = "/";
@@ -232,8 +192,8 @@
+ return RequestUtil.normalize(path);
}
}
---- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/RequestUtil.java 2004-11-24 17:55:17.000000000 +0100
-+++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/RequestUtil.java 2009-06-09 17:20:48.000000000 +0200
+--- jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/RequestUtil.java 2004-11-24 17:55:17.000000000 +0100
++++ jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/RequestUtil.java 2009-06-09 17:20:48.000000000 +0200
@@ -147,6 +147,19 @@
* @param path Relative path to be normalized
*/
@@ -264,8 +224,8 @@
if (normalized.equals("/."))
return "/";
---- jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java 2009-06-09 17:08:55.000000000 +0200
-+++ jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java 2009-06-09 17:54:07.000000000 +0200
+--- jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java 2009-06-09 17:08:55.000000000 +0200
++++ jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java 2009-06-09 17:54:07.000000000 +0200
@@ -1337,10 +1337,9 @@
int pos = requestPath.lastIndexOf('/');
String relative = null;
More information about the jboss-cvs-commits
mailing list