rpm/tomcat
SHA256
1
0
Fork 0
forked from pool/tomcat
Code Pull Requests Activity

Accepting request 424483 from home:mateialbu:branches:Java:packages

Browse Source 
Fix for infinite loop in jar scanning (bsc#993862)

OBS-URL: https://build.opensuse.org/request/show/424483
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=97
This commit is contained in:
Tomáš Chvátal 2016-09-04 19:25:39 +00:00 committed by Git OBS Bridge
parent fbd81a9403
commit 79ee9e4537
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tomcat-8.0.36-jar-scanner-loop.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanner.java b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
index a217571..992eb88 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
@@ -269,6 +269,7 @@ public class StandardJarScanner implements JarScanner {
log.debug(sm.getString("jarScan.classloaderJarScan", url));
}
try {
+ processedURLs.add(url);
process(scanType, callback, url, null, isWebapp, classPathUrlsToProcess);
} catch (IOException ioe) {
log.warn(sm.getString("jarScan.classloaderFail", url), ioe);
@@ -412,7 +413,7 @@ public class StandardJarScanner implements JarScanner {
public ClassPathEntry(URL url) {
String path = url.getPath();
- int end = path.indexOf(Constants.JAR_EXT);
+ int end = path.lastIndexOf(Constants.JAR_EXT);
if (end != -1) {
jar = true;
int start = path.lastIndexOf('/', end);

6
tomcat.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 2 13:20:00 UTC 2016 - malbu@suse.com
- Backport fix for inifinite loop in the jar scanner for 8.0.36. (bnc#993862)
Added: tomcat-8.0.36-jar-scanner-loop.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 6 12:20:03 UTC 2016 - malbu@suse.com Wed Jul 6 12:20:03 UTC 2016 - malbu@suse.com

3
tomcat.spec
View File

@ -78,6 +78,8 @@ Patch2: tomcat-8.0.9-property-build.windows.patch
Patch3: tomcat-8.0.33-JDTCompiler-java.patch Patch3: tomcat-8.0.33-JDTCompiler-java.patch
# PATCH-FIX-SLE: Change security manager default policies bnc#891264 # PATCH-FIX-SLE: Change security manager default policies bnc#891264
Patch4: tomcat-7.0-sle.catalina.policy.patch Patch4: tomcat-7.0-sle.catalina.policy.patch
# PATCH-FIX-SLE: SLES 12 SP2 tomcat8.0.36 rpms are not working properly mainly while compiling JSP's with org.apache.jasper.JspC class (bnc#993862)
Patch5: tomcat-8.0.36-jar-scanner-loop.patch
BuildRequires: ant >= 1.8.1 BuildRequires: ant >= 1.8.1
BuildRequires: ant-antlr BuildRequires: ant-antlr
BuildRequires: ecj >= 4.4.0 BuildRequires: ecj >= 4.4.0
@ -246,6 +248,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch2 -p1 %patch2 -p1
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch5 -p1
# remove date from docs # remove date from docs
sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl