Bug report for Tomcat Native [2014/05/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48655|Inf|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown| |49038|Inf|Nor|2010-04-02|Crash in tcnative | |52319|Inf|Maj|2011-12-12|Tomcat 6 crashes with [libapr-1.so.0+0x196da] sig| |52627|New|Min|2012-02-08|Segmentation fault in org.apache.tomcat.jni.File.i| |53605|Inf|Nor|2012-07-26|use tcnative-1.1.24 Tomcat shutdown still crash | |53847|Inf|Nor|2012-09-10|High CPU usage in tomcat native 1.22+ | |53940|New|Enh|2012-09-27|Added support for new CRL loading after expiration| |53952|New|Nor|2012-10-02|Add support for TLS 1.1 and 1.2 | |54085|New|Nor|2012-11-01|ssl_socket_recv sometimes loops infinitely with no| |54664|New|Reg|2013-03-11|[1.1.27 branch] Poll.remove incorrectly reports AP| |55087|New|Cri|2013-06-10|tomcat crashes in tcnative-1.dll with OCSP when OC| |55113|Inf|Nor|2013-06-18|FIPS-compatible OpenSSL fails fingerprint test in | |55114|New|Nor|2013-06-18|BUILDING file in win32 source package contains UNI| |55706|New|Nor|2013-10-25|broken apr version check in native v1.1.29 build; | |55771|New|Maj|2013-11-12|Memory leak and then crash in org.apache.tomcat.jn| |55797|Inf|Nor|2013-11-19|Tomcat 7.0.47 crashes using server jvm.dll and APR| |55938|New|Nor|2013-12-29|clang-analyzer report for 1.1.29 | |56108|New|Nor|2014-02-04|Allow user-defined Diffie-Hellman parameters | |56313|New|Maj|2014-03-25|Tomcat 8 crashes in tcnative-1.dll+0x7923 | |56378|New|Nor|2014-04-09|Cert load fails if cert is located in path with no| |56415|New|Maj|2014-04-16|EXCEPTION_ACCESS_VIOLATION (0xc005) in tcnativ| |56423|New|Nor|2014-04-17|Implement "fipsModeGet" method stub in case TCN is| +-+---+---+--+--+ | Total 22 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Connectors [2014/05/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo| |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |43968|Inf|Enh|2007-11-26|[patch] support ipv6 with mod_jk | |44290|Inf|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan| |44349|Inf|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s| |44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 | |44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc| |44571|New|Enh|2008-03-10|Limits busy per worker to a threshold | |45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff| |45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so| |46337|New|Nor|2008-12-04|real worker name is wrong | |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47327|New|Enh|2009-06-07|remote_user not logged in apache logfile | |47617|Inf|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err| |47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_| |47714|New|Cri|2009-08-20|Reponse mixed between users | |47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |47840|Inf|Min|2009-09-14|A broken worker name is written in the log file. | |48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the| |48460|New|Nor|2009-12-30|mod_proxy_ajp document has three misleading portio| |48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48513|New|Enh|2010-01-09|IIS Quick setup instructions | |48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker | |48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv| |48891|Opn|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk | |49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form| |49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work| |49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat | |49469|New|Enh|2010-06-19|Workers status page has negative number of connect| |49732|Opn|Nor|2010-08-10|reply_timeout can't wait forever. | |49822|New|Enh|2010-08-25|Add hash lb worker method | |49903|New|Enh|2010-09-09|Make workers file reloadable | |50186|New|Nor|2010-10-31|Wrong documentation of connection_pool_timeout / c| |52334|New|Maj|2011-12-14|recover_time is not properly used | |52483|New|Enh|2012-01-18|Print JkOptions's options in log file and jkstatus| |52651|New|Nor|2012-02-13|JKSHMFile size limitation | |53883|New|Maj|2012-09-17|isapi_redirect v 1.2.37 crashes w3wp.exe on the p| |53977|New|Maj|2012-10-07|32bits isapi connector cannot work in wow64 mode | |54027|New|Cri|2012-10-18|isapi send request to outside address instead of i| |54112|Opn|Blk|2012-11-07|ISAPI redirector not working when IIS recycles| |54117|New|Maj|2012-11-08|access violation exception in isapi_redirect.dll | |54177|New|Nor|2012-11-20|jkmanager generates non-well-formed XML for certai| |54596|New|Nor|2013-02-22|Relative path functionality truncates last charact| |54621|New|Nor|2013-02-28|[PATCH] custom mod_jk availability checks | |54646|New|Trv|2013-03-06|socket_keepalive is sometimes 1 or true or True in| |54923|New|Nor|2013-05-03|nsapi_redirect.so does not work with iPlanet on So| |56005|New|Nor|2014-01-14|ISAPI redirector WEB-INF/META-INF Path Check false| |56452|New|Nor|2014-04-24|IPv6 address and log level debug caused crash | |56489|New|Enh|2014-05-05|Include a directory for configuration files | +-+
svn commit: r1593392 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/threads/ webapps/docs/
Author: slaurent
Date: Thu May 8 19:36:10 2014
New Revision: 1593392
URL: http://svn.apache.org/r1593392
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56492
Avoid eclipse debugger pausing on uncaught exceptions when tomcat renews its
threads
Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
- copied unchanged from r1593132,
tomcat/trunk/java/org/apache/tomcat/util/threads/StopPooledThreadException.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThread.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1593132
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThread.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThread.java?rev=1593392&r1=1593391&r2=1593392&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThread.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThread.java
Thu May 8 19:36:10 2014
@@ -16,22 +16,26 @@
*/
package org.apache.tomcat.util.threads;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* A Thread implementation that records the time at which it was created.
*
*/
public class TaskThread extends Thread {
+private static final Log log = LogFactory.getLog(TaskThread.class);
private final long creationTime;
public TaskThread(ThreadGroup group, Runnable target, String name) {
-super(group, target, name);
+super(group, new WrappingRunnable(target), name);
this.creationTime = System.currentTimeMillis();
}
public TaskThread(ThreadGroup group, Runnable target, String name,
long stackSize) {
-super(group, target, name, stackSize);
+super(group, new WrappingRunnable(target), name, stackSize);
this.creationTime = System.currentTimeMillis();
}
@@ -42,4 +46,26 @@ public class TaskThread extends Thread {
return creationTime;
}
+/**
+ * Wraps a {@link Runnable} to swallow any {@link
StopPooledThreadException}
+ * instead of letting it go and potentially trigger a break in a debugger.
+ */
+private static class WrappingRunnable implements Runnable {
+private Runnable wrappedRunnable;
+WrappingRunnable(Runnable wrappedRunnable) {
+this.wrappedRunnable = wrappedRunnable;
+}
+@Override
+public void run() {
+try {
+wrappedRunnable.run();
+} catch(StopPooledThreadException exc) {
+//expected : we just swallow the exception to avoid disturbing
+//debuggers like eclipse's
+log.debug("Thread exiting on purpose", exc);
+}
+}
+
+}
+
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java?rev=1593392&r1=1593391&r2=1593392&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
Thu May 8 19:36:10 2014
@@ -16,7 +16,6 @@
*/
package org.apache.tomcat.util.threads;
-import java.lang.Thread.UncaughtExceptionHandler;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.RejectedExecutionHandler;
@@ -25,8 +24,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -44,8 +41,6 @@ public class ThreadPoolExecutor extends
protected static final StringManager sm = StringManager
.getManager("org.apache.tomcat.util.threads.res");
-private static final Log log = LogFactory.getLog(ThreadPoolExecutor.class);
-
/**
* The number of tasks submitted but not yet finished. This includes tasks
* in the queue and tasks that have been handed to a worker thread but the
@@ -117,16 +112,7 @@ public class ThreadPoolExecutor extends
"threadPoolExecutor.threadStoppedToAvoidPotentialLeak",
Thread.currentThread().getName());
-
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 23 mins 48 secs Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140508-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140508.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140508-native-src.tar.gz -Dexecute.test.nio=false -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/apache-com mons/pool -Dcommons-dbcp.home=/srv/gump/public/workspace/apache-commons/dbcp -Dexecute.test.nio2=true -Dexecute.test.bio=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140508.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servle t-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat -trunk/outpu
Bug report for Tomcat 6 [2014/05/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat| |43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant| |43400|New|Enh|2007-09-14|enum support for tag libs | |43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml | |43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor| |43742|New|Enh|2007-10-30|.tag compiles performed one at a time -- extremel| |43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output | |44199|New|Enh|2008-01-10|expose current backlog queue size | |44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f| |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam| |44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt| |45014|New|Enh|2008-05-15|Request and Response classes should have wrappers | |45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets| |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or | |45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE| |45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output| |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|Opn|Enh|2008-11-21|Tomcat reloading of context.xml does not update do| |46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl| |46350|New|Enh|2008-12-05|Maven repository should contain source bundles| |46558|Opn|Enh|2009-01-19|Shutdown port with address binding| |46902|New|Enh|2009-03-24|LoginValve to bypass restrictions of j_security_ch| |47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho| |47242|New|Enh|2009-05-22|request for AJP command line client | |47281|New|Enh|2009-05-28|Efficiency of the JDBCStore | |47407|New|Enh|2009-06-23|HttpSessionListener doesn't operate in the session| |47467|New|Enh|2009-07-02|Deployment of the war file by URL when contextpath| |47834|New|Enh|2009-09-14|TldConfig throws Exception when exploring unpacked| |47919|New|Enh|2009-09-30|Log Tomcat & Java environment variables in additio| |48358|Opn|Enh|2009-12-09|JSP-unloading reloaded| |48543|New|Enh|2010-01-14|[Patch] More flexibility in specifying -Dcatalina.| |48672|New|Enh|2010-02-03|Tomcat Virtual Host Manager (/host-manager) have b| |48674|New|Enh|2010-02-03|Tomcat Virtual Host Manager application doesn't pe| |48743|New|Enh|2010-02-15|Make the SLEEP variable in catalina.sh settable fr| |48899|New|Enh|2010-03-12|Guess URI charset should solve lot of problems| |48922|New|Enh|2010-03-16|org.apache.catalina.connector.Request clone static| |48928|New|Enh|2010-03-17|An alternative solution to preloading classes when| |49176|Opn|Enh|2010-04-23|Jasper in Dev Mode Is Memory Inefficient | |49464|New|Enh|2010-06-18|DefaultServlet and CharacterEncoding | |49531|New|Enh|2010-06-30|singlesignon failover not working on DeltaManager/| |49804|New|Enh|2010-08-23|Allow Embedded.redirectStreams value to be configu| |49939|New|Enh|2010-09-16|Expose a method via JMX which empties the webapp f| |49943|New|Enh|2010-09-16|Logging (via juli) does not reread configuration c| |50285|New|Enh|2010-11-17|Standard HTTP and AJP connectors silently ignore a| |50288|New|Enh|2010-11-17|Uploading a war file that already exists should au| |50677|Opn|Enh|2011-01-27|Allow system property variables in catalina.proper| |50692|New|Enh|2011-01-31|Improve log message in ThreadPool.logFull | |51142|New|Enh|2011-05-03|Offer possible resolution of StringIndexOutOfBound| |51513|New|Enh|2011-07-15|GzipInterceptor: Do not compress small packages | |51966|
Re: svn commit: r1593303 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
2014-05-08 16:55 GMT+02:00 : > Author: markt > Date: Thu May 8 14:55:08 2014 > New Revision: 1593303 > > URL: http://svn.apache.org/r1593303 > Log: > Fix test failure with NIO2 where additional, unexpected access log entry > was being created during connector shutdown. > > I didn't run into any problem with the testsuite, and I don't see a direct relation with the connector shutdown, can you give me the trace and details ? Maybe that catch is the best place to do it, but I'd like to be sure. Thanks, Rémy
Bug report for Tomcat 7 [2014/05/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |18500|New|Enh|2003-03-30|Host aliases to match by regular expression | |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |40881|Opn|Enh|2006-11-02|Unable to receive message through TCP channel -> | |41007|Opn|Enh|2006-11-20|Can't define customized 503 error page| |43866|New|Enh|2007-11-14|add support for session attribute propagation with| |43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing | |44216|New|Enh|2008-01-11|Don't reuse session ID even if emptySessionPath=tr| |49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak| |49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al| |49785|New|Enh|2010-08-19|Enabling TLS for JNDIRealm| |49821|New|Enh|2010-08-25|Tomcat CLI [PATCH/Contribution] | |50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou| |50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply| |50234|New|Enh|2010-11-08|JspC use servlet 3.0 features | |50504|New|Enh|2010-12-21|Allow setting query string character set trough re| |50670|New|Enh|2011-01-27|Tribes | RpcChannel | Add option to specify extern| |50944|Ver|Blk|2011-03-18|JSF: java.lang.NullPointerException at com.sun.fac| |51195|New|Enh|2011-05-13|"Find leaks" reports a false positive memory/class| |51423|Inf|Enh|2011-06-23|[Patch] to add a path and a version parameters to | |51463|New|Enh|2011-07-01|Tomcat.setBaseDir (package org.apache.catalina.st| |51496|New|Enh|2011-07-11|NSIS - Warn that duplicate service name will resul| |51587|New|Enh|2011-07-29|Implement status and uptime commands | |51953|New|Enh|2011-10-04|Proposal: netmask filtering valve and filter [PATC| |52235|New|Enh|2011-11-23|Please do a bit of SEO tuning for the web site| |52381|New|Enh|2011-12-22|Please add OSGi metadata | |52448|New|Enh|2012-01-11|Cache jar indexes in WebappClassLoader to speed up| |52489|New|Enh|2012-01-19|Enhancement request for code signing of war files | |52688|New|Enh|2012-02-16|Add ability to remove old access log files [PATCHE| |52952|New|Enh|2012-03-20|Improve ExtensionValidator handling for embedded s| |53085|New|Enh|2012-04-16|[perf] [concurrency] DefaultInstanceManager.annota| |53387|New|Enh|2012-06-08|SSI: Allow to use $1 to get result of regular expr| |53411|Opn|Enh|2012-06-13|NullPointerException in org.apache.tomcat.util.buf| |53492|New|Enh|2012-07-01|Make JspC shell multithreaded | |53553|New|Enh|2012-07-16|[PATCH] Deploy uploaded WAR with context.xml from | |53620|New|Enh|2012-07-30|[juli] delay opening a file until something gets l| |54330|New|Enh|2012-12-19|Patch with some refactoring of Member.java [PATCH | |54499|New|Enh|2013-01-29|Implementation of Extensible EL Interpreter | |54618|New|Enh|2013-02-28|Add filter implementing HTTP Strict Transport Secu| |54802|New|Enh|2013-04-04|Provide location information for exceptions thrown| |55104|New|Enh|2013-06-16|Allow passing arguments with spaces to Commons Dae| |55470|New|Enh|2013-08-23|Help users for ClassNotFoundExceptions during star| |55477|New|Enh|2013-08-23|Add a solution to map an realm name to a security | |55662|New|Enh|2013-10-17|Add a way to set an instance of java.sql.Driver di| |55943|Opn|Enh|2014-01-01|Provide a way prevent looking at the System class| |56148|New|Enh|2014-02-17|support (multiple) ocsp stapling | |56181|New|Enh|2014-02-23|RemoteIpValve & RemoteIpFilter: HttpServletRequest| |56300|New|Enh|2014-03-22|[Tribes] No useful examples, lack of documentation| |56438|New|Enh|2014-04-21|If jar scan does not find context config or TLD co| |56461|New|Enh|2014-04-26|New option to make context startup fail if a load-| |56491|Opn|Enh|2014-05-05|attribute references do not resolve to their value| |56501|Opn|Nor|2014-05-08|problems with urlencoding in webapp name | +-+
Bug report for Taglibs [2014/05/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field | |38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)| |42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements | |46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l| |48333|New|Enh|2009-12-02|TLD generator | |55609|New|Enh|2013-09-28|c:forEach loop on integer range consumes unnecessa| +-+---+---+--+--+ | Total6 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Modules [2014/05/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers | |48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite | |48861|New|Nor|2010-03-04|Files without AL headers | |49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean | |49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da| |50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen| |51595|Inf|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho| |51879|Inf|Enh|2011-09-22|Improve access to Native Connection Methods | |52024|Inf|Enh|2011-10-13|Custom interceptor to support automatic failover o| |53088|Opn|Min|2012-04-17|Give PoolCleaner TimerTask a better name | |53198|New|Cri|2012-05-07|'driverClassName' Data Source Property Being Manda| |53199|Inf|Enh|2012-05-07|Refactor ConnectionPool to use ScheduledExecutorSe| |53200|New|Enh|2012-05-07|Be able to use SlowQueryReport without reporting f| |53770|New|Enh|2012-08-23|tomcat-pool: always log validation query syntax er| |53853|New|Nor|2012-09-11|Can tomcat-jdbc consider Thread#getContextClassLoa| |54225|New|Nor|2012-11-30|if initSQL property is set to an empty string a Nu| |54227|New|Nor|2012-11-30|maxAge should be checked on borrow| |54235|New|Nor|2012-12-03|tomcat jdbc pool stackoverflow error used with spr| |54395|New|Nor|2013-01-09|JdbcInterceptor config parameter parsing errors | |54437|New|Enh|2013-01-16|Update PoolProperties javadoc for ConnectState int| |54537|New|Cri|2013-02-07|StatementFinalizer closeInvoked is too slow for la| |54929|New|Nor|2013-05-05|jdbc-pool cannot be used with Java 1.5, "java.lang| |54978|New|Nor|2013-05-15|Validate on Borrow should be tested on Reconnect i| |55078|New|Nor|2013-06-07|Configuring a DataSource Resource with dataSourceJ| |55444|New|Nor|2013-08-18|Support JDBC Drivers outside of tomcat/lib/ | |56046|New|Enh|2014-01-21|org.apache.tomcat.jdbc.pool.XADataSource InitSQL p| |56088|New|Maj|2014-01-29|AbstractQueryReport$StatementProxy throws exceptio| |56310|Inf|Maj|2014-03-25|PooledConnection and XAConnection not handled corr| |56318|Opn|Maj|2014-03-26|Oracle DB cursors are leaking when using org.apach| +-+---+---+--+--+ | Total 29 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot retry in ASF Buildbot on tomcat-7-trunk
on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/50 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1593288 Blamelist: markt BUILD FAILED: retry exception slave lost sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593773 - in /tomcat/trunk: BUILDING.txt build.xml test/org/apache/catalina/startup/TomcatBaseTest.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sun May 11 11:02:53 2014
New Revision: 1593773
URL: http://svn.apache.org/r1593773
Log:
In tests: allow to configure directory where JUnit reports and access log are
written to.
This is useful for Apache Gump, where BIO, NIO and NIO2 test runs are
configured separately.
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/build.xml
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1593773&r1=1593772&r2=1593773&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Sun May 11 11:02:53 2014
@@ -352,7 +352,13 @@ For example:
(7.3) Other configuration options
- 1. It is possible to enable generation of access log file when the tests
+ 1. It is possible to configure the directory where JUnit reports are
+ written to. It is configured by "test.reports" property. The default
+ value is
+
+output/build/logs
+
+ 2. It is possible to enable generation of access log file when the tests
are run. This is off by default and can be enabled by the following
property:
@@ -363,7 +369,7 @@ For example:
output/build/logs
- 2. The testsuite respects logging configuration as configured by
+ 3. The testsuite respects logging configuration as configured by
${tomcat.source}/conf/logging.properties
The log files will be written to the temporary directory used by the
@@ -371,17 +377,24 @@ For example:
output/test-tmp/logs
- 3. It is possible to configure formatter used by JUnit reports. For
- example the following property disables generation of separate report
+ 4. It is possible to configure formatter used by JUnit reports.
+ Configuration properties are "junit.formatter.type",
+ "junit.formatter.extension" and "junit.formatter.usefile".
+
+ For example the following property disables generation of separate report
files:
junit.formatter.usefile=false
- 4. Optional support is provided for the Cobertura code coverage tool. It
+ 5. Optional support is provided for the Cobertura code coverage tool. It
can be enabled using the following property:
test.cobertura=true
+ The report files by default are written to
+
+output/coverage
+
* NOTE: Cobertura is licensed under GPL v2 with parts of it being under
Apache License v1.1. See http://cobertura.sf.net for details. Using it
during Tomcat build is optional and is off by default.
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1593773&r1=1593772&r2=1593773&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun May 11 11:02:53 2014
@@ -70,6 +70,7 @@
+
@@ -1373,6 +1374,7 @@
+
@@ -1381,13 +1383,13 @@
extension="@{extension}${junit.formatter.extension}" />
-
-
-
+
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1593773&r1=1593772&r2=1593773&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Sun May
11 11:02:53 2014
@@ -126,8 +126,14 @@ public abstract class TomcatBaseTest ext
accessLogEnabled = Boolean.parseBoolean(
System.getProperty("tomcat.test.accesslog", "false"));
if (accessLogEnabled) {
+String accessLogDirectory = System
+.getProperty("tomcat.test.reports");
+if (accessLogDirectory == null) {
+accessLogDirectory = new File(getBuildDirectory(), "logs")
+.toString();
+}
AccessLogValve alv = new AccessLogValve();
-alv.setDirectory(getBuildDirectory() + "/logs");
+alv.setDirectory(accessLogDirectory);
alv.setPattern("%h %l %u %t \"%r\" %s %b %I %D");
tomcat.getHost().getPipeline().addValve(alv);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1593773&r1=1593772&r2=1593773&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun May 11 11:02:53 2014
@@ -382,6 +382,10 @@
Update package renamed Apache Commons Pool2 and DBCP2 to r159
svn commit: r1593780 - in /tomcat/tc7.0.x/trunk: ./ BUILDING.txt build.xml test/org/apache/catalina/startup/TomcatBaseTest.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sun May 11 11:47:23 2014
New Revision: 1593780
URL: http://svn.apache.org/r1593780
Log:
Merged r1593773 from tomcat/trunk:
In tests: allow to configure directory where JUnit reports and access log are
written to.
This is useful for Apache Gump, where BIO, NIO and NIO2 tests in Tomcat 8 are
configured separately.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/BUILDING.txt
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1593773
Modified: tomcat/tc7.0.x/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/BUILDING.txt?rev=1593780&r1=1593779&r2=1593780&view=diff
==
--- tomcat/tc7.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc7.0.x/trunk/BUILDING.txt Sun May 11 11:47:23 2014
@@ -363,7 +363,13 @@ For example:
(7.3) Other configuration options
- 1. It is possible to enable generation of access log file when the tests
+ 1. It is possible to configure the directory where JUnit reports are
+ written to. It is configured by "test.reports" property. The default
+ value is
+
+output/build/logs
+
+ 2. It is possible to enable generation of access log file when the tests
are run. This is off by default and can be enabled by the following
property:
@@ -374,7 +380,7 @@ For example:
output/build/logs
- 2. The testsuite respects logging configuration as configured by
+ 3. The testsuite respects logging configuration as configured by
${tomcat.source}/conf/logging.properties
The log files will be written to the temporary directory used by the
@@ -382,17 +388,24 @@ For example:
output/test-tmp/logs
- 3. It is possible to configure formatter used by JUnit reports. For
- example the following property disables generation of separate report
+ 4. It is possible to configure formatter used by JUnit reports.
+ Configuration properties are "junit.formatter.type",
+ "junit.formatter.extension" and "junit.formatter.usefile".
+
+ For example the following property disables generation of separate report
files:
junit.formatter.usefile=false
- 4. Optional support is provided for the Cobertura code coverage tool. It
+ 5. Optional support is provided for the Cobertura code coverage tool. It
can be enabled using the following property:
test.cobertura=true
+ The report files by default are written to
+
+output/coverage
+
* NOTE: Cobertura is licensed under GPL v2 with parts of it being under
Apache License v1.1. See http://cobertura.sf.net for details. Using it
during Tomcat build is optional and is off by default.
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1593780&r1=1593779&r2=1593780&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Sun May 11 11:47:23 2014
@@ -69,6 +69,7 @@
+
@@ -1350,6 +1351,7 @@
+
@@ -1358,13 +1360,13 @@
extension="@{extension}${junit.formatter.extension}" />
-
-
-
+
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1593780&r1=1593779&r2=1593780&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Sun May 11 11:47:23 2014
@@ -124,8 +124,14 @@ public abstract class TomcatBaseTest ext
accessLogEnabled = Boolean.parseBoolean(
System.getProperty("tomcat.test.accesslog", "false"));
if (accessLogEnabled) {
+String accessLogDirectory = System
+.getProperty("tomcat.test.reports");
+if (accessLogDirectory == null) {
+accessLogDirectory = new File(getBuildDirectory(), "logs")
+.toString();
+}
AccessLogValve alv = new AccessLogValve();
-alv.setDirectory(getBuildDirectory() + "/logs");
+alv.setDirectory(accessLogDirectory);
alv.setPattern("%h %l %u %t \"%r\" %s %b %I %D");
tomcat.getHost().getPipeline().addValve(alv);
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat
svn commit: r1593259 - /tomcat/trunk/conf/catalina.properties
Author: markt
Date: Thu May 8 13:05:48 2014
New Revision: 1593259
URL: http://svn.apache.org/r1593259
Log:
Alphabetical order
Modified:
tomcat/trunk/conf/catalina.properties
Modified: tomcat/trunk/conf/catalina.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.properties?rev=1593259&r1=1593258&r2=1593259&view=diff
==
--- tomcat/trunk/conf/catalina.properties (original)
+++ tomcat/trunk/conf/catalina.properties Thu May 8 13:05:48 2014
@@ -19,7 +19,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
#
# List of comma-separated packages that start with or equal this string
# will cause a security exception to be thrown when
@@ -30,7 +30,7 @@ package.access=sun.,org.apache.catalina.
# by default, no packages are restricted for definition, and none of
# the class loaders supplied with the JDK call checkPackageDefinition.
#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
#
#
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593032 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
Author: remm
Date: Wed May 7 14:55:33 2014
New Revision: 1593032
URL: http://svn.apache.org/r1593032
Log:
- Add setTimeout, for handling of the upload timeout.
- Cleanup.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1593032&r1=1593031&r2=1593032&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Wed May
7 14:55:33 2014
@@ -90,25 +90,24 @@ public class Http11Nio2Processor extends
long soTimeout = endpoint.getSoTimeout();
RequestInfo rp = request.getRequestProcessor();
-final SocketWrapper attach = socketWrapper;
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
error = !getAdapter().event(request, response, status);
-if ( !error ) {
-if (attach != null) {
-attach.setComet(comet);
+if (!error) {
+if (socketWrapper != null) {
+socketWrapper.setComet(comet);
if (comet) {
Integer comettimeout = (Integer) request.getAttribute(
org.apache.coyote.Constants.COMET_TIMEOUT_ATTR);
if (comettimeout != null) {
-attach.setTimeout(comettimeout.longValue());
+socketWrapper.setTimeout(comettimeout.longValue());
}
} else {
//reset the timeout
if (keepAlive) {
-attach.setTimeout(keepAliveTimeout);
+socketWrapper.setTimeout(keepAliveTimeout);
} else {
-attach.setTimeout(soTimeout);
+socketWrapper.setTimeout(soTimeout);
}
}
@@ -230,21 +229,19 @@ public class Http11Nio2Processor extends
@Override
protected void setSocketTimeout(int timeout) throws IOException {
-// Not relevant for NIO2
+socketWrapper.setTimeout(timeout);
}
@Override
protected void setCometTimeouts(SocketWrapper socketWrapper) {
-final Nio2Endpoint.Nio2SocketWrapper attach =
-(Nio2Endpoint.Nio2SocketWrapper)socketWrapper;
-if (attach != null) {
-attach.setComet(comet);
+if (socketWrapper != null) {
+socketWrapper.setComet(comet);
if (comet) {
Integer comettimeout = (Integer) request.getAttribute(
org.apache.coyote.Constants.COMET_TIMEOUT_ATTR);
if (comettimeout != null) {
-attach.setTimeout(comettimeout.longValue());
+socketWrapper.setTimeout(comettimeout.longValue());
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593695 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sat May 10 12:51:43 2014
New Revision: 1593695
URL: http://svn.apache.org/r1593695
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56363
Update version of Tomcat Native library included with Tomcat to 1.1.30
and make it the recommended version.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593695&r1=1593694&r2=1593695&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May 10 12:51:43 2014
@@ -52,14 +52,6 @@ PATCHES PROPOSED TO BACKPORT:
http://wiki.openssl.org/index.php/FIPS_mode%28%29
Alternative patch is proposed below.
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56363
- Update version of Tomcat Native library included with Tomcat to 1.1.30
- and make it the recommended version.
-
https://people.apache.org/~kkolinko/patches/2014-04-27_tc6_native_1_1_30.patch
- +1: kkolinko, markt, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56027
Add more options for managing FIPS mode in the AprLifecycleListener.
Update to version 1.1.30 of Tomcat Native library.
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1593695&r1=1593694&r2=1593695&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Sat May 10 12:51:43 2014
@@ -116,7 +116,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.1.29
+tomcat-native.version=1.1.30
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1593695&r1=1593694&r2=1593695&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Sat May 10 12:51:43 2014
@@ -62,7 +62,7 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MAJOR = 1;
protected static final int TCN_REQUIRED_MINOR = 1;
protected static final int TCN_REQUIRED_PATCH = 17;
-protected static final int TCN_RECOMMENDED_PV = 27;
+protected static final int TCN_RECOMMENDED_PV = 30;
// -- Properties
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1593695&r1=1593694&r2=1593695&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat May 10 12:51:43 2014
@@ -202,6 +202,10 @@
options with the exe installer. Make command names
case-insensitive. Update documentation. (kkolinko)
+
+56363: Update to version 1.1.30 of Tomcat Native library.
+(kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/44 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1593189 Blamelist: violetagg BUILD FAILED: failed compile_1 sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593800 - /tomcat/trunk/build.xml
Author: kkolinko Date: Sun May 11 14:43:00 2014 New Revision: 1593800 URL: http://svn.apache.org/r1593800 Log: Followup to r1593773: Explicitly create the logs directory. JUnit fails when the directory where it writes its reports does not exist. It happened at Apache Gump. Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1593800&r1=1593799&r2=1593800&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Sun May 11 14:43:00 2014 @@ -1357,6 +1357,7 @@ description="The extension to use to distinguish the output"/> +
svn commit: r1593801 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: kkolinko Date: Sun May 11 14:44:19 2014 New Revision: 1593801 URL: http://svn.apache.org/r1593801 Log: Merged r1593800 from tomcat/trunk: Followup to r1593773: Explicitly create the logs directory. JUnit fails when the directory where it writes its reports does not exist. It happened at Apache Gump. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1593800 Modified: tomcat/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1593801&r1=1593800&r2=1593801&view=diff == --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Sun May 11 14:44:19 2014 @@ -1334,6 +1334,7 @@ description="The extension to use to distinguish the output"/> +
svn commit: r1593696 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/tomcat/jni/ webapps/docs/ webapps/docs/config/
Author: kkolinko Date: Sat May 10 13:06:46 2014 New Revision: 1593696 URL: http://svn.apache.org/r1593696 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 Add more options for managing FIPS mode in the AprLifecycleListener. The minimum required version of Tomcat Native library is now 1.1.30. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1590646 Merged /tomcat/tc7.0.x/trunk:r1590845 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593696&r1=1593695&r2=1593696&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat May 10 13:06:46 2014 @@ -28,40 +28,6 @@ None PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* Back-port patch to allow different kinds of FIPS configuration. - http://people.apache.org/~schultz/patches/tcnative.heartbleed.tomcat6.diff - http://svn.apache.org/viewvc?view=revision&revision=r1587379 - http://svn.apache.org/viewvc?view=revision&revision=r1587723 (adapt) - (Note: requires tcnative 1.1.30) - +1: schultz, markt, remm - -1: kkolinko: - a) I cannot test (without FIPS-enabled library), but from my code review - the new options will not work because you are not setting - "fipsModeActive" field in AprLifecycleListener. - - Thus AprLifecycleListener.isFIPSModeActive() will return false - and startup will be aborted. - - b) It needs backport of r1588102 as an Exception is thrown by native code - - c) "enterFipsMode = 1 != fipsModeState;" code and comment before it are wrong. - - FIPS_mode() function of OpenSSL is documented to return non-zero - value when in FIPS mode. You cannot expect it to be '1'. - Reference: - http://wiki.openssl.org/index.php/FIPS_mode%28%29 - Alternative patch is proposed below. - -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 - Add more options for managing FIPS mode in the AprLifecycleListener. - Update to version 1.1.30 of Tomcat Native library. - (This feature requires TCNative 1.1.30) - (Reimplemented, based on earlier proposal by schultz) - https://people.apache.org/~kkolinko/patches/2014-04-27_tc6_56027_FIPSMode.patch - http://svn.apache.org/r1590845 (javadoc fixes) - +1: kkolinko, markt, fhanik - -1: - * Defensive coding around some XML activities that are triggered by web applications and are therefore at potential risk of a memory leak. http://people.apache.org/~markt/patches/2014-04-25-memory-leak-tc6-v1.patch Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1593696&r1=1593695&r2=1593696&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Sat May 10 13:06:46 2014 @@ -61,7 +61,7 @@ public class AprLifecycleListener protected static final int TCN_REQUIRED_MAJOR = 1; protected static final int TCN_REQUIRED_MINOR = 1; -protected static final int TCN_REQUIRED_PATCH = 17; +protected static final int TCN_REQUIRED_PATCH = 30; protected static final int TCN_RECOMMENDED_PV = 30; @@ -75,6 +75,22 @@ public class AprLifecycleListener protected static boolean aprAvailable = false; protected static boolean fipsModeActive = false; +/** + * The "FIPS mode" level that we use as the argument to OpenSSL method + * FIPS_mode_set() to enable FIPS mode and that we expect as + * the return value of FIPS_mode() when FIPS mode is enabled. + * + * In the future the OpenSSL library might grow support for different + * non-zero "FIPS" modes that specify different allowed subsets of ciphers + * or whatever, but nowadays only "1" is the supported value. + * + * @see http://wiki.openssl.org/index.php/FIPS_mode_set%28%29";>OpenSSL method FIPS_mode_set() + * @see http://wiki.openssl.org/index.php/FIPS_mode%28%29";>OpenSSL method FIPS_mode() + */ +private static final int FIPS_ON = 1; + +private static final int FIPS_OFF = 0; + protected s
svn commit: r1593815 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/TldConfig.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sun May 11 16:44:03 2014
New Revision: 1593815
URL: http://svn.apache.org/r1593815
Log:
Ensure TLD parser obtained from cache has correct value of blockExternal
(r1590036 + r1590040 + r1590065)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593815&r1=1593814&r2=1593815&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 11 16:44:03 2014
@@ -34,12 +34,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko, fhanik
-1:
-* Ensure TLD parser obtained from cache has correct value of blockExternal
- (r1590036 + r1590040 + r1590065)
- https://people.apache.org/~kkolinko/patches/2014-04-26_tc6_TldConfig.patch
- +1: kkolinko, markt, fhanik
- -1:
-
* Followup to r1589635
To simplify code and align it with TC7 & 8.
(Discussed in Re:r1589635)
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1593815&r1=1593814&r2=1593815&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Sun
May 11 16:44:03 2014
@@ -138,30 +138,29 @@ public final class TldConfig implements
/**
* The Digesters available to process tld files.
*/
-private static Digester[] tldDigesters = new Digester[2];
+private static Digester[] tldDigesters = new Digester[4];
/**
* Create (if necessary) and return a Digester configured to process the
* tld.
*/
-private static Digester createTldDigester(boolean validation,
+private static synchronized Digester createTldDigester(boolean validation,
boolean blockExternal) {
-Digester digester = null;
-if (!validation) {
-if (tldDigesters[0] == null) {
-tldDigesters[0] = DigesterFactory.newDigester(validation,
-true, new TldRuleSet(), blockExternal);
-tldDigesters[0].getParser();
-}
-digester = tldDigesters[0];
-} else {
-if (tldDigesters[1] == null) {
-tldDigesters[1] = DigesterFactory.newDigester(validation,
-true, new TldRuleSet(), blockExternal);
-tldDigesters[1].getParser();
-}
-digester = tldDigesters[1];
+Digester digester;
+int cacheIndex = 0;
+if (validation) {
+cacheIndex += 1;
+}
+if (blockExternal) {
+cacheIndex += 2;
+}
+digester = tldDigesters[cacheIndex];
+if (digester == null) {
+digester = DigesterFactory.newDigester(validation,
+true, new TldRuleSet(), blockExternal);
+digester.getParser();
+tldDigesters[cacheIndex] = digester;
}
return digester;
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1593815&r1=1593814&r2=1593815&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun May 11 16:44:03 2014
@@ -95,6 +95,10 @@
Only create XML parsing objects if required and fix associated
potential
memory leak in the default Servlet. (markt)
+
+Ensure that a TLD parser obtained from the cache has the correct value
+of blockExternal. (markt/kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593821 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/security/ java/org/apache/catalina/servlets/ java/org/apache/catalina/session/ java/org/apache/jasper/compiler/ java/org/ap
Author: kkolinko
Date: Sun May 11 17:15:52 2014
New Revision: 1593821
URL: http://svn.apache.org/r1593821
Log:
Defensive coding around some XML activities that are triggered by web
applications and are therefore at potential risk of a memory leak.
Patch by markt.
Added:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/security/
- copied from r1593818,
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/security/PrivilegedGetTccl.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/security/PrivilegedSetTccl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593821&r1=1593820&r2=1593821&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 11 17:15:52 2014
@@ -28,12 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Defensive coding around some XML activities that are triggered by web
- applications and are therefore at potential risk of a memory leak.
- http://people.apache.org/~markt/patches/2014-04-25-memory-leak-tc6-v1.patch
- +1: markt, kkolinko, fhanik
- -1:
-
* Followup to r1589635
To simplify code and align it with TC7 & 8.
(Discussed in Re:r1589635)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1593821&r1=1593820&r2=1593821&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
Sun May 11 17:15:52 2014
@@ -96,17 +96,10 @@ public final class SecurityClassLoad {
private final static void loadSessionPackage(ClassLoader loader)
throws Exception {
-String basePackage = "org.apache.catalina.";
-loader.loadClass
-(basePackage + "session.StandardSession");
-loader.loadClass
-(basePackage + "session.StandardSession$PrivilegedSetTccl");
-loader.loadClass
-(basePackage +
- "session.StandardSession$1");
-loader.loadClass
-(basePackage +
- "session.StandardManager$PrivilegedDoUnload");
+String basePackage = "org.apache.catalina.session.";
+loader.loadClass(basePackage + "StandardSession");
+loader.loadClass(basePackage + "StandardSession$1");
+loader.loadClass(basePackage + "StandardManager$PrivilegedDoUnload");
}
@@ -229,6 +222,10 @@ public final class SecurityClassLoad {
Class clazz = loader.loadClass(
basePackage + "util.http.FastHttpDateFormat");
clazz.newInstance();
+
+// security
+loader.loadClass(basePackage + "util.security.PrivilegedGetTccl");
+loader.loadClass(basePackage + "util.security.PrivilegedSetTccl");
}
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1593821&r1=1593820&r2=1593821&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Sun May 11 17:15:52 2014
@@ -31,6 +31,7 @@ import java.io.RandomAccessFile;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
+import java.security.AccessController;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Locale;
@@ -68,6 +69,8 @@ import org.apache.naming.resources.Cache
import org.apache.naming.resources.ProxyDirContext;
import org.apache.naming.resources.Resource;
import org.apache.naming.resources.ResourceAttributes;
+import org.apache.tomcat.util.security.PrivilegedGetTccl;
+import org.apache.tomcat.util.security.PrivilegedSetTccl;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@
svn commit: r1593824 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Sun May 11 17:26:47 2014 New Revision: 1593824 URL: http://svn.apache.org/r1593824 Log: Merge duplicate changelog entries in 6.0.40. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1593824&r1=1593823&r2=1593824&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun May 11 17:26:47 2014 @@ -118,7 +118,9 @@ (markt) -Update tc-native to 1.1.29. (markt) +56363: Update to version 1.1.30 of Tomcat Native library. +The minimum required version of this library for APR connector is now +1.1.30. (kkolinko) @@ -215,10 +217,6 @@ options with the exe installer. Make command names case-insensitive. Update documentation. (kkolinko) - -56363: Update to version 1.1.30 of Tomcat Native library. -(kkolinko) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593826 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/ELParser.java
Author: kkolinko
Date: Sun May 11 17:36:30 2014
New Revision: 1593826
URL: http://svn.apache.org/r1593826
Log:
Followup to r1589635
To simplify code and align it with TC7 & 8.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1589737-1589738
Merged /tomcat/tc7.0.x/trunk:r1589740
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593826&r1=1593825&r2=1593826&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 11 17:36:30 2014
@@ -28,13 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Followup to r1589635
- To simplify code and align it with TC7 & 8.
- (Discussed in Re:r1589635)
- http://svn.apache.org/r1589737
- +1: kkolinko, markt, fhanik
- -1:
-
* Additional change missed in back-port to fix BZ 56334
http://people.apache.org/~markt/patches/2014-04-28-bug56334-tc6-v1.patch
+1: markt, kkolinko, fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1593826&r1=1593825&r2=1593826&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java Sun May
11 17:36:30 2014
@@ -263,7 +263,7 @@ public class ELParser {
if (output == null) {
output = new StringBuilder(len + 20);
}
-output.append(input.subSequence(lastAppend, i));
+output.append(input.substring(lastAppend, i));
lastAppend = i + 1;
output.append('\\');
output.append(ch);
@@ -316,7 +316,7 @@ public class ELParser {
output = new StringBuilder(len + 20);
output.append(quote);
}
-output.append(input.subSequence(lastAppend, i));
+output.append(input.substring(lastAppend, i));
lastAppend = i + 1;
output.append('\\');
output.append(ch);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593536 - in /tomcat/trunk: java/org/apache/tomcat/util/codec/binary/Base64.java java/org/apache/tomcat/util/codec/binary/BaseNCodec.java webapps/docs/changelog.xml
Author: markt
Date: Fri May 9 12:57:08 2014
New Revision: 1593536
URL: http://svn.apache.org/r1593536
Log:
Update package renamed Apache Commons Codec to r1586336 to pick up some Javadoc
fixes and some code clean up.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
tomcat/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java?rev=1593536&r1=1593535&r2=1593536&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java Fri May
9 12:57:08 2014
@@ -27,13 +27,13 @@ import java.math.BigInteger;
*
*
* The class can be parameterized in the following manner with various
constructors:
+ *
*
* URL-safe mode: Default off.
* Line length: Default 76. Line length that aren't multiples of 4 will
still essentially end up being multiples of
* 4 in the encoded data.
* Line separator: Default is CRLF ("\r\n")
*
- *
*
* Since this class operates directly on byte streams, and not character
streams, it is hard-coded to only
* encode/decode character encodings which are compatible with the lower 127
ASCII chart (ISO-8859-1, Windows-1252,
@@ -138,7 +138,7 @@ public class Base64 extends BaseNCodec {
private final byte[] decodeTable = DECODE_TABLE;
/**
- * Line separator for encoding. Not used when decoding. Only used if
lineLength > 0.
+ * Line separator for encoding. Not used when decoding. Only used if
lineLength > 0.
*/
private final byte[] lineSeparator;
@@ -202,7 +202,7 @@ public class Base64 extends BaseNCodec {
*
* @param lineLength
*Each line of encoded data will be at most of the given
length (rounded down to nearest multiple of
- *4). If lineLength <= 0, then the output will not be divided
into lines (chunks). Ignored when
+ *4). If lineLength <= 0, then the output will not be
divided into lines (chunks). Ignored when
*decoding.
* @since 1.4
*/
@@ -225,7 +225,7 @@ public class Base64 extends BaseNCodec {
*
* @param lineLength
*Each line of encoded data will be at most of the given
length (rounded down to nearest multiple of
- *4). If lineLength <= 0, then the output will not be divided
into lines (chunks). Ignored when
+ *4). If lineLength <= 0, then the output will not be
divided into lines (chunks). Ignored when
*decoding.
* @param lineSeparator
*Each line of encoded data will end with this sequence of
bytes.
@@ -252,7 +252,7 @@ public class Base64 extends BaseNCodec {
*
* @param lineLength
*Each line of encoded data will be at most of the given
length (rounded down to nearest multiple of
- *4). If lineLength <= 0, then the output will not be divided
into lines (chunks). Ignored when
+ *4). If lineLength <= 0, then the output will not be
divided into lines (chunks). Ignored when
*decoding.
* @param lineSeparator
*Each line of encoded data will end with this sequence of
bytes.
@@ -346,8 +346,8 @@ public class Base64 extends BaseNCodec {
buffer[context.pos++] = encodeTable[(context.ibitWorkArea
<< 4) & MASK_6BITS];
// URL-SAFE skips the padding to further reduce size.
if (encodeTable == STANDARD_ENCODE_TABLE) {
-buffer[context.pos++] = PAD;
-buffer[context.pos++] = PAD;
+buffer[context.pos++] = pad;
+buffer[context.pos++] = pad;
}
break;
@@ -357,7 +357,7 @@ public class Base64 extends BaseNCodec {
buffer[context.pos++] = encodeTable[(context.ibitWorkArea
<< 2) & MASK_6BITS];
// URL-SAFE skips the padding to further reduce size.
if (encodeTable == STANDARD_ENCODE_TABLE) {
-buffer[context.pos++] = PAD;
+buffer[context.pos++] = pad;
}
break;
default:
@@ -430,7 +430,7 @@ public class Base64 extends BaseNCodec {
for (int i = 0; i < inAvail; i++) {
final byte[] buffer = ensureBufferSize(decodeSize, context);
final byte b = in[inPos++];
-if (b == PAD) {
+if (b == pad) {
// We're done.
context.eof = true;
break;
@@ -479,21 +479,6 @@ publ
svn commit: r1593832 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/jasper/compiler/Validator.java
Author: kkolinko
Date: Sun May 11 18:05:40 2014
New Revision: 1593832
URL: http://svn.apache.org/r1593832
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
Additional change missed in back-port to fix BZ 56334
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593832&r1=1593831&r2=1593832&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 11 18:05:40 2014
@@ -28,11 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Additional change missed in back-port to fix BZ 56334
- http://people.apache.org/~markt/patches/2014-04-28-bug56334-tc6-v1.patch
- +1: markt, kkolinko, fhanik
- -1:
-
* Correct the handling of back-slash escaping in the EL parser and no longer
require that "\$" or "\#" must be followed by "{" in order for the back-slash
escaping to take effect.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1593832&r1=1593831&r2=1593832&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Sun May
11 18:05:40 2014
@@ -1059,6 +1059,7 @@ class Validator {
pageInfo.isDeferredSyntaxAllowedAsLiteral() ||
libraryVersion < 2.1;
+String attributeValue;
ELNode.Nodes el = null;
if (!runtimeExpression && !pageInfo.isELIgnored()) {
el = ELParser.parse(attrs.getValue(i),
@@ -1083,6 +1084,14 @@ class Validator {
}
}
}
+if (elExpression) {
+attributeValue = attrs.getValue(i);
+} else {
+// Should be a single Text node
+attributeValue = ((ELNode.Text)
el.iterator().next()).getText();
+}
+} else {
+attributeValue = attrs.getValue(i);
}
boolean expression = runtimeExpression || elExpression;
@@ -1138,18 +1147,18 @@ class Validator {
}
// Check casting
try {
-ELSupport.checkType(attrs.getValue(i),
expectedClass);
+ELSupport.checkType(attributeValue,
expectedClass);
} catch (Exception e) {
err.jspError
(n, "jsp.error.coerce_to_type",
- tldAttr.getName(), expectedType,
attrs.getValue(i));
+ tldAttr.getName(), expectedType,
attributeValue);
}
}
jspAttrs[i] = new Node.JspAttribute(tldAttr,
attrs.getQName(i), attrs.getURI(i),
attrs
.getLocalName(i),
-attrs.getValue(i), false, null, false);
+attributeValue, false, null, false);
} else {
if (deferred && !tldAttr.isDeferredMethod() &&
!tldAttr.isDeferredValue()) {
@@ -1178,7 +1187,7 @@ class Validator {
jspAttrs[i] = new
Node.JspAttribute(tldAttr,
attrs.getQName(i),
attrs.getURI(i),
attrs.getLocalName(i),
-attrs.getValue(i), false, el,
false);
+attributeValue, false, el,
false);
ELContextImpl ctx = new
ELContextImpl();
ctx.setFunctionMapper(getFunctionMapper(el));
try {
@@ -1186,7 +1195,7 @@ class Validator {
} catch (ELException e) {
this.err.jspError(n.getStart(),
"jsp.error.invalid.expression",
-attrs.ge
[Bug 56334] Double Backslash Escaping in Attributes
https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 --- Comment #13 from Konstantin Kolinko --- (In reply to Konstantin Kolinko from comment #12) The additional issues have been fixed in Tomcat 7 and 8 and proposed for Tomcat 6. The fixes will be in 7.0.54, 8.0.6. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56501] problems with urlencoding in webapp name
https://issues.apache.org/bugzilla/show_bug.cgi?id=56501 --- Comment #8 from Konstantin Kolinko --- For reference: http://docs.oracle.com/javaee/7/api/javax/servlet/http/HttpServletRequest.html#getContextPath%28%29 [quote]The container does not decode this string.[/quote] The same in JavaEE 6 and 5 javadocs for getContextPath() method. Thus I agree with this change. ( r1593621 ) This change also means that any path parameters present in that part of request URI are now returned by getContextPath(). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56492] Avoid eclipse debugger pausing on uncaught exceptions when tomcat renews its threads
https://issues.apache.org/bugzilla/show_bug.cgi?id=56492 --- Comment #4 from Christopher Schultz --- Trunk is CTR, so fire away. If you wrote the original code, I can't think of a better person to refactor it :) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593835 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/el/parser/AstLiteralExpression.java
Author: kkolinko
Date: Sun May 11 18:23:43 2014
New Revision: 1593835
URL: http://svn.apache.org/r1593835
Log:
Merged r1593834 from tomcat/trunk:
Simplify. No functional change.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1593834
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java?rev=1593835&r1=1593834&r2=1593835&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java
Sun May 11 18:23:43 2014
@@ -53,7 +53,7 @@ public final class AstLiteralExpression
char c = image.charAt(i);
if (c == '\\' && i + 1 < size) {
char c1 = image.charAt(i + 1);
-if ((c1 == '#' || c1 == '$')) {
+if (c1 == '#' || c1 == '$') {
c = c1;
i++;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593834 - /tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
Author: kkolinko
Date: Sun May 11 18:21:23 2014
New Revision: 1593834
URL: http://svn.apache.org/r1593834
Log:
Simplify. No functional change.
Modified:
tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java?rev=1593834&r1=1593833&r2=1593834&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java Sun May 11
18:21:23 2014
@@ -53,7 +53,7 @@ public final class AstLiteralExpression
char c = image.charAt(i);
if (c == '\\' && i + 1 < size) {
char c1 = image.charAt(i + 1);
-if ((c1 == '#' || c1 == '$')) {
+if (c1 == '#' || c1 == '$') {
c = c1;
i++;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593842 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/jasper/compiler/Validator.java
Author: kkolinko
Date: Sun May 11 19:26:09 2014
New Revision: 1593842
URL: http://svn.apache.org/r1593842
Log:
CTR: a rather trivial change that simplifies subsequent merge of r1590848
Remove unused 'expectedType' argument from getJspAttribute() method.
It is merge of r656018 from tomcat/trunk.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r656018
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1593842&r1=1593841&r2=1593842&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Sun May
11 19:26:09 2014
@@ -27,7 +27,6 @@ import javax.el.ELException;
import javax.el.ExpressionFactory;
import javax.el.FunctionMapper;
import javax.servlet.jsp.tagext.FunctionInfo;
-import javax.servlet.jsp.tagext.JspFragment;
import javax.servlet.jsp.tagext.PageData;
import javax.servlet.jsp.tagext.TagAttributeInfo;
import javax.servlet.jsp.tagext.TagData;
@@ -542,8 +541,7 @@ class Validator {
// request-time expression
throwErrorIfExpression(n, "name", "jsp:param");
n.setValue(getJspAttribute(null, "value", null, null, n
-.getAttributeValue("value"), java.lang.String.class, n,
-false));
+.getAttributeValue("value"), n, false));
visitBody(n);
}
@@ -560,16 +558,14 @@ class Validator {
JspUtil.checkAttributes("Include action", n, includeActionAttrs,
err);
n.setPage(getJspAttribute(null, "page", null, null, n
-.getAttributeValue("page"), java.lang.String.class, n,
-false));
+.getAttributeValue("page"), n, false));
visitBody(n);
-};
+}
public void visit(Node.ForwardAction n) throws JasperException {
JspUtil.checkAttributes("Forward", n, forwardActionAttrs, err);
n.setPage(getJspAttribute(null, "page", null, null, n
-.getAttributeValue("page"), java.lang.String.class, n,
-false));
+.getAttributeValue("page"), n, false));
visitBody(n);
}
@@ -584,7 +580,7 @@ class Validator {
String value = n.getAttributeValue("value");
n.setValue(getJspAttribute(null, "value", null, null, value,
-java.lang.Object.class, n, false));
+n, false));
boolean valueSpecified = n.getValue() != null;
@@ -619,8 +615,7 @@ class Validator {
err.jspError(n, "jsp.error.usebean.noSession");
Node.JspAttribute jattr = getJspAttribute(null, "beanName", null,
-null, n.getAttributeValue("beanName"),
-java.lang.String.class, n, false);
+null, n.getAttributeValue("beanName"), n, false);
n.setBeanName(jattr);
if (className != null && jattr != null)
err.jspError(n, "jsp.error.usebean.notBoth");
@@ -657,13 +652,11 @@ class Validator {
err.jspError(n, "jsp.error.plugin.nocode");
Node.JspAttribute width = getJspAttribute(null, "width", null,
-null, n.getAttributeValue("width"), java.lang.String.class,
-n, false);
+null, n.getAttributeValue("width"), n, false);
n.setWidth(width);
Node.JspAttribute height = getJspAttribute(null, "height", null,
-null, n.getAttributeValue("height"),
-java.lang.String.class, n, false);
+null, n.getAttributeValue("height"), n, false);
n.setHeight(height);
visitBody(n);
@@ -742,8 +735,8 @@ class Validator {
}
}
jspAttrs[i] = getJspAttribute(null, attrs.getQName(i),
-attrs.getURI(i), attrs.getLocalName(i), value,
-java.lang.Object.class, n, false);
+attrs.getURI(i), attrs.getLocalName(i), value, n,
+false);
}
n.setJspAttributes(jspAttrs);
}
@@ -888,14 +881,12 @@ class Validator {
if ("name".equals(attrs.getLocalName(i))) {
n.setNameAttribute(getJspAttribute(null, attrs.getQName(i),
attrs.getURI(i), attrs.getLocalName(i), attrs
-
svn commit: r1593845 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/ELParser.java java/org/apache/jasper/compiler/Generator.java java/org/apache/jasper/compiler/Validator.ja
Author: kkolinko
Date: Sun May 11 19:53:59 2014
New Revision: 1593845
URL: http://svn.apache.org/r1593845
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
Merged r1590848 from tomcat/tc7.0.x/trunk:
Additional fixes for BZ 56334.
Includes the following:
1. Allow '\' in xmlns attributes of UninterpretedTag.
(Java escaping was missing. Xml-escaping is still missing. I think it is
unlikely that anybody would use such values for xmlns attributes)
2. Fix interaction between
Validator.ValidateVisitor.checkXmlAttributes(CustomTag ..) and
getJspAttribute().
- EL expression was parsed twice in both methods. Now I am passing the already
parsed EL.
- getJspAttribute() has EL validation code, so reduce duplication
- When calling getJspAttribute() you have to pass original attrs.getValue(i),
not the textual value.
3. Fix Validator.ValidateVisitor.XmlEscapeNonELVisitor
- It was not EL-escaping its text.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1590842
Merged /tomcat/tc7.0.x/trunk:r1590848
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593845&r1=1593844&r2=1593845&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 11 19:53:59 2014
@@ -28,14 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Additional fixes for BZ 56334
- http://svn.apache.org/r1590848
- +1: kkolinko, markt, fhanik
- -1:
- kkolinko: I expect to prepare a more formal patch for this later. The
- merge is unlikely to complete cleanly without Mark's
- 2014-04-28-bug56334-tc6-v1.patch being applied first.
-
* Clean-up and add additional packages
https://svn.apache.org/r1593262
https://svn.apache.org/r1593285
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1593845&r1=1593844&r2=1593845&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java Sun May
11 19:53:59 2014
@@ -252,7 +252,7 @@ public class ELParser {
*
* @return The escaped version of the input
*/
-private static String escapeLiteralExpression(String input,
+static String escapeLiteralExpression(String input,
boolean isDeferredSyntaxAllowedAsLiteral) {
int len = input.length();
int lastAppend = 0;
@@ -548,10 +548,10 @@ public class ELParser {
}
-protected static class TextBuilder extends ELNode.Visitor {
+static class TextBuilder extends ELNode.Visitor {
-private final boolean isDeferredSyntaxAllowedAsLiteral;
-protected StringBuilder output = new StringBuilder();
+protected final boolean isDeferredSyntaxAllowedAsLiteral;
+protected final StringBuilder output = new StringBuilder();
protected TextBuilder(boolean isDeferredSyntaxAllowedAsLiteral) {
this.isDeferredSyntaxAllowedAsLiteral =
isDeferredSyntaxAllowedAsLiteral;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1593845&r1=1593844&r2=1593845&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Sun May
11 19:53:59 2014
@@ -1820,7 +1820,7 @@ class Generator {
out.print(attrs.getQName(i));
out.print("=");
out.print(DOUBLE_QUOTE);
-out.print(attrs.getValue(i).replace("\"", """));
+out.print(escape(attrs.getValue(i).replace("\"", """)));
out.print(DOUBLE_QUOTE);
}
@@ -1838,7 +1838,7 @@ class Generator {
out.print(" + \"\\\"");
} else {
out.print(DOUBLE_QUOTE);
-out.print(jspAttrs[i].getValue().replace("\"", """));
+out.print(escape(jspAttrs[i].getValue().replace("\"",
""")));
out.print(DOUBLE_QUOTE);
[Bug 56334] Double Backslash Escaping in Attributes
https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 Konstantin Kolinko changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #14 from Konstantin Kolinko --- Fixed in Tomcat 6. The fix will be in 6.0.40 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 8 [2014/05/11]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |51497|New|Enh|2011-07-11|Use canonical IPv6 text representation in logs| |53737|Opn|Enh|2012-08-18|Use ServletContext.getJspConfigDescriptor() in Jas| |53930|New|Enh|2012-09-24|allow capture of catalina stdout/stderr to a comma| |54503|New|Enh|2013-01-29|SAML2 based single sign on| |54700|New|Enh|2013-03-15|Improvement: Add support for system property to sp| |54741|New|Enh|2013-03-22|Add org.apache.catalina.startup.Tomcat#addWebapp(S| |55006|New|Enh|2013-05-22|Add http proxy support for ClientEndpoint using sy| |55243|New|Enh|2013-07-11|Add special search string for nested roles| |55252|New|Enh|2013-07-12|Separate Ant and command-line wrappers for JspC | |55383|New|Enh|2013-08-07|Improve markup and design of Tomcat's HTML pages | |55479|New|Enh|2013-08-24|JSR 196 (JASPIC) support in Tomcat| |9|New|Enh|2013-09-14|UserDatabaseRealm enhacement: may use local JNDI | |55675|New|Enh|2013-10-18|Checking and handling invalid configuration option| |55770|New|Enh|2013-11-12|Allow the crlFile to be reloaded | |55788|New|Enh|2013-11-16|TagPlugins should key on tag QName rather than imp| |55884|Ver|Maj|2013-12-14|JSPs no longer compile in Java 8 | |55917|New|Nor|2013-12-20|Cookie parsing fails hard with ISO-8859-1 values | |55918|New|Nor|2013-12-21|CTL characters may appear in quoted values for RFC| |55920|New|Enh|2013-12-22|Quotes should not be removed from quoted cookie va| |55921|New|Nor|2013-12-22|Cookie values in JSON format are not skipped corre| |55951|New|Enh|2014-01-04|HTML5 specifies UTF-8 encoding for cookie values | |55969|New|Enh|2014-01-07|Security-related enhancements to the Windows Insta| |55975|New|Nor|2014-01-08|Inconsistent escaping applied to V0 cookie values | |55984|New|Nor|2014-01-10|Invalid V1 cookie generated if value contains sepa| |55988|New|Enh|2014-01-11|Add parameter useCipherSuitesOrder to JSSE (BIO an| |56079|New|Enh|2014-01-28|Digitally sign the Windows binaries | |56166|New|Enh|2014-02-20|Suggestions for exception handling (avoid potentia| |56323|New|Enh|2014-03-27|Include service .bat scripts with Microsoft Window| |56361|New|Enh|2014-04-08|org.apache.tomcat.websocket.WsWebSocketContainer#b| |56387|Opn|Enh|2014-04-11|Improve exceptions thrown by stopped WebappClassLo| |56393|New|Enh|2014-04-11|Implement RFC6265 for Cookie parsing | |56394|New|Enh|2014-04-11|Allow cookie-parsing to be pluggable | |56397|New|Enh|2014-04-11|Establish parallel Maven-based build process | |56398|New|Enh|2014-04-11|Support Arquillian-based unit testing | |56399|New|Enh|2014-04-11|Re-factor request/response recycling so Coyote and| |56400|Opn|Enh|2014-04-11|Change POOL2/DBCP2 consumption strategy | |56401|New|Enh|2014-04-11|Log version information on startup| |56402|New|Enh|2014-04-11|Add support for HTTP Upgrade to AJP components| |56403|New|Enh|2014-04-11|Support pluggable password-derivation in Realms | |56446|New|Enh|2014-04-23|Handling InvocationTargetException for PojoMessage| |56448|New|Enh|2014-04-23|Implement a robust solution for client initiated S| |56456|New|Enh|2014-04-25|Suggesting lock-free endpoint state machine | +-+---+---+--+--+ | Total 42 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593836 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/el/parser/AstLiteralExpression.java test/org/apache/el/TestELEvaluation.java test/org/apache/jasper/compiler/TestELParser
Author: kkolinko
Date: Sun May 11 18:25:29 2014
New Revision: 1593836
URL: http://svn.apache.org/r1593836
Log:
Correct the handling of back-slash escaping in the EL parser and no longer
require that "\$" or "\#" must be followed by "{" in order for the back-slash
escaping to take effect.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java
tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java
tomcat/tc6.0.x/trunk/test/org/apache/jasper/compiler/TestELParser.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
--
Merged /tomcat/trunk:r1590835,1590911,1593834
Merged /tomcat/tc7.0.x/trunk:r1590838,1590912,1593835
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1593836&r1=1593835&r2=1593836&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 11 18:25:29 2014
@@ -28,14 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Correct the handling of back-slash escaping in the EL parser and no longer
- require that "\$" or "\#" must be followed by "{" in order for the back-slash
- escaping to take effect.
- http://svn.apache.org/r1590838
- http://svn.apache.org/r1590912
- +1: markt, kkolinko, fhanik
- -1:
-
* Additional fixes for BZ 56334
http://svn.apache.org/r1590848
+1: kkolinko, markt, fhanik
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java?rev=1593836&r1=1593835&r2=1593836&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/AstLiteralExpression.java
Sun May 11 18:25:29 2014
@@ -49,10 +49,9 @@ public final class AstLiteralExpression
StringBuffer buf = new StringBuffer(size);
for (int i = 0; i < size; i++) {
char c = image.charAt(i);
-if (c == '\\' && i + 2 < size) {
+if (c == '\\' && i + 1 < size) {
char c1 = image.charAt(i + 1);
-char c2 = image.charAt(i + 2);
-if ((c1 == '#' || c1 == '$') && c2 == '{') {
+if (c1 == '#' || c1 == '$') {
c = c1;
i++;
}
Modified: tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java?rev=1593836&r1=1593835&r2=1593836&view=diff
==
--- tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java Sun May 11
18:25:29 2014
@@ -73,8 +73,8 @@ public class TestELEvaluation extends Te
assertEquals("many", evaluateExpression(
"${0 lt 2 ? 1 lt 2 ? 'many': 'one': 'none'}"));
}
-
-
+
+
public void testParserBug45511() {
// Test cases provided by OP
assertEquals("true", evaluateExpression("${empty ('')}"));
@@ -102,14 +102,21 @@ public class TestELEvaluation extends Te
assertEquals("\\", evaluateExpression("\\"));
assertEquals("$", evaluateExpression("$"));
assertEquals("#", evaluateExpression("#"));
-assertEquals("\\$", evaluateExpression("\\$"));
-assertEquals("\\#", evaluateExpression("\\#"));
-assertEquals("$", evaluateExpression("$"));
-assertEquals("#", evaluateExpression("#"));
+assertEquals("$", evaluateExpression("\\$"));
+assertEquals("#", evaluateExpression("\\#"));
+assertEquals("\\$", evaluateExpression("$"));
+assertEquals("\\#", evaluateExpression("#"));
assertEquals("${", evaluateExpression("\\${"));
assertEquals("#{", evaluateExpression("\\#{"));
assertEquals("\\${", evaluateExpression("${"));
assertEquals("\\#{", evaluateExpression("#{"));
+
+// '\' is only an escape for '$' and '#'.
+assertEquals("$", evaluateExpression("\\$"));
+assertEquals("${", evaluateExpression("\\${"));
+assertEquals("$a", evaluateExpression("\\$a"));
+assertEquals("\\a", evaluateExpression("\\a"));
+assertEquals("", evaluateExpression(""));
}
public void testParserStringLiteral() {
@@ -171,6 +178,20 @@ public class TestELEvaluation extends Te
assertTrue(nu
svn commit: r1593869 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml
Author: kkolinko Date: Sun May 11 23:03:43 2014 New Revision: 1593869 URL: http://svn.apache.org/r1593869 Log: Update Gump links, as I split Tomcat 7 test project there into bio and nio ones. Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/xdocs/ci.xml Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1593869&r1=1593868&r2=1593869&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Sun May 11 23:03:43 2014 @@ -525,7 +525,11 @@ prepared and published by ASF Buildbot, -http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/";>tomcat-tc7.0.x-test +http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/";>tomcat-tc7.0.x-test-bio + + + +http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/";>tomcat-tc7.0.x-test-nio @@ -541,7 +545,7 @@ prepared and published by ASF Buildbot, -http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_file/TEST-org.apache.catalina.util.TestServerInfo.BIO.txt.html"; rel="nofollow">TestServerInfo result +http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_file/TEST-org.apache.catalina.util.TestServerInfo.BIO.txt.html"; rel="nofollow">TestServerInfo result Modified: tomcat/site/trunk/xdocs/ci.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1593869&r1=1593868&r2=1593869&view=diff == --- tomcat/site/trunk/xdocs/ci.xml (original) +++ tomcat/site/trunk/xdocs/ci.xml Sun May 11 23:03:43 2014 @@ -147,12 +147,13 @@ prepared and published by ASF Buildbot, http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x/";>tomcat-tc7.0.x http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-dbcp/";>tomcat-tc7.0.x-dbcp - http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/";>tomcat-tc7.0.x-test + http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/";>tomcat-tc7.0.x-test-bio + http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/";>tomcat-tc7.0.x-test-nio http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate/";>tomcat-tc7.0.x-validate http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-validate-eoln/";>tomcat-tc7.0.x-validate-eoln - http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_file/TEST-org.apache.catalina.util.TestServerInfo.BIO.txt.html"; rel="nofollow">TestServerInfo result + http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_file/TEST-org.apache.catalina.util.TestServerInfo.BIO.txt.html"; rel="nofollow">TestServerInfo result - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593072 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: markt
Date: Wed May 7 17:25:36 2014
New Revision: 1593072
URL: http://svn.apache.org/r1593072
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56481
Work around case insensitivity issue in URLClassLoader
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1593072&r1=1593071&r2=1593072&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Wed May
7 17:25:36 2014
@@ -42,12 +42,14 @@ import java.security.Policy;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.ConcurrentModificationException;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
@@ -420,6 +422,13 @@ public class WebappClassLoader extends U
*/
private boolean hasExternalRepositories = false;
+
+/**
+ * Repositories managed by this class rather than the super class.
+ */
+private Set localRepositories = new HashSet<>();
+
+
private volatile LifecycleState state = LifecycleState.NEW;
@@ -1370,7 +1379,10 @@ public class WebappClassLoader extends U
*/
@Override
public URL[] getURLs() {
-return super.getURLs();
+ArrayList result = new ArrayList<>();
+result.addAll(localRepositories);
+result.addAll(Arrays.asList(super.getURLs()));
+return result.toArray(new URL[result.size()]);
}
@@ -1447,12 +1459,12 @@ public class WebappClassLoader extends U
WebResource classes = resources.getResource("/WEB-INF/classes");
if (classes.isDirectory() && classes.canRead()) {
-addURL(classes.getURL());
+localRepositories.add(classes.getURL());
}
WebResource[] jars = resources.listResources("/WEB-INF/lib");
for (WebResource jar : jars) {
if (jar.getName().endsWith(".jar") && jar.isFile() &&
jar.canRead()) {
-addURL(jar.getURL());
+localRepositories.add(jar.getURL());
jarModificationTimes.put(
jar.getName(), Long.valueOf(jar.getLastModified()));
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1593072&r1=1593071&r2=1593072&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May 7 17:25:36 2014
@@ -146,6 +146,10 @@
problem is encountered calling a getter or setter on a component
attribute. The logging level is raised from debug to warning. (markt)
+
+56481: Work around case insensitivity issue in
+URLClassLoader exposed by some recent refactoring. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1593878 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ webapps/docs/ webapps/docs/config/
Author: kkolinko
Date: Mon May 12 01:38:31 2014
New Revision: 1593878
URL: http://svn.apache.org/r1593878
Log:
Merged r1593877 from tomcat/trunk:
- ThreadLocalLeakPreventionListener: Trigger thread renewals for
StandardContext only. (Do not trigger them for FailedContext and similar).
- StandardThreadExecutor: Pass 'threadRenewalDelay' to the thread pool
executor. Otherwise this setting configured at initialization time is
effectively ignored.
- Improve documentation.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/executor.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1593877
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java?rev=1593878&r1=1593877&r2=1593878&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
Mon May 12 01:38:31 2014
@@ -119,6 +119,7 @@ public class StandardThreadExecutor exte
taskqueue = new TaskQueue(maxQueueSize);
TaskThreadFactory tf = new
TaskThreadFactory(namePrefix,daemon,getThreadPriority());
executor = new ThreadPoolExecutor(getMinSpareThreads(),
getMaxThreads(), maxIdleTime, TimeUnit.MILLISECONDS,taskqueue, tf);
+executor.setThreadRenewalDelay(threadRenewalDelay);
if (prestartminSpareThreads) {
executor.prestartAllCoreThreads();
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java?rev=1593878&r1=1593877&r2=1593878&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
Mon May 12 01:38:31 2014
@@ -194,10 +194,10 @@ public class ThreadLocalLeakPreventionLi
private void stopIdleThreads(Context context) {
if (serverStopping) return;
-if (context instanceof StandardContext &&
+if (!(context instanceof StandardContext) ||
!((StandardContext) context).getRenewThreadsWhenStoppingContext())
{
-log.debug("Not renewing threads when the context is stopping, "
-+ "it is configured not to do it.");
+log.debug("Not renewing threads when the context is stopping. "
++ "It is not configured to do it.");
return;
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1593878&r1=1593877&r2=1593878&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon May 12 01:38:31 2014
@@ -168,6 +168,11 @@
56492: Avoid eclipse debugger pausing on uncaught exceptions
when tomcat renews its threads. (slaurent)
+
+Minor fixes to ThreadLocalLeakPreventionListener. Do not
+trigger threads renewal for failed contexts. Do not ignore
+threadRenewalDelay setting. Improve documentation.
(kkolinko)
+
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/executor.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/executor.xml?rev=1593878&r1=1593877&r2=1593878&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/executor.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/executor.xml Mon May 12 01:38:31
2014
@@ -112,9 +112,11 @@
the default is false
- After a context is stopped, threads in the pool are renewed. To avoid
renewing all threads at the same time,
-this delay is observed between 2 threads being renewed. Value is in
ms, default value is 1000ms.
-If negative, threads are not renewed.
+ (long) If a ThreadLocalLeakPreventionListener is configured,
+it will notify this executor about stopped contexts.
+After a context is stoppe
svn commit: r1593877 - in /tomcat/trunk: java/org/apache/catalina/core/ webapps/docs/ webapps/docs/config/
Author: kkolinko
Date: Mon May 12 01:28:30 2014
New Revision: 1593877
URL: http://svn.apache.org/r1593877
Log:
- ThreadLocalLeakPreventionListener: Trigger thread renewals for
StandardContext only. (Do not trigger them for FailedContext and similar).
- StandardThreadExecutor: Pass 'threadRenewalDelay' to the thread pool
executor. Otherwise this setting configured at initialization time is
effectively ignored.
- Improve documentation.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/executor.xml
tomcat/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java?rev=1593877&r1=1593876&r2=1593877&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java Mon
May 12 01:28:30 2014
@@ -119,6 +119,7 @@ public class StandardThreadExecutor exte
taskqueue = new TaskQueue(maxQueueSize);
TaskThreadFactory tf = new
TaskThreadFactory(namePrefix,daemon,getThreadPriority());
executor = new ThreadPoolExecutor(getMinSpareThreads(),
getMaxThreads(), maxIdleTime, TimeUnit.MILLISECONDS,taskqueue, tf);
+executor.setThreadRenewalDelay(threadRenewalDelay);
if (prestartminSpareThreads) {
executor.prestartAllCoreThreads();
}
Modified:
tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java?rev=1593877&r1=1593876&r2=1593877&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
Mon May 12 01:28:30 2014
@@ -194,10 +194,10 @@ public class ThreadLocalLeakPreventionLi
private void stopIdleThreads(Context context) {
if (serverStopping) return;
-if (context instanceof StandardContext &&
+if (!(context instanceof StandardContext) ||
!((StandardContext) context).getRenewThreadsWhenStoppingContext())
{
-log.debug("Not renewing threads when the context is stopping, "
-+ "it is configured not to do it.");
+log.debug("Not renewing threads when the context is stopping. "
++ "It is not configured to do it.");
return;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1593877&r1=1593876&r2=1593877&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon May 12 01:28:30 2014
@@ -177,6 +177,11 @@
56501: HttpServletRequest.getContextPath()
should return the undecoded context path used by the user agent.
(markt)
+
+Minor fixes to ThreadLocalLeakPreventionListener. Do not
+trigger threads renewal for failed contexts. Do not ignore
+threadRenewalDelay setting. Improve documentation.
(kkolinko)
+
Modified: tomcat/trunk/webapps/docs/config/executor.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/executor.xml?rev=1593877&r1=1593876&r2=1593877&view=diff
==
--- tomcat/trunk/webapps/docs/config/executor.xml (original)
+++ tomcat/trunk/webapps/docs/config/executor.xml Mon May 12 01:28:30 2014
@@ -112,9 +112,11 @@
the default is false
- After a context is stopped, threads in the pool are renewed. To avoid
renewing all threads at the same time,
-this delay is observed between 2 threads being renewed. Value is in
ms, default value is 1000ms.
-If negative, threads are not renewed.
+ (long) If a ThreadLocalLeakPreventionListener is configured,
+it will notify this executor about stopped contexts.
+After a context is stopped, threads in the pool are renewed. To avoid
renewing all threads at the same time,
+this option sets a delay between renewal of any 2 threads. The value
is in ms,
+default value is 1000 ms. If value is negative, threads
are not renewed.
Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/do
svn commit: r1593880 - in /tomcat/trunk/test: org/apache/catalina/webresources/AbstractTestResourceSet.java webresources/dir2/d1/.ignore-me.txt webresources/dir2/d2/.ignore-me.txt webresources/dir3/.i
Author: kkolinko
Date: Mon May 12 02:29:18 2014
New Revision: 1593880
URL: http://svn.apache.org/r1593880
Log:
Fix tests failing at Buildbot and make them more friendly to Git.
Buildbot uses Subversion 1.6 (or earlier). Thus there are .svn directories
everywhere in the source tree, which caused failure of webresources tests.
Added:
tomcat/trunk/test/webresources/dir2/d1/.ignore-me.txt (with props)
tomcat/trunk/test/webresources/dir2/d2/.ignore-me.txt (with props)
tomcat/trunk/test/webresources/dir3/.ignore-me.txt (with props)
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java?rev=1593880&r1=1593879&r2=1593880&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
Mon May 12 02:29:18 2014
@@ -175,8 +175,15 @@ public abstract class AbstractTestResour
expected.add("f1.txt");
expected.add("f2.txt");
+// Directories created by Subversion 1.6 and earlier clients
+Set optional = new HashSet<>();
+optional.add(".svn");
+// Files visible in some tests only
+optional.add(getMount() + ".ignore-me.txt");
+
for (String result : results) {
-Assert.assertTrue(result, expected.remove(result));
+Assert.assertTrue(result,
+expected.remove(result) || optional.remove(result));
}
Assert.assertEquals(0, expected.size());
}
@@ -188,8 +195,15 @@ public abstract class AbstractTestResour
Set expected = new HashSet<>();
expected.add("d1-f1.txt");
+// Directories created by Subversion 1.6 and earlier clients
+Set optional = new HashSet<>();
+optional.add(".svn");
+// Files visible in some tests only
+optional.add(".ignore-me.txt");
+
for (String result : results) {
-Assert.assertTrue(result, expected.remove(result));
+Assert.assertTrue(result,
+expected.remove(result) || optional.remove(result));
}
Assert.assertEquals(0, expected.size());
}
@@ -201,8 +215,15 @@ public abstract class AbstractTestResour
Set expected = new HashSet<>();
expected.add("d1-f1.txt");
+// Directories created by Subversion 1.6 and earlier clients
+Set optional = new HashSet<>();
+optional.add(".svn");
+// Files visible in some tests only
+optional.add(".ignore-me.txt");
+
for (String result : results) {
-Assert.assertTrue(result, expected.remove(result));
+Assert.assertTrue(result,
+expected.remove(result) || optional.remove(result));
}
Assert.assertEquals(0, expected.size());
}
@@ -247,8 +268,15 @@ public abstract class AbstractTestResour
expected.add(getMount() + "/f1.txt");
expected.add(getMount() + "/f2.txt");
+// Directories created by Subversion 1.6 and earlier clients
+Set optional = new HashSet<>();
+optional.add(getMount() + "/.svn/");
+// Files visible in some tests only
+optional.add(getMount() + "/.ignore-me.txt");
+
for (String result : results) {
-Assert.assertTrue(result, expected.remove(result));
+Assert.assertTrue(result,
+expected.remove(result) || optional.remove(result));
}
Assert.assertEquals(0, expected.size());
}
@@ -260,8 +288,15 @@ public abstract class AbstractTestResour
Set expected = new HashSet<>();
expected.add(getMount() + "/d1/d1-f1.txt");
+// Directories created by Subversion 1.6 and earlier clients
+Set optional = new HashSet<>();
+optional.add(getMount() + "/d1/.svn/");
+// Files visible in some tests only
+optional.add(getMount() + "/d1/.ignore-me.txt");
+
for (String result : results) {
-Assert.assertTrue(result, expected.remove(result));
+Assert.assertTrue(result,
+expected.remove(result) || optional.remove(result));
}
Assert.assertEquals(0, expected.size());
}
@@ -273,8 +308,15 @@ public abstract class AbstractTestResour
Set expected = new HashSet<>();
expected.add(getMount() + "/d1/d1-f1.txt");
+// Directories created by Subversion 1.6 and earlier clients
+Set optional = new HashSet<>();
+optional.add(getMount() + "/d1/.svn/");
+// Files visible in some tests only
+optional.add(getMount() + "/d1/.ignore-me.txt");
+
[Bug 56488] jaas custom login module
https://issues.apache.org/bugzilla/show_bug.cgi?id=56488 --- Comment #6 from dstojkov --- context.xml -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
