Bug report for Taglibs [2010/06/06]
+---+ | 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 | | | | | | | |27717|New|Maj|2004-03-16| very slow in JSTL 1.1 | |33934|New|Cri|2005-03-09|[standard] memory leak in jstl c:set tag | |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|Nor|2007-05-14|[PATCH] Log Taglib enhancements | |43640|New|Nor|2007-10-16|Move the tests package to JUnit | |45197|Ass|Nor|2008-06-12|Need to support the JSTL 1.2 specification| |46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l| |48333|New|Nor|2009-12-02|TLD generator | |48773|New|Nor|2010-02-19|DataSourceWrapper and DriverManager problems | |49292|New|Nor|2010-05-14|Memory leak in org.apache.taglibs.standard.lang.js| +-+---+---+--+--+ | Total 11 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 5 [2010/06/06]
+---+ | 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 | | | | | | | |27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat| |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi| |33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis| |33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps| |33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na| |34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a| |34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern| |34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that| |35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc| |36133|Inf|Enh|2005-08-10|Support JSS SSL implementation| |36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi| |36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's | |36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re| |36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing | |37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token| |37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis| |37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user | |37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre| |38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations | |38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti| |38360|Inf|Enh|2006-01-24|Domain for session cookies| |38546|Inf|Enh|2006-02-07|Google bot sends invalid If-Modifed-Since Header, | |38577|Inf|Enh|2006-02-08|Enhance logging of security failures | |38916|Inf|Enh|2006-03-10|HttpServletRequest cannot handle multipart request| |39053|Inf|Enh|2006-03-21|include Tomcat embedded sample| |39740|New|Enh|2006-06-07|semi-colon ; isn't allowed as a query argument sep| |39862|Inf|Enh|2006-06-22|provide support for protocol-independent GenericSe| |40211|Inf|Enh|2006-08-08|Compiled JSP don't indent HTML code | |40222|Inf|Enh|2006-08-09|Default Tomcat configuration alows easy session hi| |40402|New|Enh|2006-09-03|Manager should display Exceptions | |40510|New|Enh|2006-09-14|installer does not create shortcuts for all users | |40712|New|Enh|2006-10-10|Realm admin error.| |40728|Inf|Enh|2006-10-11|Catalina MBeans use non-serializable classes | |40766|New|Enh|2006-10-16|Using an unsecure jsessionid with mod_proxy_ajp ov| |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| |41179|New|Enh|2006-12-15|400 Bad Request response during auto re-deployment| |41227|Opn|Enh|2006-12-21|When the jasper compiler fails to compile a JSP, i| |41337|Opn|Enh|2007-01-10|Display an error page if no cert is available on C| |41496|New|Enh|2007-01-30|set a security provider for jsse in a connector co| |41498|New|Enh|2007-01-30|allRolesMode Realm configuration option not docume| |41539|Inf|Enh|2007-02-05|NullPointerException during Embedded tomcat restar| |41673|New|Enh|2007-02-21|Jasper output the message of compiling error using| |41697|Ver|Enh|2007-02-25|make visible in debug output if charset from brows| |41709|Inf|Enh|2007-02-26|When calling the API that relates to the buffer af| |41718|New|Enh|2007-02-27|Status 302 response to GET request has no body whe| |42416|New|Enh|2007-05-14|Tomcat startup hangs and AJP13 connector port 8009| |43423|New|Enh|2007-09-18|catalina.sh -force too fast | |43538|New|Enh|2007-10-02|[patch] Show the hostname and IP address in the ma| |43796|Inf|Enh|2007-11-05|Add MIME type mapping for the "log" extension | |43866|
Bug report for Tomcat 6 [2010/06/06]
+---+ | 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 | | | | | | | |39661|Opn|Enh|2006-05-25|Please document JULI FileHandler configuration pro| |41128|Inf|Enh|2006-12-07|Reference to java Thread name from RequestProcesso| |41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat| |41791|New|Enh|2007-03-07|Tomcat behaves inconsistently concerning flush-pac| |41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific| |41944|New|Enh|2007-03-25|Start running the RAT tool to see where we're miss| |41992|New|Enh|2007-03-30|Need ability to set OS process title | |42463|New|Enh|2007-05-20|"crossContext" and classloader issues - pls amend | |43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant| |43003|New|Enh|2007-07-30|Separate dependent component download and build ta| |43400|New|Enh|2007-09-14|enum support for tag libs | |43497|New|Enh|2007-09-26|Add ability to escape rendered output of JSP expre| |43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml | |43642|New|Enh|2007-10-17|Add prestartminSpareThreads attribute for Executor| |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| |43790|Ass|Enh|2007-11-03|concurrent access issue on TagHandlerPool | |43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output | |44047|New|Enh|2007-12-10|Provide a way for Tomcat to serve up error pages w| |44106|New|Enh|2007-12-19|autodeploy configures directories which do not con| |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| |44264|New|Enh|2008-01-18|Clustering - Support for disabling multicasting an| |44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag | |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44299|New|Enh|2008-01-26|Provider manager app with a log out button| |44312|New|Enh|2008-01-28|Warn when overwritting docBase of the default Host| |44598|New|Enh|2008-03-13|JAASRealm is suppressing Exceptions | |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| |44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin| |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| |45283|Opn|Enh|2008-06-25|Allow multiple authenticators to be added to pipel| |45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete | |45654|New|Enh|2008-08-19|use static methods and attributes in a direct way!| |45731|New|Enh|2008-09-02|Enhancement request : pluggable httpsession cache | |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45871|New|Enh|2008-09-23|Support for salted and digested patches in DataSou| |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| |45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive | |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|New|Enh|2008-11-21|Tomcat reloading of context does not update contex| |46264|New|Enh|2008-11-21|Shutting down tomcat with large number of contexts| |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| |46451|New|Enh|2008-12-30|Configure svn:bugtraq properties | |46461|New|Enh|2009-01-01|fail graceful on dns changes for connectors/hosts | |46497|New|Enh|2009-01-08|Install Tomcat Deployer/ANT on Windows Platform | |46558|
Bug report for Tomcat 7 [2010/06/06]
+---+
| 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 |
|48297|New|Nor|2009-11-28|webservices.ServiceRefFactory.initHandlerChain add|
|48550|New|Enh|2010-01-14|Update examples and default server.xml to use UTF-|
|48648|New|Nor|2010-01-31|Blank page (dropped connection) when running TC7 w|
|48692|New|Enh|2010-02-07|Provide option to parse application/x-www-form-url|
|48817|New|Nor|2010-02-25|Skip validation query and use JDBC API for validat|
|48837|New|Enh|2010-03-01|Memory leaks protection does not cure leaks trigge|
|48861|New|Nor|2010-03-04|Files without AL headers |
|48870|New|Enh|2010-03-08|avoid parallel arrays of base types |
|48891|New|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk |
|48892|New|Enh|2010-03-11|Use URIEncoding from server.xml for decoding post |
|48998|New|Enh|2010-03-26|Proposal : port mod_expires in java as ExpiresFilt|
|49000|New|Enh|2010-03-26|Cookie parsing bug when an empty value has an equa|
|49100|New|Enh|2010-04-12|Mutable public constants: MemberImpl.TRIBES_MBR_BE|
|49101|New|Enh|2010-04-12|All constants in tribes.transport.Constants are mu|
|49102|New|Enh|2010-04-12|coyote.ajp.Constants - 3 "constant" arrays are mut|
|49122|New|Enh|2010-04-14|Update of ROOT application index.html |
|49125|New|Enh|2010-04-14|toString on byte[] array probably is not correct |
|49126|New|Enh|2010-04-14|jasper.compiler.Generator.createJspId() can genera|
|49127|New|Enh|2010-04-14|SimpleTcpReplicationManager.startInternal() ignore|
|49128|New|Enh|2010-04-14|loader.WebappClassLoader.start() ignores Exception|
|49130|New|Enh|2010-04-14|NSIS - clarify that service is always installed |
|49142|New|Enh|2010-04-16|Missing serialVersionUIDs |
|49159|New|Enh|2010-04-20|Improve ThreadLocal memory leak clean-up |
|49165|New|Enh|2010-04-21|Enhancement - Allow %{TIME_FORMAT}t As Configurati|
|49180|New|Enh|2010-04-24|Add option to disable log rotation in FileHandler.|
|49182|New|Enh|2010-04-24|Documentation patch for setclasspath.sh |
|49234|New|Nor|2010-04-30|JMX Descriptor Modifications |
|49268|New|Enh|2010-05-10|Use checkstyle to enforce common code style |
|49284|New|Enh|2010-05-12|Implement SSL renegotiation for the NIO connector |
|49290|New|Enh|2010-05-14|Using a JarScanner with scanAllDirectories=true ca|
|49295|New|Enh|2010-05-14|JMXAccessorTask.getProperties() - return Propertie|
|49297|New|Min|2010-05-15|Whitespace absence is allowed before attribute nam|
|49317|New|Enh|2010-05-20|org.apache.catalina.util.Base64 interface needs re|
|49318|New|Enh|2010-05-20|add a Negotiate (Kerberos/NTLM) authenticator / in|
|49372|New|Min|2010-06-02|7.0.0RC: Starting second instance of Tomcat on the|
|49376|New|Trv|2010-06-03|Minor corrections to info properties. |
+-+---+---+--+--+
| Total 38 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 [2010/06/06]
+---+ | 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| |36155|Opn|Nor|2005-08-12|tomcat chooses wrong host if using mod_jk | |39967|Inf|Nor|2006-07-05|mod_jk gives segmentation fault when apache is sta| |40208|Inf|Nor|2006-08-08|Request-Dump when ErrorDocument in httpd.conf is a| |41170|Inf|Nor|2006-12-13|single crlf in header termination crashes app.| |41923|Opn|Nor|2007-03-21|Tomcat doesnt recognized client abort | |42366|Inf|Nor|2007-05-09|Memory leak in newer mod_jk version when connectio| |42554|Opn|Nor|2007-05-31|mod_ssl + mod_jk with status_worker does not work | |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |43968|New|Enh|2007-11-26|[patch] support ipv6 with mod_jk | |44290|New|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan| |44349|New|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| |45395|New|Min|2008-07-14|MsgAjp dump method does not dump packet when being| |46337|New|Nor|2008-12-04|real worker name is wrong | |46406|New|Enh|2008-12-16|Supporting relative paths in isapi_redirect.proper| |46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread | |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47038|New|Enh|2009-04-15|USE_FLOCK_LK redefined compiler warning when using| |47327|New|Enh|2009-06-07|remote_user not logged in apache logfile | |47617|New|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err| |47678|New|Nor|2009-08-11|Unable to allocate shared memory when using isapi_| |47679|New|Nor|2009-08-11|Not all headers get passed to Tomcat server from i| |47692|New|Reg|2009-08-12|Can not compile mod_jk with apache2.0.63 and tomca| |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| |48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48501|New|Enh|2010-01-07|Log rotation for ISAPI Redirector | |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| |48925|New|Maj|2010-03-16|((ServletRequest) request).getLocalAddr() returns | |48940|New|Maj|2010-03-18|IIS to Tomcat occasionally fails on POST with T-E | |49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form| |49048|New|Nor|2010-04-05|ACL not applied to redirect URLs | |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 | +-+---+---+--+--+ | Total 45 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Native [2010/06/06]
+---+ | 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 | | | | | | | |38372|Inf|Cri|2006-01-25|tcnative-1.dll response overflow corruption, parti| |41361|New|Nor|2007-01-14|Content lost when read by a slow client. | |42090|New|Cri|2007-04-11|tcnative badly handles some OpenSSL disconnections| |45392|New|Nor|2008-07-14|No OCSP support for client SSL verification | |46041|New|Cri|2008-10-20|Tomcat service is terminated unexpectedly (tcnativ| |46179|New|Maj|2008-11-10|apr ssl client authentication | |46571|New|Nor|2009-01-21|tcnative blocks in APR poll on Solaris| |47319|New|Nor|2009-06-05|With APR, getRemoteHost() returns NULL for unknown| |47851|New|Nor|2009-09-16|thread-safety issues in the TC native Java code | |48253|New|Min|2009-11-20|Tomcat Native patch - adding dynamic locking callb| |48655|New|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown| |49038|Inf|Nor|2010-04-02|Crash in tcnative | +-+---+---+--+--+ | Total 12 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951874 - /tomcat/tc6.0.x/trunk/conf/catalina.policy
Author: kkolinko Date: Sun Jun 6 15:25:51 2010 New Revision: 951874 URL: http://svn.apache.org/viewvc?rev=951874&view=rev Log: Update a comment Modified: tomcat/tc6.0.x/trunk/conf/catalina.policy Modified: tomcat/tc6.0.x/trunk/conf/catalina.policy URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/catalina.policy?rev=951874&r1=951873&r2=951874&view=diff == --- tomcat/tc6.0.x/trunk/conf/catalina.policy (original) +++ tomcat/tc6.0.x/trunk/conf/catalina.policy Sun Jun 6 15:25:51 2010 @@ -14,14 +14,15 @@ // limitations under the License. // -// catalina.corepolicy - Security Policy Permissions for Tomcat @VERSION_MAJOR@ +// catalina.policy - Security Policy Permissions for Tomcat @VERSION_MAJOR@ // // This file contains a default set of security policies to be enforced (by the // JVM) when Catalina is executed with the "-security" option. In addition // to the permissions granted here, the following additional permissions are // granted to the codebase specific to each web application: // -// * Read access to the document root directory +// * Read access to its document root directory +// * Read, write and delete access to its working directory // // $Id$ // - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Release plans for 6.0.27 - ?
On 06/04/2010 09:57 PM, Konstantin Kolinko wrote: > Hi! > > When can we make 6.0.27? > > There were a couple of important fixes since 6.0.26, like BZ 48903 > (classloader deadlock). > > I think it is about time to make 6.0.27. +1 I will start to prepare the stuff. Tag on Monday, packaging , votes and release before the next week-end, is that ok? Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951880 - in /tomcat/trunk: conf/catalina.policy webapps/docs/security-manager-howto.xml
Author: kkolinko
Date: Sun Jun 6 16:02:30 2010
New Revision: 951880
URL: http://svn.apache.org/viewvc?rev=951880&view=rev
Log:
Rearrange tomcat-juli permissions, for better readability.
Modified:
tomcat/trunk/conf/catalina.policy
tomcat/trunk/webapps/docs/security-manager-howto.xml
Modified: tomcat/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=951880&r1=951879&r2=951880&view=diff
==
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Sun Jun 6 16:02:30 2010
@@ -64,30 +64,35 @@ grant codeBase "file:${catalina.home}/bi
// These permissions apply to the logging API
// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home},
// update this section accordingly.
+// grant codeBase "file:${catalina.base}/bin/tomcat-juli.jar" {..}
grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
-permission java.util.PropertyPermission
"java.util.logging.config.class", "read";
-permission java.util.PropertyPermission
"java.util.logging.config.file", "read";
-permission java.util.PropertyPermission "catalina.base", "read";
permission java.io.FilePermission
"${java.home}${file.separator}lib${file.separator}logging.properties", "read";
+
permission java.io.FilePermission
"${catalina.base}${file.separator}conf${file.separator}logging.properties",
"read";
permission java.io.FilePermission
"${catalina.base}${file.separator}logs", "read, write";
permission java.io.FilePermission
"${catalina.base}${file.separator}logs${file.separator}*", "read,
write";
+
permission java.lang.RuntimePermission "shutdownHooks";
permission java.lang.RuntimePermission "getClassLoader";
permission java.lang.RuntimePermission "setContextClassLoader";
+
permission java.util.logging.LoggingPermission "control";
-// To enable per context logging configuration, permit read access to
+permission java.util.PropertyPermission
"java.util.logging.config.class", "read";
+permission java.util.PropertyPermission
"java.util.logging.config.file", "read";
+permission java.util.PropertyPermission "catalina.base", "read";
+
+// Note: To enable per context logging configuration, permit read
access to
// the appropriate file. Be sure that the logging configuration is
-// secure before enabling such access. E.g. for the examples web
-// application:
+// secure before enabling such access.
+// E.g. for the examples web application, all in one line:
// permission java.io.FilePermission "${catalina.base}${file.separator}
-// webapps${file.separator}examples${file.separator}
-//
WEB-INF${file.separator}classes${file.separator}logging.properties", "read";
+// webapps${file.separator}examples${file.separator}WEB-INF
+// ${file.separator}classes${file.separator}logging.properties",
"read";
};
// These permissions apply to the server startup code
Modified: tomcat/trunk/webapps/docs/security-manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-manager-howto.xml?rev=951880&r1=951879&r2=951880&view=diff
==
--- tomcat/trunk/webapps/docs/security-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/security-manager-howto.xml Sun Jun 6 16:02:30
2010
@@ -230,30 +230,35 @@ grant codeBase "file:${catalina.home}/bi
// These permissions apply to the logging API
// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home},
// update this section accordingly.
+// grant codeBase "file:${catalina.base}/bin/tomcat-juli.jar" {..}
grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
-permission java.util.PropertyPermission
"java.util.logging.config.class", "read";
-permission java.util.PropertyPermission
"java.util.logging.config.file", "read";
-permission java.util.PropertyPermission "catalina.base", "read";
permission java.io.FilePermission
"${java.home}${file.separator}lib${file.separator}logging.properties", "read";
+
permission java.io.FilePermission
"${catalina.base}${file.separator}conf${file.separator}logging.properties",
"read";
permission java.io.FilePermission
"${catalina.base}${file.separator}logs", "read, write";
permission java.io.FilePermission
"${catalina.base}${file.separator}logs${file.separator}*", "read,
write";
+
permission java.lang.RuntimePermission "shutdownHooks";
permission java.lang.RuntimePermission "getClassLoader";
permission java.lang.RuntimePermission "setContextClassLoader";
+
permission java.util.lo
svn commit: r951883 - /tomcat/tc6.0.x/trunk/conf/catalina.policy
Author: kkolinko
Date: Sun Jun 6 16:10:55 2010
New Revision: 951883
URL: http://svn.apache.org/viewvc?rev=951883&view=rev
Log:
Add a comment regarding placing tomcat-juli.jar in ${catalina.base}/bin
Modified:
tomcat/tc6.0.x/trunk/conf/catalina.policy
Modified: tomcat/tc6.0.x/trunk/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/catalina.policy?rev=951883&r1=951882&r2=951883&view=diff
==
--- tomcat/tc6.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc6.0.x/trunk/conf/catalina.policy Sun Jun 6 16:10:55 2010
@@ -62,6 +62,9 @@ grant codeBase "file:${catalina.home}/bi
};
// These permissions apply to the logging API
+// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home},
+// update this section accordingly.
+// grant codeBase "file:${catalina.base}/bin/tomcat-juli.jar" {..}
grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
permission java.util.PropertyPermission
"java.util.logging.config.class", "read";
permission java.util.PropertyPermission
"java.util.logging.config.file", "read";
@@ -74,9 +77,11 @@ grant codeBase "file:${catalina.home}/bi
permission java.io.FilePermission
"${catalina.base}${file.separator}logs${file.separator}*", "read, write";
permission java.lang.RuntimePermission "getClassLoader";
permission java.lang.RuntimePermission "setContextClassLoader";
-// To enable per context logging configuration, permit read access to
the appropriate file.
-// Be sure that the logging configuration is secure before enabling
such access
-// eg for the examples web application:
+
+// Note: To enable per context logging configuration, permit read
access to
+// the appropriate file. Be sure that the logging configuration is
+// secure before enabling such access.
+// E.g. for the examples web application, all in one line:
// permission java.io.FilePermission
"${catalina.base}${file.separator}webapps${file.separator}examples${file.separator}WEB-INF${file.separator}classes${file.separator}logging.properties",
"read";
};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951887 - /tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml
Author: kkolinko Date: Sun Jun 6 16:20:50 2010 New Revision: 951887 URL: http://svn.apache.org/viewvc?rev=951887&view=rev Log: Document default working directory permissions Update in-document copy of the default catalina.policy file Modified: tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml?rev=951887&r1=951886&r2=951887&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/security-manager-howto.xml Sun Jun 6 16:20:50 2010 @@ -124,12 +124,19 @@ permission org.apache.naming.JndiPermis but disallow it from using file access to read any other files (unless permissions for those files are explicitly granted). -Also, Tomcat always dynamically creates the following file permission: - +Also, Tomcat always dynamically creates the following file permissions: + permission java.io.FilePermission "** your application context**", "read"; - -Where **your application context** equals the folder(or WAR file) under which -your application has been deployed. + +permission java.io.FilePermission + "** application working directory**", "read,write"; +permission java.io.FilePermission + "** application working directory**/-", "read,write,delete"; + +Where **your application context** equals the folder (or WAR file) under which +your application has been deployed and **application working directory** is the +temporary directory provided to your application as required by the +Servlet Specification. @@ -174,14 +181,15 @@ grant [signedBy,] [codeBa looks like this: // -// catalina.corepolicy - Security Policy Permissions for Tomcat 6 +// catalina.policy - Security Policy Permissions for Tomcat 6 // // This file contains a default set of security policies to be enforced (by the // JVM) when Catalina is executed with the "-security" option. In addition // to the permissions granted here, the following additional permissions are // granted to the codebase specific to each web application: // -// * Read access to the document root directory +// * Read access to its document root directory +// * Read, write and delete access to its working directory // // @@ -220,8 +228,37 @@ grant codeBase "file:${catalina.home}/bi }; // These permissions apply to the logging API +// Note: If tomcat-juli.jar is in ${catalina.base} and not in ${catalina.home}, +// update this section accordingly. +// grant codeBase "file:${catalina.base}/bin/tomcat-juli.jar" {..} grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { -permission java.security.AllPermission; +permission java.io.FilePermission + "${java.home}${file.separator}lib${file.separator}logging.properties", "read"; + +permission java.io.FilePermission + "${catalina.base}${file.separator}conf${file.separator}logging.properties", "read"; +permission java.io.FilePermission + "${catalina.base}${file.separator}logs", "read, write"; +permission java.io.FilePermission + "${catalina.base}${file.separator}logs${file.separator}*", "read, write"; + +permission java.lang.RuntimePermission "shutdownHooks"; +permission java.lang.RuntimePermission "getClassLoader"; +permission java.lang.RuntimePermission "setContextClassLoader"; + +permission java.util.logging.LoggingPermission "control"; + +permission java.util.PropertyPermission "java.util.logging.config.class", "read"; +permission java.util.PropertyPermission "java.util.logging.config.file", "read"; +permission java.util.PropertyPermission "catalina.base", "read"; + +// Note: To enable per context logging configuration, permit read access to +// the appropriate file. Be sure that the logging configuration is +// secure before enabling such access. +// E.g. for the examples web application, all in one line: +// permission java.io.FilePermission "${catalina.base}${file.separator} +// webapps${file.separator}examples${file.separator}WEB-INF +// ${file.separator}classes${file.separator}logging.properties", "read"; }; // These permissions apply to the server startup code @@ -237,6 +274,13 @@ grant codeBase "file:${catalina.home}/li }; +// If using a per instance lib directory, i.e. ${catalina.base}/lib, +// then the following permission will need to be uncommented +// grant codeBase "file:${catalina.base}/lib/-" { +// permission java.security.AllPermission; +// };
svn commit: r951891 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Jun 6 16:39:59 2010 New Revision: 951891 URL: http://svn.apache.org/viewvc?rev=951891&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=951891&r1=951890&r2=951891&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 6 16:39:59 2010 @@ -223,3 +223,12 @@ PATCHES PROPOSED TO BACKPORT: (Easier to review if you ignore whitespaces during the diff) +1: kkolinko, kfujino -1: + +* Rearrange tomcat-juli permissions in catalina.policy for better readability, + and wrap long lines, as already done in trunk and in security-manager-howto. + The reason is that we have a copy of this file in security-manager-howto.html, + and long lines break layout of the document. + I am not very confident that this patch needs applying, but here it is. + http://people.apache.org/~kkolinko/patches/2010-06-06_tc6_policy-juli.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951892 - /tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
Author: markt
Date: Sun Jun 6 16:42:56 2010
New Revision: 951892
URL: http://svn.apache.org/viewvc?rev=951892&view=rev
Log:
Add AccessLog interface to JDBCAccessLog
Modified:
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=951892&r1=951891&r2=951892&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Sun
Jun 6 16:42:56 2010
@@ -29,6 +29,7 @@ import java.util.Properties;
import javax.servlet.ServletException;
+import org.apache.catalina.AccessLog;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.connector.Request;
@@ -114,7 +115,7 @@ import org.apache.tomcat.util.res.String
* @author Peter Rossbach
*/
-public final class JDBCAccessLogValve extends ValveBase {
+public final class JDBCAccessLogValve extends ValveBase implements AccessLog {
// --- Constructors
@@ -445,10 +446,17 @@ public final class JDBCAccessLogValve ex
@Override
public void invoke(Request request, Response response)
throws IOException, ServletException {
-final String EMPTY = "" ;
getNext().invoke(request, response);
+log (request, response, 0);
+}
+
+
+@Override
+public void log(Request request, Response response, long time) {
+final String EMPTY = "" ;
+
String remoteHost;
if(resolveHosts)
remoteHost = request.getRemoteHost();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951898 - /tomcat/trunk/webapps/docs/config/manager.xml
Author: markt Date: Sun Jun 6 17:04:42 2010 New Revision: 951898 URL: http://svn.apache.org/viewvc?rev=951898&view=rev Log: Remove the warning. The bug reports received indicate that folks are using this, generally successfully. Modified: tomcat/trunk/webapps/docs/config/manager.xml Modified: tomcat/trunk/webapps/docs/config/manager.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=951898&r1=951897&r2=951898&view=diff == --- tomcat/trunk/webapps/docs/config/manager.xml (original) +++ tomcat/trunk/webapps/docs/config/manager.xml Sun Jun 6 17:04:42 2010 @@ -164,10 +164,6 @@ Persistent Manager Implementation -WARNING - Use of this Manager implementation -has not been thoroughly tested, and should be considered experimental! - - NOTE: You must set either the org.apache.catalina.session.StandardSession.ACTIVITY_CHECK or org.apache.catalina.STRICT_SERVLET_COMPLIANCE - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951908 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Sun Jun 6 17:30:27 2010 New Revision: 951908 URL: http://svn.apache.org/viewvc?rev=951908&view=rev Log: Vote, propose, comment Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=951908&r1=951907&r2=951908&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 6 17:30:27 2010 @@ -83,6 +83,8 @@ PATCHES PROPOSED TO BACKPORT: Expose properties of VirtualWebappLoader and WebappClassLoader via JMX. http://svn.apache.org/viewvc?view=revision&revision=936819 + Added per Konstantin's review comment: + http://svn.apache.org/viewvc?view=revision&revision=947617 +1: rjung, markt, kkolinko -1: kkolinko: @@ -92,6 +94,7 @@ PATCHES PROPOSED TO BACKPORT: I tested and either one of these two capitalization variants works correctly. Though you need to configure a VirtualWebappLoader to test that: without it the property is always a zero-length array. + Mark: Does your +1 stand including the second part of the path? Add property "searchExternalFirst" to WebappLoader: If set, the external repositories will be searched before @@ -139,24 +142,24 @@ PATCHES PROPOSED TO BACKPORT: * Fix ByteChunk.indexOf(String, ...) when the string is of length 1 http://svn.apache.org/viewvc?rev=945231&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: - + * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990 Fix the skip.installer build property so once set, the Windows installer is skipped but all the other artifacts are created https://issues.apache.org/bugzilla/attachment.cgi?id=25477&action=edit - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix issues running AJP BIO coyote connector under a security manager http://svn.apache.org/viewvc?rev=947717&view=rev (less changes to loadUtilPackage()) - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Additional clean-up possible as a result of above fix http://svn.apache.org/viewvc?rev=950905&view=rev (associated clean-up) - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49095 @@ -168,7 +171,7 @@ PATCHES PROPOSED TO BACKPORT: +0: kkolinko: I updated the above patch to use explicit encoding when creating the writer: https://issues.apache.org/bugzilla/attachment.cgi?id=25510 - +1: kkolinko + +1: kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49196 @@ -230,5 +233,7 @@ PATCHES PROPOSED TO BACKPORT: and long lines break layout of the document. I am not very confident that this patch needs applying, but here it is. http://people.apache.org/~kkolinko/patches/2010-06-06_tc6_policy-juli.patch - +1: kkolinko + +1: kkolinko, rjung -1: + rjung: Please remove the "all in one line" comment directly before the commented + example line that you were breaking up into multiple lines. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Release plans for 6.0.27 - ?
On 06.06.2010 17:41, jean-frederic clere wrote: On 06/04/2010 09:57 PM, Konstantin Kolinko wrote: Hi! When can we make 6.0.27? There were a couple of important fixes since 6.0.26, like BZ 48903 (classloader deadlock). I think it is about time to make 6.0.27. +1 I will start to prepare the stuff. Tag on Monday, packaging , votes and release before the next week-end, is that ok? There are about 10 proposals in STATUS that have enough votes. Applying them would cut STATUS down to half (roughly). Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Release plans for 6.0.27 - ?
On 06/06/2010 18:32, Rainer Jung wrote: > On 06.06.2010 17:41, jean-frederic clere wrote: >> On 06/04/2010 09:57 PM, Konstantin Kolinko wrote: >>> Hi! >>> >>> When can we make 6.0.27? >>> >>> There were a couple of important fixes since 6.0.26, like BZ 48903 >>> (classloader deadlock). >>> >>> I think it is about time to make 6.0.27. >> >> +1 I will start to prepare the stuff. Tag on Monday, packaging , votes >> and release before the next week-end, is that ok? > > There are about 10 proposals in STATUS that have enough votes. Applying > them would cut STATUS down to half (roughly). I've got some 7.0.x stuff I want to finish before a try another 7.0.0 RC. Reviewing the 6.0.x status file is next on my todo list after that. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951909 - in /tomcat/trunk: java/org/apache/catalina/session/StandardSession.java webapps/docs/config/systemprops.xml
Author: markt
Date: Sun Jun 6 17:36:34 2010
New Revision: 951909
URL: http://svn.apache.org/viewvc?rev=951909&view=rev
Log:
Use STRICT_SERVLET_COMPLIANCE to override the default for ACTIVITY_CHECK to
align behaviour with other system properties
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=951909&r1=951908&r2=951909&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sun Jun
6 17:36:34 2010
@@ -84,14 +84,28 @@ import org.apache.catalina.security.Secu
public class StandardSession
implements HttpSession, Session, Serializable {
+protected static final boolean STRICT_SERVLET_COMPLIANCE;
-protected static final boolean ACTIVITY_CHECK =
-Globals.STRICT_SERVLET_COMPLIANCE
-||
Boolean.valueOf(System.getProperty("org.apache.catalina.session.StandardSession.ACTIVITY_CHECK",
"false")).booleanValue();
+protected static final boolean ACTIVITY_CHECK;
// --- Constructors
+static {
+STRICT_SERVLET_COMPLIANCE = Boolean.valueOf(System.getProperty(
+"org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
+"false")).booleanValue();
+
+String activityCheck = System.getProperty(
+"org.apache.catalina.session.StandardSession.ACTIVITY_CHECK");
+if (activityCheck == null) {
+ACTIVITY_CHECK = STRICT_SERVLET_COMPLIANCE;
+} else {
+ACTIVITY_CHECK =
+Boolean.valueOf(activityCheck).booleanValue();
+}
+}
+
/**
* Construct a new Session associated with the specified Manager.
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=951909&r1=951908&r2=951909&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Sun Jun 6 17:36:34 2010
@@ -239,6 +239,7 @@
The default value will be changed for:
+
org.apache.catalina.session.StandardSession.ACTIVITY_CHECK
org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES.
org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR.
org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING.
@@ -277,16 +278,6 @@
- If this is true or if
- org.apache.catalina.STRICT_SERVLET_COMPLIANCE is
- true Tomcat will track the number of active requests for
each
- session. When determining if a session is valid, any session with at
least
- one active request will always be considered valid. If not specified, the
- default value of false will be used.
-
-
-
If this is true Tomcat will allow =
characters when parsing unquoted cookie values. If false,
@@ -352,6 +343,16 @@
JSESSIONIDSSO.
+
+ If this is true Tomcat will track the number of active
+ requests for each session. When determining if a session is valid, any
+ session with at least one active request will always be considered valid.
+ If org.apache.catalina.STRICT_SERVLET_COMPLIANCE is set to
+ true, the default of this setting will be true,
+ else the default value will be false.
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951921 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Author: markt
Date: Sun Jun 6 18:23:33 2010
New Revision: 951921
URL: http://svn.apache.org/viewvc?rev=951921&view=rev
Log:
Put the comment in the right place
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=951921&r1=951920&r2=951921&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sun Jun
6 18:23:33 2010
@@ -89,8 +89,6 @@ public class StandardSession
protected static final boolean ACTIVITY_CHECK;
-// --- Constructors
-
static {
STRICT_SERVLET_COMPLIANCE = Boolean.valueOf(System.getProperty(
"org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
@@ -107,6 +105,9 @@ public class StandardSession
}
+// --- Constructors
+
+
/**
* Construct a new Session associated with the specified Manager.
*
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951922 - in /tomcat/trunk: java/org/apache/catalina/core/StandardHostValve.java webapps/docs/config/systemprops.xml
Author: markt
Date: Sun Jun 6 18:29:26 2010
New Revision: 951922
URL: http://svn.apache.org/viewvc?rev=951922&view=rev
Log:
Part of refactoring STRICT_SERVLET_COMPLIANCE so it just changes defaults
New ACCESS_SESSION property
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=951922&r1=951921&r2=951922&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Sun Jun
6 18:29:26 2010
@@ -61,6 +61,25 @@ final class StandardHostValve
private static final Log log = LogFactory.getLog(StandardHostValve.class);
+protected static final boolean STRICT_SERVLET_COMPLIANCE;
+
+protected static final boolean ACCESS_SESSION;
+
+static {
+STRICT_SERVLET_COMPLIANCE = Boolean.valueOf(System.getProperty(
+"org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
+"false")).booleanValue();
+
+String accessSession = System.getProperty(
+"org.apache.catalina.core.StandardHostValve.ACCESS_SESSION");
+if (accessSession == null) {
+ACCESS_SESSION = STRICT_SERVLET_COMPLIANCE;
+} else {
+ACCESS_SESSION =
+Boolean.valueOf(accessSession).booleanValue();
+}
+}
+
//-- Constructor
public StandardHostValve() {
super(true);
@@ -147,7 +166,7 @@ final class StandardHostValve
// Access a session (if present) to update last accessed time, based
on a
// strict interpretation of the specification
-if (Globals.STRICT_SERVLET_COMPLIANCE) {
+if (ACCESS_SESSION) {
request.getSession(false);
}
@@ -205,7 +224,7 @@ final class StandardHostValve
// Access a session (if present) to update last accessed time, based
on a
// strict interpretation of the specification
-if (Globals.STRICT_SERVLET_COMPLIANCE) {
+if (ACCESS_SESSION) {
request.getSession(false);
}
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=951922&r1=951921&r2=951922&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Sun Jun 6 18:29:26 2010
@@ -228,10 +228,6 @@
dispatcher will be checked to ensure that it has wrapped the original
request or response. (SRV.8.2 / SRV.14.2.5.1)
- every request that is associated with a session will cause the
- session's last accessed time to be updated regardless of whether or not
- the request explicitly accesses the session. (SRV.7.6)
-
ServletContext.getResource/getResourceAsStream must start
with "/"
if set to false, code like
getResource("myfolder/myresource.txt") will work
@@ -239,6 +235,7 @@
The default value will be changed for:
+
org.apache.catalina.core.StandardHostValve.ACCESS_SESSION
org.apache.catalina.session.StandardSession.ACTIVITY_CHECK
org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES.
org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR.
@@ -343,9 +340,18 @@
JSESSIONIDSSO.
+
+ If this is true, every request that is associated with a
+ session will cause the session's last accessed time to be updated
+ regardless of whether or not the request explicitly accesses the session.
+ If org.apache.catalina.STRICT_SERVLET_COMPLIANCE is set to
+ true, the default of this setting will be true,
+ else the default value will be false.
+
+
- If this is true Tomcat will track the number of active
+ If this is true, Tomcat will track the number of active
requests for each session. When determining if a session is valid, any
session with at least one active request will always be considered valid.
If org.apache.catalina.STRICT_SERVLET_COMPLIANCE is set to
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951923 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationContext.java webapps/docs/config/systemprops.xml
Author: markt
Date: Sun Jun 6 18:39:33 2010
New Revision: 951923
URL: http://svn.apache.org/viewvc?rev=951923&view=rev
Log:
Part of refactoring STRICT_SERVLET_COMPLIANCE so it just changes defaults
New GET_RESOURCE_REQUIRE_SLASH property
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=951923&r1=951922&r2=951923&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Sun Jun
6 18:39:33 2010
@@ -93,6 +93,24 @@ import org.apache.catalina.Globals;
public class ApplicationContext
implements ServletContext {
+protected static final boolean STRICT_SERVLET_COMPLIANCE;
+
+protected static final boolean GET_RESOURCE_REQUIRE_SLASH;
+
+
+static {
+STRICT_SERVLET_COMPLIANCE = Globals.STRICT_SERVLET_COMPLIANCE;
+
+String activityCheck = System.getProperty(
+
"org.apache.catalina.core.ApplicationContext.GET_RESOURCE_REQUIRE_SLASH");
+if (activityCheck == null) {
+GET_RESOURCE_REQUIRE_SLASH = STRICT_SERVLET_COMPLIANCE;
+} else {
+GET_RESOURCE_REQUIRE_SLASH =
+Boolean.valueOf(activityCheck).booleanValue();
+}
+}
+
// --- Constructors
@@ -497,7 +515,7 @@ public class ApplicationContext
if (path == null)
throw new
MalformedURLException(sm.getString("applicationContext.requestDispatcher.iae",
path));
-if (!path.startsWith("/") && Globals.STRICT_SERVLET_COMPLIANCE)
+if (!path.startsWith("/") && GET_RESOURCE_REQUIRE_SLASH)
throw new
MalformedURLException(sm.getString("applicationContext.requestDispatcher.iae",
path));
@@ -541,7 +559,7 @@ public class ApplicationContext
if (path == null)
return (null);
-if (!path.startsWith("/") && Globals.STRICT_SERVLET_COMPLIANCE)
+if (!path.startsWith("/") && GET_RESOURCE_REQUIRE_SLASH)
return null;
String normalizedPath = RequestUtil.normalize(path);
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=951923&r1=951922&r2=951923&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Sun Jun 6 18:39:33 2010
@@ -229,12 +229,9 @@
request or response. (SRV.8.2 / SRV.14.2.5.1)
-ServletContext.getResource/getResourceAsStream must start
with "/"
-if set to false, code like
getResource("myfolder/myresource.txt") will work
-
-
The default value will be changed for:
+
rg.apache.catalina.core.ApplicationContext.GET_RESOURCE_REQUIRE_SLASH
org.apache.catalina.core.StandardHostValve.ACCESS_SESSION
org.apache.catalina.session.StandardSession.ACTIVITY_CHECK
org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES.
@@ -274,6 +271,17 @@
true will be used.
+
+ If this is true then the path passed to
+ ServletContext.getResource() or
+ ServletContext.getResourceAsStream() must start with
+ "/". If false, code like
+ getResource("myfolder/myresource.txt") will work. If
+ org.apache.catalina.STRICT_SERVLET_COMPLIANCE is set to
+ true, the default of this setting will be true,
+ else the default value will be false.
+
+
If this is true Tomcat will allow =
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951924 - /tomcat/trunk/webapps/docs/config/systemprops.xml
Author: markt Date: Sun Jun 6 18:39:48 2010 New Revision: 951924 URL: http://svn.apache.org/viewvc?rev=951924&view=rev Log: Typo Modified: tomcat/trunk/webapps/docs/config/systemprops.xml Modified: tomcat/trunk/webapps/docs/config/systemprops.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=951924&r1=951923&r2=951924&view=diff == --- tomcat/trunk/webapps/docs/config/systemprops.xml (original) +++ tomcat/trunk/webapps/docs/config/systemprops.xml Sun Jun 6 18:39:48 2010 @@ -231,7 +231,7 @@ The default value will be changed for: - rg.apache.catalina.core.ApplicationContext.GET_RESOURCE_REQUIRE_SLASH + org.apache.catalina.core.ApplicationContext.GET_RESOURCE_REQUIRE_SLASH org.apache.catalina.core.StandardHostValve.ACCESS_SESSION org.apache.catalina.session.StandardSession.ACTIVITY_CHECK org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951925 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
Author: markt
Date: Sun Jun 6 18:42:12 2010
New Revision: 951925
URL: http://svn.apache.org/viewvc?rev=951925&view=rev
Log:
Copy/paste error. Sorry for the noise.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=951925&r1=951924&r2=951925&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Sun Jun
6 18:42:12 2010
@@ -101,13 +101,13 @@ public class ApplicationContext
static {
STRICT_SERVLET_COMPLIANCE = Globals.STRICT_SERVLET_COMPLIANCE;
-String activityCheck = System.getProperty(
+String requireSlash = System.getProperty(
"org.apache.catalina.core.ApplicationContext.GET_RESOURCE_REQUIRE_SLASH");
-if (activityCheck == null) {
+if (requireSlash == null) {
GET_RESOURCE_REQUIRE_SLASH = STRICT_SERVLET_COMPLIANCE;
} else {
GET_RESOURCE_REQUIRE_SLASH =
-Boolean.valueOf(activityCheck).booleanValue();
+Boolean.valueOf(requireSlash).booleanValue();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951926 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationDispatcher.java webapps/docs/config/systemprops.xml
Author: markt
Date: Sun Jun 6 18:47:14 2010
New Revision: 951926
URL: http://svn.apache.org/viewvc?rev=951926&view=rev
Log:
Part of refactoring STRICT_SERVLET_COMPLIANCE so it just changes defaults
New WRAP_SAME_OBJECT property
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=951926&r1=951925&r2=951926&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Sun
Jun 6 18:47:14 2010
@@ -70,6 +70,25 @@ final class ApplicationDispatcher
private static final Log log =
LogFactory.getLog(ApplicationDispatcher.class);
+protected static final boolean STRICT_SERVLET_COMPLIANCE;
+
+protected static final boolean WRAP_SAME_OBJECT;
+
+
+static {
+STRICT_SERVLET_COMPLIANCE = Globals.STRICT_SERVLET_COMPLIANCE;
+
+String wrapSameObject = System.getProperty(
+
"org.apache.catalina.core.ApplicationDispatcher.WRAP_SAME_OBJECT");
+if (wrapSameObject == null) {
+WRAP_SAME_OBJECT = STRICT_SERVLET_COMPLIANCE;
+} else {
+WRAP_SAME_OBJECT =
+Boolean.valueOf(wrapSameObject).booleanValue();
+}
+}
+
+
protected class PrivilegedForward
implements PrivilegedExceptionAction {
private ServletRequest request;
@@ -329,7 +348,7 @@ final class ApplicationDispatcher
// Set up to handle the specified request and response
State state = new State(request, response, false);
-if (Globals.STRICT_SERVLET_COMPLIANCE) {
+if (WRAP_SAME_OBJECT) {
// Check SRV.8.2 / SRV.14.2.5.1 compliance
checkSameObjects(request, response);
}
@@ -504,7 +523,7 @@ final class ApplicationDispatcher
// Set up to handle the specified request and response
State state = new State(request, response, true);
-if (Globals.STRICT_SERVLET_COMPLIANCE) {
+if (WRAP_SAME_OBJECT) {
// Check SRV.8.2 / SRV.14.2.5.1 compliance
checkSameObjects(request, response);
}
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=951926&r1=951925&r2=951926&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Sun Jun 6 18:47:14 2010
@@ -222,31 +222,23 @@
- If this is true the following actions will occur:
+ If this is true the default values will be changed for:
- any wrapped request or response object passed to an application
- dispatcher will be checked to ensure that it has wrapped the original
- request or response. (SRV.8.2 / SRV.14.2.5.1)
-
-
-The default value will be changed for:
-
-
org.apache.catalina.core.ApplicationContext.GET_RESOURCE_REQUIRE_SLASH
-
org.apache.catalina.core.StandardHostValve.ACCESS_SESSION
-
org.apache.catalina.session.StandardSession.ACTIVITY_CHECK
-
org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES.
-
org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR.
-
org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING.
-The tldNamespaceAware attribute of any
-Context element.
-The tldValidation attribute of any
-Context element.
-The xmlNamespaceAware attribute of any
-Context element.
-The xmlValidation attribute of any
-Context element.
-
-
+
org.apache.catalina.core.ApplicationContext.GET_RESOURCE_REQUIRE_SLASH
+
org.apache.catalina.core.ApplicationDispatcher.WRAP_SAME_OBJECT
+
org.apache.catalina.core.StandardHostValve.ACCESS_SESSION
+
org.apache.catalina.session.StandardSession.ACTIVITY_CHECK
+
org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES.
+
org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR.
+
org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING.
+ The tldNamespaceAware attribute of any
+ Context element.
+ The tldValidation attribute of any
+ Context element.
+ The xmlNamespaceAware attribute of any
+ Context element.
+ The xmlValidation attribute of any
+ Context element.
Note that changing a number of the above defaults is likely to break
@@ -282,6 +274,15 @@
else the default val
svn commit: r951930 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ webapps/docs/ webapps/docs/config/
Author: kkolinko Date: Sun Jun 6 19:17:58 2010 New Revision: 951930 URL: http://svn.apache.org/viewvc?rev=951930&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48971 Make stopping of leaking Timer threads optional and disabled by default. It is merge of r950164, r950614 from trunk. 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/StandardContext.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 6 19:17:58 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945808,945835,945841,946686,950596 ,951615 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,7785
DO NOT REPLY [Bug 48971] memory leak protection : stopping TimeThreads should be optional and disabled by default
https://issues.apache.org/bugzilla/show_bug.cgi?id=48971 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #12 from Konstantin Kolinko 2010-06-06 15:22:26 EDT --- The fix was applied to 6.0 in r951930 and will be in 6.0.27 onwards. Stopping the java.util.TimerThread threads is now optional and disabled by default. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r951941 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/javax/servlet/jsp/PageContext.java webapps/docs/changelog.xml
Author: kkolinko Date: Sun Jun 6 19:56:59 2010 New Revision: 951941 URL: http://svn.apache.org/viewvc?rev=951941&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49196 Avoid NullPointerException in PageContext.getErrorData() Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/PageContext.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 6 19:56:59 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945808,945835,945841,946686,950164 ,950596,950614,951615 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,
svn commit: r951943 - /tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java
Author: kkolinko
Date: Sun Jun 6 20:01:56 2010
New Revision: 951943
URL: http://svn.apache.org/viewvc?rev=951943&view=rev
Log:
CTR. Tabs to spaces.
Modified:
tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java
Modified:
tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java?rev=951943&r1=951942&r2=951943&view=diff
==
---
tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java
(original)
+++
tomcat/tc5.5.x/trunk/servletapi/jsr152/src/share/javax/servlet/jsp/PageContext.java
Sun Jun 6 20:01:56 2010
@@ -512,12 +512,12 @@ abstract public class PageContext
* @since 2.0
*/
public ErrorData getErrorData() {
- return new ErrorData(
- (Throwable)getRequest().getAttribute(
"javax.servlet.error.exception" ),
- ((Integer)getRequest().getAttribute(
- "javax.servlet.error.status_code" )).intValue(),
- (String)getRequest().getAttribute(
"javax.servlet.error.request_uri" ),
- (String)getRequest().getAttribute(
"javax.servlet.error.servlet_name" ) );
+return new ErrorData(
+(Throwable)getRequest().getAttribute(
"javax.servlet.error.exception" ),
+((Integer)getRequest().getAttribute(
+"javax.servlet.error.status_code" )).intValue(),
+(String)getRequest().getAttribute(
"javax.servlet.error.request_uri" ),
+(String)getRequest().getAttribute(
"javax.servlet.error.servlet_name" ) );
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49196] NPE in PageContext.getErrorData()
https://issues.apache.org/bugzilla/show_bug.cgi?id=49196 --- Comment #2 from Konstantin Kolinko 2010-06-06 16:07:12 EDT --- Created an attachment (id=25534) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25534) 2010-06-07_tc55_bug49196.patch Patch for 5.5. It is backport of r948057 from trunk. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r951950 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Jun 6 20:12:34 2010 New Revision: 951950 URL: http://svn.apache.org/viewvc?rev=951950&view=rev Log: proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=951950&r1=951949&r2=951950&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Jun 6 20:12:34 2010 @@ -66,3 +66,11 @@ PATCHES PROPOSED TO BACKPORT: (Easier to review if you ignore whitespaces during the diff) +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49196 + Avoid NullPointerException in PageContext.getErrorData() if an + error-handling JSP page is called directly. + It is backport of r948057. + https://issues.apache.org/bugzilla/attachment.cgi?id=25534 + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49196] NPE in PageContext.getErrorData()
https://issues.apache.org/bugzilla/show_bug.cgi?id=49196 Konstantin Kolinko changed: What|Removed |Added Component|Catalina|Catalina Version|6.0.26 |5.5.28 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #3 from Konstantin Kolinko 2010-06-06 16:15:26 EDT --- The fix was applied to 6.0 in r951941 and will be in 6.0.27. Proposed for backport to 5.5, so I am changing Product and Version to track this issue further. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r951951 - /tomcat/trunk/test/webapp-3.0/bug49196.jsp
Author: kkolinko Date: Sun Jun 6 20:20:02 2010 New Revision: 951951 URL: http://svn.apache.org/viewvc?rev=951951&view=rev Log: correct a typo in a comment Modified: tomcat/trunk/test/webapp-3.0/bug49196.jsp Modified: tomcat/trunk/test/webapp-3.0/bug49196.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug49196.jsp?rev=951951&r1=951950&r2=951951&view=diff == --- tomcat/trunk/test/webapp-3.0/bug49196.jsp (original) +++ tomcat/trunk/test/webapp-3.0/bug49196.jsp Sun Jun 6 20:20:02 2010 @@ -15,7 +15,7 @@ limitations under the License. --%> <% -// As nonsensical as this is, in't shouldn't throw an NPE +// As nonsensical as this is, it shouldn't throw an NPE pageContext.getErrorData(); %> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "MemoryLeakProtection" by Sylva inLaurent
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "MemoryLeakProtection" page has been changed by SylvainLaurent.
http://wiki.apache.org/tomcat/MemoryLeakProtection?action=diff&rev1=10&rev2=11
--
= Summary matrix =
||'''Leak cause'''||'''Detected by tomcat'''||'''Fixed by
tomcat'''||'''Possible enhancements'''||
- ||[[#customThreadLocal|Custom ThreadLocal class]]||>=6.0.24||>=6.0.24||
[[#48837|Detect child classloaders]], [[#48895|improve thread safety]] ||
- ||[[#webappClassInstanceAsThreadLocalValue|Webapp class instance as
ThreadLocal value]]||>=6.0.24||>=6.0.24|| [[#48837|Detect child classloaders]],
[[#48895|improve thread safety]] ||
+ ||[[#customThreadLocal|Custom ThreadLocal class]]||>=6.0.24||6.0.24-6.0.26
but is unsafe. Made optional from 6.0.27|| [[#48837|Detect child
classloaders]], [[#49159|BZ 49159]] ||
+ ||[[#webappClassInstanceAsThreadLocalValue|Webapp class instance as
ThreadLocal value]]||>=6.0.24||6.0.24-6.0.26 but is unsafe. Made optional from
6.0.27|| [[#48837|Detect child classloaders]], [[#49159|BZ 49159]] ||
- ||[[#webappClassInstanceAsThreadLocalIndirectValue|Webapp class instance
indirectly held through a ThreadLocal value]]||no||no||Renew threads in the
worker pool||
+ ||[[#webappClassInstanceAsThreadLocalIndirectValue|Webapp class instance
indirectly held through a ThreadLocal value]]||no||no||[[#49159|Renew threads
in the worker pool]]||
- ||[[#threadLocalPseudoLeak|ThreadLocal
pseudo-leak]]||>=6.0.24||>=6.0.24||[[#48895|improve thread safety]]||
- ||[[#cclThreadSpawnedByWebApp|ContextClassLoader / Threads spawned by
webapps]]||>=6.0.24||{{{TimerThread}}} are stopped. Other threads may be
stopped if {{{clearReferencesStopThreads}}} is set to true on the Context
||[[#48837|Detect child classloaders]], [[#48971|don't stop TimerThread by
default]]||
- ||[[#cclThreadSpawnedByCommonClassLoader|ContextClassLoader / Threads spawned
by classes loaded by the common classloader]]||>=6.0.24||{{{TimerThread}}} are
stopped. Other threads may be stopped if {{{clearReferencesStopThreads}}} is
set to true on the Context ||[[#48837|Detect child classloaders]],
[[#48971|don't stop TimerThread by default]]||
+ ||[[#threadLocalPseudoLeak|ThreadLocal pseudo-leak]]||>=6.0.24||6.0.24-6.0.26
but is unsafe. Made optional from 6.0.27||[[#49159|BZ 49159]]||
+ ||[[#cclThreadSpawnedByWebApp|ContextClassLoader / Threads spawned by
webapps]]||>=6.0.24||In 6.0.24-6.0.26 {{{TimerThread}}} are stopped but it may
lead to problems. Optional from 6.0.27 with the
{{{clearReferencesStopTimerThreads}}} flag. Other threads may be stopped with
the {{{clearReferencesStopThreads}}} flag, but it's unsafe. ||[[#48837|Detect
child classloaders]], Fix the application to stop the thread when the
application is stopped||
+ ||[[#cclThreadSpawnedByCommonClassLoader|ContextClassLoader / Threads spawned
by classes loaded by the common classloader]]||>=6.0.24||In 6.0.24-6.0.26
{{{TimerThread}}} are stopped but it may lead to problems. Optional from 6.0.27
with the {{{clearReferencesStopTimerThreads}}} flag. Other threads may be
stopped with the {{{clearReferencesStopThreads}}} flag, but it's unsafe.
||[[#48837|Detect child classloaders]], fix the offending code (set the correct
CCL when spawning the thread)||
||[[#cclThreadSpawnedByJRE|ContextClassLoader / Threads spawned by JRE
classes]]|| no || >=6.0.24 pre-spawns some known offenders || ||
||[[#staticClassVariables|static class variables]]|| no ||> 6.0.? || ||
||[[#LogFactory|LogFactory]]|| ||> 6.0.? || ||
@@ -84, +84 @@
Hopefully tomcat 6.0.24 can detect the leak when the application is stopped:
each Thread in the JVM is examined, and the internal structures of the Thread
and {{{ThreadLocal}}} classes are introspected to see if either the
{{{ThreadLocal}}} instance or the value bound to it were loaded by the
{{{WebAppClassLoader}}} of the application being stopped.
- In this particular case, the leak is detected, a message is logged and
internal structures of the JDK ({{{ThreadLocalMap}}}) are modified to remove
the reference to the {{{ThreadLocal}}} instance.
+ In this particular case, the leak is detected and a message is logged. Tomcat
6.0.24 to 6.0.26 modify internal structures of the JDK ({{{ThreadLocalMap}}})
to remove the reference to the {{{ThreadLocal}}} instance, but this is unsafe
(see [[#48895]]) so that it became optional and disabled by default from 6.0.27.
{{{
Mar 16, 2010 11:47:24 PM org.apache.catalina.loader.WebappClassLoader
clearThreadLocalMap
@@ -145, +145 @@
If the servlet is invoked at least once, the webapp classloader would not be
GCed when the app is stopped: since the classloader of {{{ThreadScopedHolder}}}
is the common classloader, it remains forever which is as expected. But its
{{{ThreadLocal}}} instance has a value bound to it (for the non-terminate
svn commit: r951980 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
Author: markt
Date: Sun Jun 6 21:21:51 2010
New Revision: 951980
URL: http://svn.apache.org/viewvc?rev=951980&view=rev
Log:
Additional fix required for http://svn.apache.org/viewvc?rev=951926&view=rev
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=951980&r1=951979&r2=951980&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Sun
Jun 6 21:21:51 2010
@@ -60,7 +60,7 @@ final class ApplicationFilterChain imple
private final static ThreadLocal lastServicedResponse;
static {
-if (Globals.STRICT_SERVLET_COMPLIANCE) {
+if (ApplicationDispatcher.WRAP_SAME_OBJECT) {
lastServicedRequest = new ThreadLocal();
lastServicedResponse = new ThreadLocal();
} else {
@@ -271,7 +271,7 @@ final class ApplicationFilterChain imple
// We fell off the end of the chain -- call the servlet instance
try {
-if (Globals.STRICT_SERVLET_COMPLIANCE) {
+if (ApplicationDispatcher.WRAP_SAME_OBJECT) {
lastServicedRequest.set(request);
lastServicedResponse.set(response);
}
@@ -325,7 +325,7 @@ final class ApplicationFilterChain imple
throw new ServletException
(sm.getString("filterChain.servlet"), e);
} finally {
-if (Globals.STRICT_SERVLET_COMPLIANCE) {
+if (ApplicationDispatcher.WRAP_SAME_OBJECT) {
lastServicedRequest.set(null);
lastServicedResponse.set(null);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951981 - /tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
Author: markt
Date: Sun Jun 6 21:22:25 2010
New Revision: 951981
URL: http://svn.apache.org/viewvc?rev=951981&view=rev
Log:
Use the constant rather than re-reading
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=951981&r1=951980&r2=951981&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Sun Jun
6 21:22:25 2010
@@ -66,9 +66,7 @@ final class StandardHostValve
protected static final boolean ACCESS_SESSION;
static {
-STRICT_SERVLET_COMPLIANCE = Boolean.valueOf(System.getProperty(
-"org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
-"false")).booleanValue();
+STRICT_SERVLET_COMPLIANCE = Globals.STRICT_SERVLET_COMPLIANCE;
String accessSession = System.getProperty(
"org.apache.catalina.core.StandardHostValve.ACCESS_SESSION");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951985 - in /tomcat/trunk: java/org/apache/catalina/session/StandardSession.java webapps/docs/config/systemprops.xml
Author: markt
Date: Sun Jun 6 21:24:09 2010
New Revision: 951985
URL: http://svn.apache.org/viewvc?rev=951985&view=rev
Log:
Final part of refactoring STRICT_SERVLET_COMPLIANCE so it just changes defaults
New property LAST_ACCESS_AT_START
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=951985&r1=951984&r2=951985&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Sun Jun
6 21:24:09 2010
@@ -88,11 +88,10 @@ public class StandardSession
protected static final boolean ACTIVITY_CHECK;
+protected static final boolean LAST_ACCESS_AT_START;
static {
-STRICT_SERVLET_COMPLIANCE = Boolean.valueOf(System.getProperty(
-"org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
-"false")).booleanValue();
+STRICT_SERVLET_COMPLIANCE = Globals.STRICT_SERVLET_COMPLIANCE;
String activityCheck = System.getProperty(
"org.apache.catalina.session.StandardSession.ACTIVITY_CHECK");
@@ -102,6 +101,15 @@ public class StandardSession
ACTIVITY_CHECK =
Boolean.valueOf(activityCheck).booleanValue();
}
+
+String lastAccessAtStart = System.getProperty(
+
"org.apache.catalina.session.StandardSession.LAST_ACCESS_AT_START");
+if (lastAccessAtStart == null) {
+LAST_ACCESS_AT_START = STRICT_SERVLET_COMPLIANCE;
+} else {
+LAST_ACCESS_AT_START =
+Boolean.valueOf(lastAccessAtStart).booleanValue();
+}
}
@@ -614,7 +622,7 @@ public class StandardSession
if (maxInactiveInterval >= 0) {
long timeNow = System.currentTimeMillis();
int timeIdle;
-if (Globals.STRICT_SERVLET_COMPLIANCE) {
+if (LAST_ACCESS_AT_START) {
timeIdle = (int) ((timeNow - lastAccessedTime) / 1000L);
} else {
timeIdle = (int) ((timeNow - thisAccessedTime) / 1000L);
@@ -668,7 +676,7 @@ public class StandardSession
* The servlet spec mandates to ignore request handling time
* in lastAccessedTime.
*/
-if (Globals.STRICT_SERVLET_COMPLIANCE) {
+if (LAST_ACCESS_AT_START) {
this.lastAccessedTime = this.thisAccessedTime;
this.thisAccessedTime = System.currentTimeMillis();
} else {
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=951985&r1=951984&r2=951985&view=diff
==
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Sun Jun 6 21:24:09 2010
@@ -228,6 +228,7 @@
org.apache.catalina.core.ApplicationDispatcher.WRAP_SAME_OBJECT
org.apache.catalina.core.StandardHostValve.ACCESS_SESSION
org.apache.catalina.session.StandardSession.ACTIVITY_CHECK
+
org.apache.catalina.session.StandardSession.LAST_ACCESS_AT_START
org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES.
org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR.
org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING.
@@ -368,6 +369,18 @@
else the default value will be false.
+
+ If this is true, the last accessed time for sessions will
+ be calculated from the beginning of the previous request. If
+ false, the last accessed time for sessions will be
calculated
+ from the end of the previous request. This also affects how the idle time
+ is calculated. If
+ org.apache.catalina.STRICT_SERVLET_COMPLIANCE is set to
+ true, the default of this setting will be true,
+ else the default value will be false.
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951989 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sun Jun 6 21:27:41 2010 New Revision: 951989 URL: http://svn.apache.org/viewvc?rev=951989&view=rev Log: Vote for better patch Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=951989&r1=951988&r2=951989&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 6 21:27:41 2010 @@ -165,13 +165,8 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49095 AprEndpoint does not wakeup accepts with deferred accept or BSD filters Based on a patch provided by Ruediger Pluem - https://issues.apache.org/bugzilla/attachment.cgi?id=25266 - +1: markt - -1: - +0: kkolinko: I updated the above patch to use explicit encoding when - creating the writer: https://issues.apache.org/bugzilla/attachment.cgi?id=25510 - +1: kkolinko, rjung + +1: kkolinko, rjung, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49343 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r951992 - in /tomcat/trunk/java/org/apache/catalina/ha: authenticator/ClusterSingleSignOn.java authenticator/ClusterSingleSignOnListener.java session/ClusterSessionListener.java
Author: markt Date: Sun Jun 6 21:31:20 2010 New Revision: 951992 URL: http://svn.apache.org/viewvc?rev=951992&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49376 Correct package names in info properties Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=951992&r1=951991&r2=951992&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java Sun Jun 6 21:31:20 2010 @@ -66,7 +66,7 @@ public class ClusterSingleSignOn * Descriptive information about this Valve implementation. */ protected static String info = -"org.apache.catalina.cluster.authenticator.ClusterSingleSignOn"; +"org.apache.catalina.ha.authenticator.ClusterSingleSignOn"; protected int messageNumber = 0; Modified: tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=951992&r1=951991&r2=951992&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java Sun Jun 6 21:31:20 2010 @@ -40,7 +40,7 @@ public class ClusterSingleSignOnListener /** * The descriptive information about this implementation. */ -protected static final String info = "org.apache.catalina.session.ClusterSingleSignOnListener/1.0"; +protected static final String info = "org.apache.catalina.ha.authenticator.ClusterSingleSignOnListener/1.0"; // - Properties Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=951992&r1=951991&r2=951992&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java Sun Jun 6 21:31:20 2010 @@ -39,7 +39,7 @@ public class ClusterSessionListener exte /** * The descriptive information about this implementation. */ -protected static final String info = "org.apache.catalina.session.ClusterSessionListener/1.1"; +protected static final String info = "org.apache.catalina.ha.session.ClusterSessionListener/1.1"; //--Constructor- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49376] Minor corrections to info properties.
https://issues.apache.org/bugzilla/show_bug.cgi?id=49376 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED OS/Version||All --- Comment #2 from Mark Thomas 2010-06-06 17:31:38 EDT --- Thanks for the patch. It has been applied to trunk and will be in 7.0.0 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r952000 - /tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Author: markt
Date: Sun Jun 6 21:50:11 2010
New Revision: 952000
URL: http://svn.apache.org/viewvc?rev=952000&view=rev
Log:
Make syncs consistent
Modified:
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=952000&r1=951999&r2=952000&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Sun Jun 6
21:50:11 2010
@@ -134,7 +134,12 @@ public abstract class LifecycleBase impl
setState(LifecycleState.STARTING_PREP);
-startInternal();
+try {
+startInternal();
+} catch (LifecycleException e) {
+setState(LifecycleState.FAILED);
+throw e;
+}
if (state.equals(LifecycleState.FAILED) ||
state.equals(LifecycleState.MUST_STOP)) {
@@ -296,7 +301,7 @@ public abstract class LifecycleBase impl
* @param state The new state for this component
* @param data The data to pass to the associated {...@link Lifecycle}
event
*/
-protected void setState(LifecycleState state, Object data) {
+protected synchronized void setState(LifecycleState state, Object data) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("lifecycleBase.setState", this, state));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r952001 - /tomcat/trunk/java/org/apache/catalina/core/StandardService.java
Author: markt
Date: Sun Jun 6 21:51:30 2010
New Revision: 952001
URL: http://svn.apache.org/viewvc?rev=952001&view=rev
Log:
Remainder of fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49372
Avoid invalid Lifecycle transitions on failed start due to already bound
shutdown port
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=952001&r1=952000&r2=952001&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Sun Jun 6
21:51:30 2010
@@ -479,7 +479,12 @@ public class StandardService extends Lif
// Stop our defined Connectors first
synchronized (connectors) {
for (int i = 0; i < connectors.length; i++) {
-((Lifecycle) connectors[i]).stop();
+// If Service fails to start, connectors may not have been
+// started
+if (!LifecycleState.INITIALIZED.equals(
+((Lifecycle) connectors[i]).getState())) {
+((Lifecycle) connectors[i]).stop();
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r952000 - svn:log
Author: markt Revision: 952000 Modified property: svn:log Modified: svn:log at Sun Jun 6 21:52:34 2010 -- --- svn:log (original) +++ svn:log Sun Jun 6 21:52:34 2010 @@ -1 +1,3 @@ Make syncs consistent +Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49372 +Avoid invalid Lifecycle transitions on failed start due to already bound shutdown port - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49372] 7.0.0RC: Starting second instance of Tomcat on the same port results in "An invalid Lifecycle transition was attempted"
https://issues.apache.org/bugzilla/show_bug.cgi?id=49372 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2010-06-06 17:53:16 EDT --- Fixed in trunk. Will be in 7.0.0 onwards -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 49395] New: manager.findLeaks : display the date when the leaking context was started
https://issues.apache.org/bugzilla/show_bug.cgi?id=49395 Summary: manager.findLeaks : display the date when the leaking context was started Product: Tomcat 7 Version: trunk Platform: Macintosh Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: sylvain.laur...@gmail.com Created an attachment (id=25535) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25535) patch for tomcat 6 It would be nice if the "find leaks" feature of the manager servlet provided the date and time at which the leaking context was started. I provide patches for tomcat 7 and 6 to do that. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 49395] manager.findLeaks : display the date when the leaking context was started
https://issues.apache.org/bugzilla/show_bug.cgi?id=49395 --- Comment #1 from sylvain.laur...@gmail.com 2010-06-06 17:57:55 EDT --- Created an attachment (id=25536) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25536) patch for tomcat 7 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 49395] manager.findLeaks : display the date when the leaking context was started
https://issues.apache.org/bugzilla/show_bug.cgi?id=49395 Mark Thomas changed: What|Removed |Added OS/Version||All --- Comment #2 from Mark Thomas 2010-06-06 17:58:58 EDT --- What is the use case for this? I can't see what problem you are trying to solve. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 49395] manager.findLeaks : display the date when the leaking context was started
https://issues.apache.org/bugzilla/show_bug.cgi?id=49395 --- Comment #3 from Konstantin Kolinko 2010-06-06 19:23:55 EDT --- Interesting, though there are some issues 1) Host.findReloadedContextMemoryLeaks is callable through JMX. I need to test it, but I suppose that ContextLeakInfo cannot be rendered by JConsole. 2) It looks like an API change for me. 3) I would like to see not only when the context was started, but also when it was stopped. 4) ContextLeakInfo.java needs the Apache license header. 5) i18n. 6) As a further enhancement I think that the result returned by StandardHost.findReloadedContextMemoryLeaks() might be sorted by contextPath and then by startDate. 7) The documentation has to be updated: manager-howto.xml, html-manager-howto.xml I think that the use cases for this improvement are the following: Knowing the times will allow someone to a) distinguish new results from the old ones, which is needed because the information on the leaked contexts accumulates over time. b) match the leaked application instance to a certain time frame in the deployment history of that web application, its logs, GC logs. E.g. if not each start/stop cycle exposes the leak, or if GC cannot be forced and we must wait some time before it occurs naturally. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r952021 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sun Jun 6 23:39:53 2010 New Revision: 952021 URL: http://svn.apache.org/viewvc?rev=952021&view=rev Log: Comment Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=952021&r1=952020&r2=952021&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 6 23:39:53 2010 @@ -95,6 +95,7 @@ PATCHES PROPOSED TO BACKPORT: Though you need to configure a VirtualWebappLoader to test that: without it the property is always a zero-length array. Mark: Does your +1 stand including the second part of the path? + markt: Yes Add property "searchExternalFirst" to WebappLoader: If set, the external repositories will be searched before - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r952022 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/authenticator/ java/org/apache/catalina/ha/session/ webapps/docs/
Author: markt
Date: Sun Jun 6 23:43:17 2010
New Revision: 952022
URL: http://svn.apache.org/viewvc?rev=952022&view=rev
Log:
Fix missing message text and logging with unexpected logger issues in cluster
listeners
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.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=952022&r1=952021&r2=952022&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 6 23:43:17 2010
@@ -135,12 +135,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: rjung, markt, kkolinko
-1:
-* Fix missing message text and logging with unexpected logger issues in cluster
- listeners
- http://people.apache.org/~markt/patches/2010-05-19-lost-messages.patch
- +1: markt, rjung, kkolinko
- -1:
-
* Fix ByteChunk.indexOf(String, ...) when the string is of length 1
http://svn.apache.org/viewvc?rev=945231&view=rev
+1: kkolinko, markt, rjung
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=952022&r1=952021&r2=952022&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
Sun Jun 6 23:43:17 2010
@@ -24,6 +24,8 @@ import org.apache.catalina.Session;
import org.apache.catalina.ha.ClusterManager;
import org.apache.catalina.ha.ClusterMessage;
import org.apache.catalina.ha.ClusterListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Receive replicated SingleSignOnMessage form other cluster node.
@@ -32,6 +34,9 @@ import org.apache.catalina.ha.ClusterLis
*/
public class ClusterSingleSignOnListener extends ClusterListener {
+private static final Log log =
+LogFactory.getLog(ClusterSingleSignOnListener.class);
+
/**
* The descriptive information about this implementation.
*/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=952022&r1=952021&r2=952022&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
Sun Jun 6 23:43:17 2010
@@ -19,9 +19,11 @@ package org.apache.catalina.ha.session;
import java.util.Map;
+import org.apache.catalina.ha.ClusterListener;
import org.apache.catalina.ha.ClusterManager;
import org.apache.catalina.ha.ClusterMessage;
-import org.apache.catalina.ha.*;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Receive replicated SessionMessage form other cluster node.
@@ -30,7 +32,10 @@ import org.apache.catalina.ha.*;
* @version $Id$
*/
public class ClusterSessionListener extends ClusterListener {
-
+
+private static final Log log =
+LogFactory.getLog(ClusterSessionListener.class);
+
/**
* The descriptive information about this implementation.
*/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java?rev=952022&r1=952021&r2=952022&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
Sun Jun 6 23:43:17 2010
@@ -24,9 +24,12 @@ import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.Session;
+import org.apache.catalina.ha.ClusterListener;
import org.apache.catalina.ha.ClusterMessage;
import org.apache.catalina.core.StandardEngine;
-import org.apache.catalina.ha.*;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat
svn commit: r952023 - in /tomcat/tc6.0.x/trunk: STATUS.txt dist.xml webapps/docs/changelog.xml
Author: markt Date: Sun Jun 6 23:46:22 2010 New Revision: 952023 URL: http://svn.apache.org/viewvc?rev=952023&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990 Fix the skip.installer build property so once set, the Windows installer is skipped but all the other artifacts are created Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/dist.xml 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=952023&r1=952022&r2=952023&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 6 23:46:22 2010 @@ -140,13 +140,6 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, markt, rjung -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990 - Fix the skip.installer build property so once set, the Windows installer is - skipped but all the other artifacts are created - https://issues.apache.org/bugzilla/attachment.cgi?id=25477&action=edit - +1: markt, kkolinko, rjung - -1: - * Fix issues running AJP BIO coyote connector under a security manager http://svn.apache.org/viewvc?rev=947717&view=rev (less changes to loadUtilPackage()) +1: markt, kkolinko, rjung Modified: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=952023&r1=952022&r2=952023&view=diff == --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Sun Jun 6 23:46:22 2010 @@ -210,6 +210,28 @@ + + + + + + + + + + + + + + + @@ -305,26 +327,6 @@ - - - - - - - - - - - - - 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=952023&r1=952022&r2=952023&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jun 6 23:46:22 2010 @@ -270,6 +270,10 @@ Remove unused code from org.apache.tomcat.util.buf classes. (kkolinko) + +Fix the skip.installer build property so if set, only the Windows +installer is skipped. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48990] Build fails on Linux when skip.installer set to true
https://issues.apache.org/bugzilla/show_bug.cgi?id=48990 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #9 from Mark Thomas 2010-06-06 19:46:33 EDT --- Fixed in 6.0.x and will be in 6.0.27 onwards -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r952026 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/security/ java/org/apache/coyote/http11/ webapps/docs/
Author: markt Date: Sun Jun 6 23:56:45 2010 New Revision: 952026 URL: http://svn.apache.org/viewvc?rev=952026&view=rev Log: Fix issues running AJP BIO coyote connector under a security manager Additional clean-up Modified: tomcat/tc6.0.x/trunk/ (props changed) 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/coyote/http11/Http11AprProcessor.java tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 6 23:56:45 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945808,945835,945841,946686,948057 ,950164,950596,950614,951615 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,7833
svn commit: r952044 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon Jun 7 01:07:14 2010 New Revision: 952044 URL: http://svn.apache.org/viewvc?rev=952044&view=rev Log: Add issue number It is followup to r952023 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=952044&r1=952043&r2=952044&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jun 7 01:07:14 2010 @@ -262,6 +262,10 @@ Update to NSIS 2.46. (kkolinko) +48990: Fix the skip.installer build property +so if set, only the Windows installer is skipped. (markt) + + 49178: Provide in catalina.policy an example of additional permissions that might be needed for code located in $CATALINA_BASE/lib. (markt) @@ -273,10 +277,6 @@ Remove unused code from org.apache.tomcat.util.buf classes. (kkolinko) - -Fix the skip.installer build property so if set, only the Windows -installer is skipped. (markt) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r952051 - /tomcat/tc6.0.x/trunk/dist.xml
Author: kkolinko Date: Mon Jun 7 01:17:09 2010 New Revision: 952051 URL: http://svn.apache.org/viewvc?rev=952051&view=rev Log: replace tab with whitespace Modified: tomcat/tc6.0.x/trunk/dist.xml Modified: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=952051&r1=952050&r2=952051&view=diff == --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Mon Jun 7 01:17:09 2010 @@ -210,7 +210,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48990] Build fails on Linux when skip.installer set to true
https://issues.apache.org/bugzilla/show_bug.cgi?id=48990 --- Comment #10 from Konstantin Kolinko 2010-06-06 22:24:03 EDT --- Created an attachment (id=25537) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25537) 2010-06-07_tc55_bug48990.patch Looking at comment #3 and how the build file is implemented, it looks that it is a problem for 5.5 as well. I am attaching patch that fixes this issue in Tomcat 5.5 (backport of r952023) AND introduces support for "skip.installer" property. Defining the "skip.installer" property will allow to skip creating the installer when running Tomcat 5.5 build on Windows. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 48990] Build fails on Linux when skip.installer set to true
https://issues.apache.org/bugzilla/show_bug.cgi?id=48990 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|REOPENED Component|Catalina|Catalina Version|6.0.26 |5.5.28 Resolution|FIXED | Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #11 from Konstantin Kolinko 2010-06-06 23:50:58 EDT --- Testing with just "skip.installer" part of the above tc5.5 patch, I should say that I do not see any build failures. I.e., the Unix builds of 5.5.28 should build successfully. The only thing is that zip/tar.gz files created by such build will differ with the ones created on Windows in that they do not include the following files and folders: bin/tomcat5.exe bin/tomcat5w.exe bin/tcnative-1.dll bin/i64/ bin/i64/tomcat5.exe bin/i64/tcnative-1.dll bin/x64/ bin/x64/tomcat5.exe bin/x64/tcnative-1.dll The effect of the above tc5.5 patch (attachment 25537) is that A) it will align zip/tar.gz files created by building a release on Unix with the ones on Windows. The ones on Unix will not omit the above said exe/dll files. B) it will provide support for "skip.installer" property Reopening, changing Product, Version to track it in Tomcat 5.5. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r952078 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Jun 7 03:57:01 2010 New Revision: 952078 URL: http://svn.apache.org/viewvc?rev=952078&view=rev Log: proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=952078&r1=952077&r2=952078&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Jun 7 03:57:01 2010 @@ -74,3 +74,11 @@ PATCHES PROPOSED TO BACKPORT: https://issues.apache.org/bugzilla/attachment.cgi?id=25534 +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990#c11 + Do not omit exe and dll files in release builds built on Unixes, + to align them with the official ones built on Windows. + Add support for "skip.installer" property. + https://issues.apache.org/bugzilla/attachment.cgi?id=25537 + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48990] Build fails on Linux when skip.installer set to true
https://issues.apache.org/bugzilla/show_bug.cgi?id=48990 --- Comment #12 from Konstantin Kolinko 2010-06-06 23:57:55 EDT --- The patch was proposed for 5.5. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
Re: svn commit: r952000 - /tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
2010/6/7 :
> Author: markt
> Date: Sun Jun 6 21:50:11 2010
> New Revision: 952000
>
> URL: http://svn.apache.org/viewvc?rev=952000&view=rev
> Log:
> Make syncs consistent
> Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49372
> Avoid invalid Lifecycle transitions on failed start due to already bound
> shutdown port
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
>
> +++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Sun Jun 6
> 21:50:11 2010
> @@ -134,7 +134,12 @@ public abstract class LifecycleBase impl
>
> setState(LifecycleState.STARTING_PREP);
>
> - startInternal();
> + try {
> + startInternal();
> + } catch (LifecycleException e) {
> + setState(LifecycleState.FAILED);
> + throw e;
> + }
>
> if (state.equals(LifecycleState.FAILED) ||
> state.equals(LifecycleState.MUST_STOP)) {
Probably RuntimeException and Error should also move it into the
FAILED state? E.g.
boolean startDone = false;
try {
startInternal();
startDone = true;
} finally {
if (!startDone) {
setState(LifecycleState.FAILED);
}
}
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r952090 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Author: kkolinko
Date: Mon Jun 7 04:34:08 2010
New Revision: 952090
URL: http://svn.apache.org/viewvc?rev=952090&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49095
AprEndpoint does not wakeup accepts with deferred accept or BSD filters
Based on a patch provided by Ruediger Pluem
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.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=952090&r1=952089&r2=952090&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jun 7 04:34:08 2010
@@ -140,13 +140,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49095
- AprEndpoint does not wakeup accepts with deferred accept or BSD filters
- Based on a patch provided by Ruediger Pluem
- https://issues.apache.org/bugzilla/attachment.cgi?id=25510
- +1: kkolinko, rjung, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49343
When ChannelException is thrown, remove listener from channel.
http://svn.apache.org/viewvc?view=revision&revision=948402
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=952090&r1=952089&r2=952090&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon
Jun 7 04:34:08 2010
@@ -17,6 +17,7 @@
package org.apache.tomcat.util.net;
+import java.io.OutputStreamWriter;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.ArrayList;
@@ -906,6 +907,19 @@ public class AprEndpoint {
log.debug("About to unlock socket for: " + saddr);
}
s.connect(saddr, unlockTimeout);
+/*
+ * In the case of a deferred accept / accept filters we need to
+ * send data to wake up the accept. Send OPTIONS * to bypass even
+ * BSD accept filters. The Acceptor will discard it.
+ */
+if (deferAccept) {
+OutputStreamWriter sw;
+
+sw = new OutputStreamWriter(s.getOutputStream(), "ISO-8859-1");
+sw.write("OPTIONS * HTTP/1.0\r\n"
++ "User-Agent: Tomcat wakeup connection\r\n\r\n");
+sw.flush();
+}
} catch(Exception e) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("endpoint.debug.unlock", "" + port), e);
@@ -1153,6 +1167,15 @@ public class AprEndpoint {
try {
// Accept the next incoming connection from the server
socket
long socket = Socket.accept(serverSock);
+/*
+ * In the case of a deferred accept unlockAccept needs to
+ * send data. This data will be rubbish, so destroy the
+ * socket and don't process it.
+ */
+if (deferAccept && (paused || !running)) {
+Socket.destroy(socket);
+continue;
+}
// Hand this socket off to an appropriate processor
if (!processSocketWithOptions(socket)) {
// Close socket and pool right away
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=952090&r1=952089&r2=952090&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jun 7 04:34:08 2010
@@ -166,6 +166,11 @@
48917: Correct name of mod_jk module in ApacheConfig. Patch
provided by Todd Hicks. (markt)
+
+49095: AprEndpoint did not wakeup acceptors during shutdown
+when deferAccept option was enabled. Based on a patch provided by
+Ruediger Pluem. (kkolinko)
+
Use chunked encoding for http 1.1 requests with no content-length
(regardless of keep-alive) so client can differentiate between complete
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49095] org.apache.tomcat.util.net.AprEndpoint.unlockAccept does not wakeup accepts with deferred accept or BSD filters
https://issues.apache.org/bugzilla/show_bug.cgi?id=49095 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Konstantin Kolinko 2010-06-07 01:11:05 EDT --- Fixed in 6.0 in r952090 and will be in 6.0.27 onwards. Note, that all the affected lines are guarded by if(deferAccept) clauses. It is easy to remove that clause and extend this implementation of unlockAccept() that sends a valid "OPTIONS" request upon other connector implementations. Is it worth doing? Regarding the 'BSD filters': apparently the documentation on them is here: [1], [2] [1] http://www.freebsd.org/cgi/man.cgi?query=accept_filter&sektion=9 [2] http://www.freebsd.org/cgi/man.cgi?query=setsockopt&sektion=2 (see SO_ACCEPTFILTER) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
