Catalina

Fix custom UTF-8 decoder so that a byte of value 0xC1 is always rejected immediately as it is never valid in a UTF-8 byte sequence. Update UTF-8 decoder tests to account for UTF-8 decoding improvements in Java 8. The custom UTF-8 decoder is still required due to bugs in the UTF-8 decoder provided by Java. Java 8's decoder is better than Java 7's but it is still buggy. (markt) 56027: Add more options for managing FIPS mode in the AprLifecycleListener. (schultz/kkolinko) 56321: When a WAR is modified, undeploy the web application before deleting any expanded directory as the undeploy process may refer to classes that need to be loaded from the expanded directory. If the expanded directory is deleted first, any attempt to load a new class during undeploy will fail. (markt) 56339: Avoid an infinite loop if an application calls session.invalidate() from the session destroyed event for that session. (markt) 56365: Simplify file name pattern matching code in StandardJarScanner. Ignore leading and trailing whitespace and empty strings when configuring patterns. Improve documentation. (kkolinko) 56369: Ensure that removing an MBean notification listener reverts all the operations performed when adding an MBean notification listener. (markt) 56382: Information about finished deployment and its execution time is added to the log files. Patch is provided by Danila Galimov. (violetagg) 56383: Properties for disabling server information and error report are added to the org.apache.catalina.valves.ErrorReportValve. Based on the patch provided by Nick Bunn. (violetagg/kkolinko) Only create XML parsing objects if required and fix associated potential memory leak in the default Servlet. (markt) Modify generic exception handling so that StackOverflowError is not treated as a fatal error and can handled and/or logged as required. (markt) 56409: Avoid StackOverflowError on non-Windows systems if a file named \ is encountered when scanning for TLDs. (markt) 56430: Extend checks for suspicious URL patterns to include patterns of the form *.a.b which are not valid patterns for extension mappings. (markt) Extend XML factory, parser etc. memory leak protection to cover some additional locations where, theoretically, a memory leak could occur. (markt) Ensure that a TLD parser obtained from the cache has the correct value of blockExternal. (markt) 56441: Raise the visibility of exceptions thrown when a problem is encountered calling a getter or setter on a component attribute. The logging level is raised from debug to warning. (markt) 56451: Make resources accessed via a context alias accessible via JNDI in the same way standard resources are available. (markt) 56463: Property for disabling server information is added to the DefaultServlet. Server information is presented in the response sent to the client when directory listings is enabled. (violetagg) Add the org.apache.naming package to the packages requiring code to have the defineClassInPackage permission when running under a security manager. (markt) Add the org.apache.naming.resources package to the packages requiring code to have the accessClassInPackage permission when running under a security manager. (markt) Make the naming context tokens for containers more robust. Require RuntimePermission when introducing a new token. (markt/kkolinko) 56472: Allow NamingContextListener to clean up on stop if its start failed. (kkolinko) 56492: Avoid eclipse debugger pausing on uncaught exceptions when tomcat renews its threads. (slaurent) Minor fixes to ThreadLocalLeakPreventionListener. Do not trigger threads renewal for failed contexts. Do not ignore threadRenewalDelay setting. Improve documentation. (kkolinko) Correct regression introduced in r797162 that broke authentication of users when using the JAASMemoryLoginModule. (markt) 56501: HttpServletRequest.getContextPath() should return the undecoded context path used by the user agent. (markt) 56523: When using SPNEGO authentication, log the exceptions associated with failed user logins at debug level rather than error level. (markt) 56536: Ensure that HttpSessionBindingListener.valueUnbound() uses the correct class loader when the SingleSignOn valve is used. (markt)

Coyote

56399: Assert that both Coyote and Catalina request objects have been properly recycled. (kkolinko) 56416: Correct documentation for default value of socket linger for the AJP and HTTP connectors. (markt)

Jasper

56334: Fix a regression in the handling of back-slash escaping introduced by the fix for 55735. (markt/kkolinko) 56425: Improve method matching for EL expressions. When looking for matching methods, an exact match between parameter types is preferred followed by an assignable match followed by a coercible match. (markt) Correct the handling of back-slash escaping in the EL parser and no longer require that \$ or \# must be followed by { in order for the back-slash escaping to take effect. (markt) 56529: Avoid NoSuchElementException while handling attributes with empty string value in custom tags. Patch provided by Hariprasad Manchi. (violetagg)

Cluster

Remove cluster and replicationValve from cluster manager template. These instance are not necessary to template. (kfujino) Add support for cross context session replication to org.apache.catalina.ha.session.BackupManager. (kfujino) Remove the unnecessary cross context check. It does not matter whether the context that is referenced by other context is set to crossContext=true. The context that refers to the different context must be set to crossContext=true. (kfujino) Move to org.apache.catalina.ha.session.ClusterManagerBase common logics of org.apache.catalina.ha.session.BackupManager and org.apache.catalina.ha.session.DeltaManager. (kfujino) Simplify the code of o.a.c.ha.tcp.SimpleTcpCluster. In order to add or remove cluster valve to Container, use pipeline instead of IntrospectionUtils. (kfujino) There is no need to set cluster instance when SimpleTcpCluster.unregisterClusterValve is called. Set null than cluster instance for cleanup. (kfujino) Backport refactoring of AbstractReplicatedMap to implement Map rather than extend ConcurrentHashMap to enable Tomcat 7 to be built with Java 8. (markt)

WebSocket

56343: Avoid a NPE if Tomcat's Java WebSocket 1.0 implementation is used with the Java WebSocket 1.0 API JAR from the reference implementation. (markt) Increase the default maximum size of the executor used by the WebSocket implementation for call backs associated with asynchronous writes from 10 to 200. (markt) Add a warning if the thread group created for WebSocket asynchronous write call backs can not be destroyed when the web application is stopped. (markt) Ensure that threads created to support WebSocket clients are stopped when no longer required. This will happen automatically for WebSocket client connections initiated by web applications but stand alone clients must call WsWebSocketContainer.destroy(). (markt) 56449: When creating a new session, add the message handlers to the session before calling Endpoint.onOpen() so the message handlers are in place should the onOpen() method trigger the sending of any messages. (markt) 56458: Report WebSocket sessions that are created over secure connections as secure rather than as not secure. (markt) Stop threads used for secure WebSocket client connections when they are no longer required and give them better names for easier debugging while they are running. (markt)

Web applications

Add Support for copyXML attribute of Host to Host Manager. (kfujino) Ensure that "name" request parameter is used as a application base of host if "webapps" request parameter is not set when adding host in HostManager Application. (kfujino) Correct documentation on Windows service options, aligning it with Apache Commons Daemon documentation. (kkolinko) 55215: Improve log4j configuration example. Clarify access logging documentation. Based on patches provided by Brian Burch. (kkolinko) 55383: Backport improved HTML markup for tables and code fragments from Tomcat 8 documentation. (kkolinko) 56418: Ensure that the Manager web application does not report success for a web application deployment that fails. (slaurent) Fix target and rel attributes on links in documentation. They were lost during XSLT transformation. (kkolinko) Improve valves documentation. Split valves into groups. (kkolinko)

Other

Align DisplayName of Tomcat installed by service.bat with one installed by the *.exe installer. Print a warning in case if neither server nor client jvm is found by service.bat. (kkolinko) 56363: Update to version 1.1.30 of Tomcat Native library. (schultz) Update package renamed Apache Commons BCEL to r1593495 to pick up some additional changes for Java 7 support and some code clean up. (markt) In tests: allow to configure directory where JUnit reports and access log are written to. (kkolinko)

Catalina

Make it easier for applications embedding and/or extending Tomcat to modify the javaseClassLoader attribute of the WebappClassLoader. (markt) Improve the robustness of web application undeployment based on some code analysis triggered by the report for 54315. (markt) 56219: Improve merging process for web.xml files to take account of the elements and attributes supported by the Servlet version of the merged file. (markt) 56190: The response should be closed (i.e. no further output is permitted) when a call to AsyncContext.complete() takes effect. (markt) 56236: Enable Tomcat to work with alternative Servlet and JSP API JARs that package the XML schemas in such as way as to require a dependency on the JSP API before enabling validation for web.xml. Tomcat has no such dependency. (markt) 56246: Fix NullPointerException in MemoryRealm when authenticating an unknown user. (markt) 56248: Allow the deployer to update an existing WAR file without undeploying the existing application if the update flag is set. This allows any existing custom context.xml for the application to be retained. To update an application and remove any existing context.xml simply undeploy the old version of the application before deploying the new version. (markt) Redefine the globalXsltFile initialisation parameter of the DefaultServlet as relative to CATALINA_BASE/conf or CATALINA_HOME/conf. Prevent user supplied XSLTs used by the DefaultServlet from defining external entities. (markt) Add a work around for validating XML documents (often TLDs) that use just the file name to refer to refer to the JavaEE schema on which they are based. (markt) 56293: Cache resources loaded by the class loader from /META-INF/services/ for better performance for repeated look ups. (markt)

Coyote

53119: Make sure the NIO AJP output buffer is cleared on any error to prevent any possible overflow if it is written to again before the connection is closed. This extends the original fix for the APR/native output buffer to the NIO connector. (kkolinko) 56172: Avoid possible request corruption when using the AJP NIO connector and a request is sent using more than one AJP message. Patch provided by Amund Elstad. (markt) 56213: Reduce garbage collection when the NIO connector is under heavy load. (markt) Improve processing of chuck size from chunked headers. Avoid overflow and use a bit shift instead of a multiplication as it is marginally faster. (markt/kkolinko) Fix possible overflow when parsing long values from a byte array. (markt)

Jasper

54475: Add Java 8 support to SMAP generation for JSPs. Patch by Robbie Gibson. (markt) 55483: Improve handing of overloaded methods and constructors in expression language implementation. (markt) 56208: Restore the validateXml option to Jasper that was previously renamed validateTld. Both options are now supported. validateXml controls the validation of web.xml files when Jasper parses them and validateTld controls the validation of *.tld files when Jasper parses them. (markt) 56223: Throw an IllegalStateException if a call is made to ServletContext.setInitParameter() after the ServletContext has been initialized. (markt) 56265: Do not escape values of dynamic tag attributes containing EL expressions. (kkolinko) Make the default compiler source and target versions for JSPs Java 6 since Tomcat 7 requires Java 6 as a minimum. (markt) 56283: Update to the Eclipse JDT Compiler P20140317-1600 which adds support for Java 8 syntax to JSPs. Add support for value "1.8" for the compilerSourceVM and compilerTargetVM options. (markt)

WebSocket

Avoid a possible deadlock when one thread is shutting down a connection while another thread is trying to write to it. (markt) Call onError if an exception is thrown calling onClose when closing a session. (remm)

Web applications

In the documentation: add support for several documentation tags from Tomcat 8. Such as <version-major/>. (kkolinko) 56093: Add the SSL Valve to the documentation web application. (markt) 56217: Improve readability by using left alignment for the table cell containing the request information on the Manager application status page. (markt) Fixed java.lang.NegativeArraySizeException when using "Expire sessions" command in the manager web application on a context where the session timeout is disabled. (kfujino) Add support for LAST_ACCESS_AT_START system property to Manager web application. (kfujino) Add definition of org.apache.catalina.ant.FindLeaksTask. (kfujino) 56273: If the Manager web application does not perform an operation because the web application is already being serviced, report an error rather than reporting success. (markt) 56304: Add a note to the documentation about not using WebSocket with BIO HTTP in production. (markt)

Other

56143: Improve service.bat so that it can be launched from a non-UAC console. This includes using a single call to tomcat7.exe to install the Windows service rather than three calls, and using command line arguments instead of environment variables to pass the settings. (markt/kkolinko) Fix regression in 7.0.52: when using service.bat install to install the service the values for --StdOutput, --StdError options were passed as blank instead of "auto". (kkolinko) Align options between service.bat and exe Windows installer. For service.bat the changes are in --Classpath, --DisplayName, --StartPath, --StopPath. For exe installer the changes are in --JvmMs, --JvmMx options, which are now 128 Mb and 256 Mb respectively instead of being empty. Explicitly specify --LogPath path when uninstalling Windows service, avoiding default value for that option. (kkolinko) Simplify Windows *.bat files: remove %OS% checks, as java 6 does not run on ancient non-NT operating systems. (kkolinko) 56137: Explicitly use the BIO connector in the SSL example in server.xml so it doesn't break if APR is enabled. (markt) 56139: Avoid a web application class loader leak in some unit tests when running on Windows. (markt) Correct build script to avoid building JARs with empty packages. (markt) Allow to limit JUnit test run to a number of selected test case methods. (kkolinko) 56189: Remove used file cpappend.bat from the distribution. (markt)

Catalina

Generate a valid root element for the effective web.xml for a web application for all supported versions of web.xml. (markt)

Coyote

Pull up SocketWrapper to AbstractProcessor. (markt) In some circumstances asynchronous requests could time out too soon. (markt)

Catalina

55287: ServletContainerInitializer defined in the container may not be found. (markt/jboynes) 55855: Provide a per Context option (containerSciFilter) to exclude container SCIs. (markt) 55937: When deploying applications, treat a context path of /ROOT as equivalent to /. (markt) 55943: Improve the implementation of the class loader check that prevents web applications from trying to override J2SE implementation classes. As part of this fix, refactor the way a null parent class loader is handled which enables a number of null checks and object creation calls to be removed. (markt) 55958: Differentiate between foo.war the WAR file and foo.war the directory. (markt) 55960: Improve the single sign on (SSO) unit tests. Patch provided by Brian Burch. (markt) 55974: Retain order when reporting errors and warnings while parsing XML configuration files. (markt) 56013: Fix issue with SPNEGO authentication when using IBM JREs. IBM JREs only understand the option of infinite lifetime for Kerberos credentials. Based on a patch provided by Arunav Sanyal. (markt) 56016: When loading resources for XML schema validation, take account of the possibility that servlet-api.jar and jsp-api.jar may not be loaded by the same class loader. Patch by Juan Carlos Estibariz. (markt) 56025: When creating a WebSocket connection, always call ServerEndpointConfig.Configurator.getNegotiatedSubprotocol() and always create the EndPoint instance after calling ServerEndpointConfig.Configurator.modifyHandshake(). (markt) 56032: Ensure that the WebSocket connection is closed after an IO error or an interrupt while sending a WebSocket message. (markt) 56042: If a request in async mode has an error but has already been dispatched don't generate an error page in the ErrorReportValve so the dispatch target can handle it. (markt) Add missing javax.annotation.sql.* classes to annotations-api.jar. (markt) The type of logger attribute of Context MBean should be not org.apache.commons.logging.Log but org.apache.juli.logging.Log. (kfujino) 56082: Fix a concurrency bug in JULI's LogManager implementation. (markt) 56096: When the attribute rmiBindAddress of the JMX Remote Lifecycle Listener is specified it's value will be used when constructing the address of a JMX API connector server. Patch is provided by Jim Talbut. (violetagg) When environment entry with one and the same name is defined in the web deployment descriptor and with annotation then the one specified in the web deployment descriptor is with priority. (violetagg) Change default value of xmlBlockExternal attribute of Context. It is true now. (kkolinko)

Coyote

Avoid possible NPE if a content type is specified without a character set. (markt) 55956: Make the forwarded remote IP address available to the Connectors via a request attribute. (markt) 55976: Fix sendfile support for the HTTP NIO connector. (markt) 55996: Ensure Async requests timeout correctly when using the NIO HTTP connector. (markt) 56021: Make it possible to use the Windows-MY key store with the BIO and NIO connectors for SSL configuration. It requires a keystoreFile="" keystoreType="Windows-My" to be set on the connector. Based on a patch provided by Asanka. (markt)

Jasper

Correct a regression in the XML refactoring that meant that errors in TLD files were swallowed. (markt) 55671: Correct typo in the log message for a wrong value of genStringAsCharArray init-param of JspServlet. This parameter had a different name in Tomcat 6. (kkolinko) 55973: Fix processing of XML schemas when validation is enabled in Jasper. (kkolinko) 56010: Don't throw an IllegalArgumentException when JspFactory.getPageContext is used with JspWriter.DEFAULT_BUFFER. Based on a patch by Eugene Chung. (markt) 56012: When using the extends attribute of the page directive do not import the super class if it is in an unnamed package as imports from unnamed packages are now explicitly illegal. (markt) 56029: A regression in the fix for 55198 meant that when EL containing a ternary expression was used in an attribute a compilation error would occur for some expressions. (markt) Correct several errors in jspxml Schema and DTD. (kkolinko) Change default value of the blockExternal attribute of JspC task. The default value is true. Add support for -no-blockExternal switch when JspC is run as a standalone application. (kkolinko)

Cluster

Simplify the code of o.a.c.ha.tcp.SimpleTcpCluster.createManager(String). Remove unnecessary class cast. (kfujino)

WebSocket

Do not return an empty string for the Sec-WebSocket-Protocol HTTP header when no sub-protocol has been requested or no sub-protocol could be agreed as RFC6455 requires that no Sec-WebSocket-Protocol header is returned in this case. (markt)

Web applications

Add index.xhtml to the welcome files list for the examples web application. (kkolinko) Clarify that the connectionTimeout may also be used as the read timeout when reading a request body (if any) in the documentation web application. (markt) Clarify the behaviour of the maxConnections attribute for a connector in the documentation web application. (markt) 55888: Update the documentation web application to make it clearer that a Container may define no more than one Realm. (markt) 55956: Where available, displayed the forwarded remote IP address available on the status page of the Manager web application. (markt) Correct links to the Tomcat mailing lists in the ROOT web application. (kkolinko) In Manager web application improve handling of file upload errors. Display a message instead of error 500 page. Simplify parts handling code, as it is known that Tomcat takes care of them when recycling a request. (kkolinko)

Extras

55166, 56045: Copy the XML schemas used for validation that are packaged in jsp-api.jar to servlet-api.jar so that an embedded Tomcat instance can start without Jasper being available. This also enables validation to work without Jasper being available. (markt/kkolinko) 56039: Enable the JmxRemoteLifecycleListener to work over SSL. Patch by esengstrom. (markt)

Other

55743: Enable the stop script to work when the shutdown port is disabled and a PID file is defined. This is only available on platforms that use catalina.sh. (markt) 55986: When forcing Tomcat to stop via kill -9 $CATALINA_PID, the catalina.sh script could incorrectly report that Tomcat had not yet completely stopped when it had. Based on a patch by jess. (markt) Package correct license and notice files with embedded JARs. (markt) Remove svn keywords (such as $Id) from source files and documentation. (kkolinko) Fix CVE-2014-0050, a denial of service with a malicious, malformed Content-Type header and multipart request processing. Fixed by merging latest code (r1565163) from Commons FileUpload. (markt) 56115: Expose the httpusecaches property of Ant's get task as some users may need to change the default. Based on a suggestion by Anthony. (markt)

Catalina

Handle the case where a context.xml file is added to a web application deployed from a directory. Previously the file was ignored until Tomcat was restarted. Now (assuming automatic deployment is enabled) it will trigger a redeploy of the web application. (markt) Fix string comparison in HostConfig.setContextClass(). (kkolinko) Streamline handling of WebSocket messages when no handler is configured for the message currently being received. (markt) Handle the case where a WebSocket annotation configures a message size limit larger than the default permitted by Tomcat. (markt) 55855: This is a partial fix that bypasses the relatively expensive check for a WebSocket upgrade request if no WebSocket endpoints have been registered. (markt) 55905: Prevent a NPE when web.xml references a taglib file that does not exist. Provide better error message. (violetagg)

Coyote

When using the BIO connector with an internal executor, do not display a warning that the executor has not shutdown as the default configuration for BIO connectors is not to wait. This is because threads in keep-alive connections cannot be interrupted and therefore the warning was nearly always displayed. (markt)

Jasper

JspC uses servlet context initialization parameters to pass configuration so ensure that the servlet context used supports initialization parameters. (markt)

Cluster

In AbstractReplicatedMap#finalize, remove rpcChannel from channel Listener of group channel before sending MapMessage.MSG_STOP message. This prevents that the node that sent the MapMessage.MSG_STOP by normal shutdown is added to member map again by ping at heartbeat thread in the node that received the MapMessage.MSG_STOP. (kfujino) Add time stamp to GET_ALL_SESSIONS message. (kfujino)

Web applications

Fix the sample configuration of StaticMembershipInterceptor in order to prevent warning log. uniqueId must be 16 bytes. (kfujino)

Extras

Update dependencies that are used to build tomcat-juli extras component. Apache Avalon Framework is updated to version 4.1.5, Apache Log4J to version 1.2.17. (rjung)

Catalina

Correct a regression in the new XML local resolver that triggered false failures when XML validation was configured. (markt) Prevent a NPE when destroying HTTP upgrade handler for WebSocket connections. (violetagg)

Catalina

51294: Add support for unpacking WARs located outside of the Host's appBase in to the appBase. (markt) 55656: Configure the Digester to use the server class loader when parsing server.xml rather than the class loader that loaded StandardServer. Patch provided by Roberto Benedetti. (markt) 55664: Correctly handle JSR 356 WebSocket Encoder, Decoder and MessageHandler implementations that use a generic type such as Encoder.Text<List<String>>. Includes a test case by Niki Dokovski. (markt) Correctly handle WebSocket Encoders, Decoders and MessageHandlers that use arrays of generic types. (markt) 55681: Ensure that the WebSocket session is made available to MessageHandler method calls. (markt) Updated servlet spec version and documentation section-number reported when JAR files are rejected for containing a trigger class (e.g. javax.servlet.Servlet). (schultz) Modify the WebSocket handshake process so that the user properties Map exposed by the ServerEndpointConfig during the call to Configurator.modifyHandshake() is unique to the connection rather than shared by all connections associated with the Endpoint. This allows for easier configuration of per connection properties from within modifyHandshake(). (markt) 55684: Log a warning but continue if the memory leak detection code is unable to access all threads to check for possible memory leaks when a web application is stopped. (markt) Define the web-fragment.xml in tomcat7-websocket.jar as a Servlet 3.0 web fragment rather than as a Servlet 3.1 web fragment. (markt) 55715: Add a per web application executor to the WebSocket implementation and use it for calling SendHandler.onResult() when there is a chance that the current thread also initiated the write. (markt) Prevent file descriptors leak and ensure that files are closed when configuring the web application. (violetagg) Fixed the name of the provider-configuration file located in tomcat7-websocket.jar!/META-INF/services that exposes information for javax.websocket.server.ServerEndpointConfig$Configurator implementation. (violetagg) 55760: Remove the unnecessary setting of the javax.security.auth.useSubjectCredsOnly system property in the SpnegoAuthenticator as in addition to it being unnecessary, it causes problems with using SPNEGO with IBM JDKs. Patch provided by Arunav Sanyal. (markt) 55772: Ensure that the request and response are recycled after an error during asynchronous processing. Includes a test case based on code contributed by Todd West. (markt) 55778: Add an option to the JNDI Realm to control the QOP used for the connection to the LDAP server after authentication when using SPNEGO with delegated credentials. This value is used to set the javax.security.sasl.qop environment property for the LDAP connection. (markt) 55798: Log an error if the MemoryUserDatabase is unable to find the specified user database file. (markt) 55799: Correctly enforce the restriction in JSR356 that no more than one data message may be sent to a remote WebSocket endpoint at a time. (markt) When Catalina parses TLD files, always use a namespace aware parser to be consistent with how Jasper parses TLD files. The tldNamespaceAware attribute of the Context is now ignored. (markt) Deprecate the tldNamespaceAware Context attribute as TLDs are always parsed with a namespace aware parser. (markt) Correct a logic error that meant that unpackWARs was ignored and the WAR was always expanded if a WAR failed to deploy. (markt) Add support for defining copyXML on a per Context basis. (markt) Define the expected behaviour of the automatic deployment and align the implementation to that definition. (markt) When running under a security manager, change the default value of the Host's deployXML attribute to false. (markt) If a Host is configured with a value of false for deployXML, a web application has an embedded descriptor at META-INF/context.xml and no explicit descriptor has been defined for this application, do not allow the application to start. The reason for this is that the embedded descriptor may contain configuration necessary for secure operation such as a RemoteAddrValve. (markt) Prevent an NPE in the WebSocket ServerContainer when processing an HTTP session end event. (markt) 55801: Add the ability to set a custom SSLContext to use for client wss connections. Patch provided by Maciej Lypik. (markt) 55804: If the GSSCredential for the cached Principal expires when using SPNEGO authentication, force a re-authentication. (markt) 55811: If the main web.xml contains an empty absolute-ordering element and validation of web.xml is not enabled, skip parsing any web-fragment.xml files as the result is never used. (markt) 55839: Extend support for digest prefixes {MD5}, {SHA} and {SSHA} to all Realms rather than just the JNDIRealm. (markt) 55842: Ensure that if a larger than default response buffer is configured that the full buffer is used when a Servlet outputs via a Writer. (markt) 55851: Further fixes to enable SPNEGO authentication to work with IBM JDKs. Based on a patch by Arunav Sanyal. (markt) Fix CVE-2013-4590: Add an option to the Context to control the blocking of XML external entities when parsing XML configuration files and enable this blocking by default when a security manager is used. The block is implemented via a custom resolver to enable the logging of any blocked entities. (markt)

Coyote

Implement a number of small refactorings to the APR/native handler for upgraded HTTP connections. (markt) Fix an issue with upgraded HTTP connections over HTTPS (e.g. secure WebSocket) when using the APR/native connector that resulted in the unexpected closure of the connection. (markt) Ensure that the application class loader is used when calling the ReadListener and WriteListener methods when using non-blocking IO. A side effect of not doing this was that JNDI was not available when processing WebSocket events. (markt) Make the time that the internal executor (if used) waits for request processing threads to terminate before continuing with the connector stop process configurable. (markt) 55749: Improve the error message when SSLEngine is disabled in the AprLifecycleListener and SSL is configured for an APR/native connector. (markt) If a request that includes an Expect: 100-continue header receives anything other than a 2xx response, close the connection This protects against misbehaving clients that may not sent the request body in that case and send the next request instead. (markt) Improve the parsing of trailing headers in HTTP requests. (markt)

Jasper

55735: Fix a regression caused by the fix to 55198. When processing JSP documents, attributes in XML elements that are template content should have their text xml-escaped, but output of EL expressions in them should not be escaped. (markt) 55807: The JSP compiler used a last modified time of -1 for TLDs in JARs expanded in to WEB-INF/classes (IDEs often do this expansion) when creating the dependency list for JSPs that used that TLD. This meant JSPs using that TLD were recompiled on every access. (markt)

Cluster

Add log message that initialization of AbstractReplicatedMap has been completed. (kfujino) The logger of AbstractReplicatedMap should be non-static in order to enable logging of each application. Side-effects of this change is to throw RuntimeException in MapMessage#getKey() and getValue() instead of Null return and error log. (kfujino) Simplify the code of DeltaManager#startInternal(). Reduce unnecessary nesting for acquisition of cluster instance. (kfujino) Remove unnecessary attributes of stateTransferCreateSendTime and receiverQueue from cluster manager template. These attributes should not be defined as a template. (kfujino) Fix MBean attribute definition of stateTransfered. The method name is not isStateTransfered() but getStateTransfered(). (kfujino) Correct stop failure log of cluster. Failure cause is not only Valve. (kfujino) Remove unnecessary sleep when sending session blocks on session sync phase. (kfujino) Expose stateTimestampDrop of org.apache.catalina.ha.session.DeltaManager via JMX. (kfujino) When the ping timeouted, make sure that memberDisappeared method is not called by specifying the members that has already been removed. (kfujino) Add log message of session relocation when member disappeared. (kfujino) If ping message fails, prevent wrong timeout detection of normal member that is no failure members. (kfujino)

Web applications

Add some documentation on the SSL configuration options for WebSocket clients. (markt) Add to cluster document a description of notifyLifecycleListenerOnFailure and heartbeatBackgroundEnabled. (kfujino) Update the documentation with information for WebSocket 1.0 specification and javadoc. (violetagg) 55703: Clarify the role of the singleton attribute for JNDI resource factories. (markt) 55746: Add documentation on the allRolesMode to the CombinedRealm and LockOutRealm. Patch by Cédric Couralet. (markt) Expand the information on web applications that ship as part of Tomcat in the security how-to section of the documentation web application. (markt) Expand the description of the WebSocket buffers in the documentation web application to clarify their purpose. (markt) Correct the documentation for Cluster manager. (kfujino) Add information on how to configure integrated Windows authentication when Tomcat is running on a non-Windows host. (markt)

Extras

Update commons-logging to version 1.1.3. (rjung)

Other

52323: Add support for the Cobertura code coverage tool when running the unit tests. Based on a patch by mhasko. (markt/kkolinko) Update sample Eclipse IDE project. Explicitly use a Java 6 SE JDK. Exclude JSR356 WebSocket classes from build path, as they cannot be compiled with Java 6. (kkolinko) Update the Eclipse compiler to 4.3.1. (kkolinko/markt)

Coyote

Fix regression with legacy WebSocket implementation in NIO and APR connectors. (markt)

Web applications

Avoid hang observed with Java 6 on Windows when stopping the Tomcat process via CTRL-C. (markt)

Other

55663: NOTICE files are corrected according to NOTICE files requirements. (violetagg)

Catalina

Only send a WebSocket close message on an IOException if the client has not yet received a close control message from the server as the IOException may be in response to the client continuing to send a message after the server sent a close control message. (markt) 49134: Ensure nested realms are correctly destroyed, when a CombinedRealm is destroyed. This ensures that the associated MBeans are deregistered. (markt)

Coyote

Refactor APR/native connector to reduce the scope of localAddList. (markt) 55602: Ensure that sockets removed from the Poller and then closed in the APR/native connector are removed and then closed in a thread-safe manner. (markt) Update the APR/native connector to version 1.1.29. (violetagg)

Jasper

55642: Correct logic error in the JSP parser that was incorrectly identifying EL expressions in jsp:param element values as a literal string. (markt)

Cluster

Add support for notify periodic event of cluster. (kfujino)

Web applications

Correct the javadoc for org.apache.catalina.Lifecycle. (kfujino) Add document for sessionIdAttribute attribute in org.apache.catalina.ha.session.JvmRouteBinderValve. (kfujino) Handle the case when a user closes the browser whilst playing the snake game in the JSR356 WebSocket examples. (markt) Ensure Javadoc comments are associated with the correct elements in org.apache.tomcat.jni.Poll. (markt) Expand Context documentation for the use of sessionCookiePath="/" to make the implications for session fixation protection clearer. (markt) 55629: Ensure that the JMX notification listener added during initialization of the servlet org.apache.catalina.manager.StatusManagerServlet is removed in the destroy phase. (violetagg) Correct the documentation for Deployment Organization in the App Dev Guide. (violetagg) 55639: Add a Drawboard WebSocket example. (kpreisser)

Catalina

55576: Preserve the order in which request parameters were received when accessing them via the Servlet API. (markt)

Cluster

Logger instance of cluster session manager is changed to non-static in order to enable logging of each application. (kfujino)

Jasper

55582: Correct concurrency issue that can result in two instances of JspServletWrapper being created for one tag Patch provided by Sheldon Shao. (markt)

Catalina

51526: o.a.catalina.startup.Tomcat#addWebapp methods now process the web application's META-INF/context.xml when it is available in the provided path. (violetagg) 55186: Ensure local name is recycled between requests so IP virtual hosting works correctly. (markt) 55210: Correct the processing of the provider-configuration file for javax.servlet.ServletContainerInitializer in the resource directory META-INF/services when this file contains comments and multiple SCIs. Patch provided by Nick Williams. (violetagg) 55230: Use the correct resource path when obtaining an InputStream for resources served by a ProxyDirContext. (markt) Ensure that the JAR scanning process scans the Apache Log4j version 2 JARs. Patch provided by Nick Williams. (markt) 55261: Fix failing unit test for file upload checks when running on platform / JVM combinations that have large network buffers. (markt) 55268: Added optional --service-start-wait-time command-line option to change service start wait time from default of 10 seconds. The contextClass attribute of HostConfig refers to the value of the contextClass attribute of Host. (kfujino) 55331: Dispatching to an asychronous servlet from AsyncListener.onTimeout() should not trigger an IllegalStateException. (markt) 55333: Correct a regression in the fix for 55071. (markt) When using a security manager, ensure that calls to the ServletContext that are routed via an AccessController.doPrivileged block do not result in a call to a different underlying method on the ServletContext. (markt) 55354: Ensure that the naming context environment parameters are restored after associating the Principle with the user name. Based on patch provided by Richard Begg. (violetagg) 55357: Ensure the web application class loader is set as a thread context class loader during session deserialization. (violetagg) 55404: Log warnings about using security roles in web.xml without defining them as warnings. (markt) 55439: Don't try a forced stop when stop -force is used if Tomcat has already been stopped. This avoids error messages when the PID file has been cleared. If a forced stop is required, improve handling of the case when the PID file can be read from or written to but not deleted. (markt) 55454: Avoid NPE when parsing an incorrect content type. (violetagg) Back-port the JSR-356 Java WebSocket 1.0 implementation from Tomcat 8. Note that use of this functionality requires Java 7. (markt) Deprecate the Tomcat proprietary WebSocket API in favour of the new JSR-356 implementation. (markt) 55494: Reduce severity of log message from warning to information for JNDI Realm connection issues where the JNDI Realm automatically re-tries the action that failed. Make clear in the log message that the action is being re-tried. (markt) Correct several incorrect formats of JdkLoggerFormatter. (kfujino) 55521: Ensure that calls to HttpSession.invalidate() do not return until the session has been invalidated. Also ensure that checks on the validity of a session return a result consistent with any previous call to HttpSession.invalidate(). (markt) 55524: Refactor to avoid a possible deadlock when handling an IOException during output when using Tomcat' proprietary (and deprecated) WebSocket API. (markt) The loaded attribute never exists in PersistentManager. isLoaded is defined as operation in mbeans-descriptors. (kfujino) Added logging of logging.properties location when system property org.apache.juli.ClassLoaderLogManager.debug=true is set. 55570: Correctly log exceptions for all error conditions in the SPNEGO authenticator. (markt)

Coyote

55228: Allow web applications to set a HTTP Date header. (markt) Expose the current connection count for each protocol handler via JMX. (markt) 55267: If an application configures a timeout for a Comet connection ensure it is only used for read and not write operations. This prevents a long timeout delaying the closing of the socket associated with a Comet connection after an error occurs. (markt) Ensure that java.lang.VirtualMachineErrors are not swallowed when using the HTTP or AJP NIO connectors. (markt) 55399: Use the response locale to select the language to use for the status message in the HTTP response. (markt) Refactor the connectors to support the new JSR-356 Java WebSocket 1.0 implementation. The most noticeable change is that the AJP APR/native and HTTP APR/native connectors no longer support multiple poller threads. Both connectors now use a single poller thread. (markt) Internally, content length is managed as a long. Fix a few places in the AJP connector where this was restricted to an int. (markt) 55453: Ensure that the AJP connector does not permit response bodies to be included for responses with status codes and/or request methods that are not permitted to have a response body. (markt) 55500: Don't ignore the value of an asynchronous context timeout when using the AJP NIO connector. (markt) Fix CVE-2013-4286: Better adherence to RFC2616 for content-length headers. (markt) Fix CVE-2013-4322: Add support for limiting the size of chunk extensions when using chunked encoding. (markt) Update the APR/native connector to version 1.1.28. Make this the minimum acceptable version as the correct behaviour of the JSR-356 WebSocket implementation when using the APR/native HTTP connector depends on a bug fix in the 1.1.28 release. (markt)

Jasper

55198: Ensure attribute values in tagx files that include EL and quoted XML characters are correctly quoted in the output. (markt) Ensure that javax.el.ELContext.getContext(Class) will throw NullPointerException when the provided class is null. (violetagg) Ensure that FeatureDescriptor objects returned by javax.el.MapELResolver.getFeatureDescriptors(ELContext,Object) will be created with a correct shortDescription - an empty string and a named attribute ELResolver.RESOLVABLE_AT_DESIGN_TIME - true. (violetagg) Ensure that FeatureDescriptor objects returned by javax.el.ResourceBundleELResolver.getFeatureDescriptors(ELContext,Object) will be created with a correct shortDescription - an empty string. javax.el.ResourceBundleELResolver.isReadOnly(ELContext,Object,Object) returns true if the base object is an instance of ResourceBundle. (violetagg) 55207: Enforce the restriction that a <jsp:text> element may not contain any sub-elements from any namespace. Patch provided by Jeremy Boynes. (markt) Ensure that javax.el.ListELResolver.getFeatureDescriptors(ELContext,Object) will always return null. javax.el.ListELResolver.isReadOnly(ELContext,Object,Object) will return a result when the property cannot be coerced into an integer. (violetagg) Ensure that javax.el.ArrayELResolver.getFeatureDescriptors(ELContext,Object) will always return null. javax.el.ArrayELResolver.isReadOnly(ELContext,Object,Object) and javax.el.ArrayELResolver.getType(ELContext,Object,Object) will return a result when the property cannot be coerced into an integer. (violetagg) 55309: Fix concurrency issue with JSP compilation and the tag plug-in manager. Patch provided by Sheldon Shao. (markt) Ensure that javax.el.BeanELResolver.getFeatureDescriptors(ELContext,Object) and javax.el.BeanELResolver.getCommonPropertyType(ELContext,Object) do not throw NullPointerException when the provided context is null. (violetagg)

Cluster

Add new attribute terminateOnStartFailure. Set to true if you wish to terminate replication map when replication map fails to start. If replication map is terminated, associated context will fail to start. If you set this attribute to false, replication map does not end. It will try to join the map membership in the heartbeat. Default value is false. (kfujino) Avoid ConcurrentModificationException when sending a heartbeat. (kfujino) Avoid NPE when the channel fails to start. (kfujino) 55301: Fix IllegalArgumentException thrown by simple test for McastService. (kfujino) 55332: Fix NPE in FileMessageFactory.main when specify empty file as arguments. (kfujino) More definite thread name for MessageDispatch15Interceptor. (kfujino)

Web applications

Remove the experimental label from the AJP NIO connector documentation. (markt) Correctly associated the default resource bundle with the English locale so that requests that specify an Accept-Language of English ahead of French, Spanish or Japanese get the English messages they asked for. (markt) 55469: Fixed tags that were not properly closed. Based on a patch provided by Larry Shatzer, jr. (violetagg) The WebSocket examples in the examples web application have been changed to use the new JSR-356 Java WebSocket 1.0 implementation. (markt) Add document for org.apache.catalina.tribes.group.GroupChannel. (kfujino) Correct Realm Component page of Tomcat documentation. (violetagg)

jdbc-pool

54693: Add a validationQueryTimeout property. Patch provided by Daniel Mikusa. (kfujino) 54693#c6: Avoid NPE caused by createConnection() method returns null. Patch provided by Daniel Mikusa. (kfujino) 55342: Remove unnecessary reset of interrupted flag. If InterruptedException is thrown, the interrupted flag has been cleared. (kfujino) 55343: Add flag to ignore exceptions of connection creation while initializing the pool. (kfujino) Add undefined attributes and operations to mbeans-descriptor. (kfujino)

Other

45428: Trigger a thread dump written to standard out if Tomcat fails to stop in a timely manner to aid diagnostics. This is only available on platforms that use catalina.sh. (markt) 55204: Correct namespace used in Servlet 2.4 test web application. Patch provided by Jeremy Boynes. (markt) 55205: Reorder elements so web.xml complies with schema for Servlet 3.0 test web application. Patch provided by Jeremy Boynes. (markt) 55211: Correct namespace in TLD files used in test web applications. Rename elements tagclass to tag-class so TLD files complies with DTD/schema. Patch provided by Jeremy Boynes. (violetagg) Update package renamed version of Commons BCEL to the latest code from Commons BCEL trunk. (markt) Update package renamed version of Commons FileUpload to the latest code from Commons FileUpload trunk. (markt) 55297: When looking for the jsvc executable, if an explicit path is not set and it is not found in $CATALINA_BASE, look in $CATALINA_HOME as well. (markt) 55336: Correctly escape parameters passed to eval in the catalina.sh script to ensure that Tomcat starts when installed on a path that contains multiple consecutive spaces. (markt)

Catalina

Enforce the restriction described in section 4.4 of the Servlet 3.0 specification that requires the new pluggability methods only to be available to ServletContextListeners defined in one of the specified ways. (markt) Better handle FORM authentication when requesting a resource as an unauthenticated user that is only protected for a sub-set of HTTP methods that does not include GET. (markt) 53777: Add support for a JAAS Realm instance to use a dedicated configuration rather than the JVM global JAAS configuration. This is most likely to be useful for per web application JAAS Realms. Based on a patch by eolivelli. (markt) 54745: Fix JAR file scanning when Tomcat is deployed via Java Web Start. Patch provided by Nick Williams. (markt) 55017: Add the ability to configure the RMI bind address when using the JMX remote lifecycle listener. Patch provided by Alexey Noskov. (markt) 55071: Ensure original exception is reported if JDBC Realm fails to read a user's credentials. (markt) 55073, 55108, 55109, 55110, 55158 & 55159: Small performance improvements. Patches provided by Adrian Nistor. (markt/violetagg) 55102: Add support for time to first byte in the AccessLogValve. Patch provided by Jeremy Boynes. (markt) 55125: If the Server container fails to start, don't allow the Catalina wrapper to start (used when running from the command line and when running as a service) since Tomcat will not be able to do any useful work. (markt) Update the JreMemoryLeakPreventionListener to take account of changes in the behaviour of java.beans.Introspector.flushCaches() and sun.awt.AppContext.getAppContext() in Java 7. (markt) Avoid WARNING log message of Users:type=UserDatabase,database=UserDatabase at Tomcat shutdown. (pero) Avoid ClassCastException when an asynchronous dispatch is invoked in an asynchronous cycle which is started by a call to ServletRequest.startAsync(ServletRequest,ServletResponse) where ServletRequest/ServletResponse are custom implementations. (violetagg) Correct a regression introduced in 7.0.39 (refactoring of base 64 encoding and decoding) that broke the JNDI Realm when userPassword was set and passwords were hashed with MD5 or SHA1. (markt/kkolinko) Correct the mechanism for the path calculation in AsyncContext.dispatch(). (violetagg) 55155: Avoid constant focus grabbing when running the Tomcat unit tests under Java 6 on OSX. Patch provided by Casey Lucas. (markt) 55160: Don't ignore connectionUploadTimeout setting when using HTTP NIO connector. (markt) 55176: Correctly handle regular expressions within SSI expressions that contain an equals character. (markt)

Coyote

55177: Correctly handle infinite soTimeout for BIO HTTP connector. Based on a patch by Nick Bunn. (markt) 55180: Correctly handle infinite soTimeout when disableUploadTimeout is set to false. Patch provided by Nick Bunn. (violetagg)

Cluster

Delete leftover of war file from tempDir when removing invalid FileMessageFactory. (kfujino) Ensure that the keepAlive of NioSender works correctly when keepAliveCount/keepAliveTime is set to a value greater than 0. (kfujino) Add logging of when a member is unable to join the cluster. (kfujino) Replace Tribes's TaskQueue as executor's workQueue in order to ensure that executor's maxThread works correctly. (kfujino) 54086: Fix an additional code path that could lead to multiple threads attempting to modify the same selector key set. (markt)

Web applications

Complete the document for MessageDispatch15Interceptor. (kfujino) 53655: Document the circumstances under which Tomcat will add a javax.mail.Authenticator to mail sessions created via a JNDI resource. (markt) 55179: Correct the Javadoc for the remote IP valve so the correct name is used to refer to the proxiesHeader property. (markt)

jdbc-pool

55031: Fixed Export-Package header and uses directives in MANIFEST.MF. Change the version for package org.apache.juli.logging to "0" in Import-Package header. Thus any version of that package can be used. Patch provided by Martin Lichtin. (violetagg)

Other

Update Maven Cental location used to download dependencies at build time to be repo.maven.apache.org. (kkolinko) Update JUnit to version 4.11. Configure separate download for Hamcrest 1.3 core library as its classes are no longer included in junit.jar. (kkolinko) 54013: When using a forced stop, allow a short period of time (5s) for the process to die before returning. Patch provided by mukarram.baig. (markt) 55119: Ensure that the build process produces Javadoc that is not vulnerable to CVE-2013-1571. Based on a patch by Uwe Schindler. (markt)

Catalina

54703: Make parsing of HTTP Content-Type headers tolerant of any CR or LF characters that appear in the value passed by the application. Also fix some whitespace parsing issues identified by the additional test cases. (markt) Prevent possible WAR file locking when reading a context.xml file from an unexpanded WAR file. Note that in normal usage, the JreMemoryLeakPreventionListener would protect against this. (markt) Ensure that when auto deployment runs for a Host, it uses the latest values for copyXML, deployXML and unpackWARs. (markt) 54939: Provide logging (using a UserDataHelper) when HTTP header parsing fails (e.g. when maxHeaderCount is exceeded). (markt) 54944: Enhancements to the unit tests for FORM authentication. Patch provided by Brian Burch. (markt) 54955: When a reload of the application is performed ensure that a subsequent request to the context root does not result in a 404 response. (violetagg) 54971: Ensure that the correct location is used when writing files via javax.servlet.http.Part.write(String). (markt) 54974: Ensure that SessionCookieConfig#set<methods> will throw IllegalStateException if the ServletContext from which this SessionCookieConfig was acquired has already been initialized. (violetagg) 54981: Ensure that ServletContext#getJspConfigDescriptor() will return null when there is no jsp configuration provided by web.xml/web-fragment.xml. (violetagg) Ensure that when Tomcat's anti-resource locking features are used that the temporary copy of the web application and not the original is removed when the web application stops. (markt) 54984: Use the correct encoding when processing a form data posted as multipart/form-data even when the request parameters are not parsed. (violetagg) 54999: The old JSESSIONIDSSO needs to be removed when SSO is being used and logout() and login() occur within a single request. Patch provided by Keith Mashinter. (markt) 55035: Add support for the version attribute to the deploy command of the Ant tasks for interfacing with the text based Manager application. Patch provided by Sergey Tcherednichenko. (markt) 55046: Add a Servlet Filter that implements CORS. Patch provided by Mohit Soni. (markt) 55052: JULI's LogManager now additionally looks for logging properties without prefixes if the property cannot be found with a prefix. (markt) Ensure that only the first asynchronous dispatch operation for a given asynchronous cycle will be performed. Any subsequent asynchronous dispatch operation for the same asynchronous cycle will be ignored and IllegalStateException will be thrown. (violetagg)

Coyote

54947: Fix the HTTP NIO connector that incorrectly rejected a request if the CRLF terminating the request line was split across multiple packets. Patch by Konstantin Preißer. (markt)

Jasper

54964: Allow tag plug-ins to be packaged with a web application. Patch provided by Sheldon Shao. (markt) 54968: Return the correct version number (2.2) of the JSP specification that is supported by the JSP engine when javax.servlet.jsp.JspEngineInfo#getSpecificationVersion() is invoked. (violetagg)

Cluster

Add maxValidTime attribute to prevent the leak of FileMessageFactory in FarmWarDeployer. (kfujino) Simplify the code of ReplicationValve: Rather than get cluster instance from container on every request, use instance variable. (kfujino) Add maxWait attribute that the senderPool will wait when there are no available senders. (kfujino) Improve error message by including specified timeout if failed to retrieve a data sender. (kfujino) Add removeSuspectsTimeout attribute in order to remove a suspect node in TcpFailureDetector. (kfujino)

Web applications

54931: Add information to the Window Service how-to about installing and running multiple instances. Based on a patch by Chris Derham. (markt) 54932: Correct the link to Tribes documentation. (violetagg) Add document for o.a.c.tribes.group.interceptors.TcpFailureDetector. (kfujino)

Catalina

Update Tomcat's internal copy of Commons FileUpload to FileUpload 1.3. (markt) 54178, CVE-2013-2071: Protect against AsyncListener implementations that throw RuntimeExceptions in response to an event. (markt) 54791: Restore tools.jar entry in jarsToSkip property to prevent warnings when running Tomcat from Eclipse. (markt) 54851: When scanning for web fragments, directories without any web-fragment.xml should not impact the status of distributable element. Patch provided by Trask Stalnaker. (violetagg) When an error occurs during the sending of a WebSocket message, notify the Inbound side (where all the events occur that the application reacts to) that an error has occurred and that the connection is being closed. (markt) 54906: Better error message if a ConcurrentModificationException occurs while checking for memory leaks when a web application stops. Also ensure that the exception does not cause remaining checks to be skipped. Based on a patch by NateC. Allow 204 responses (no content) to include entity headers as required by RFC2616. (markt)

Coyote

Ensure write errors when using HTTP Upgrade with the APR/native connector result in IOExceptions rather than errors being silently swallowed. (markt)

Jasper

54802: Provide location information for exceptions thrown by JspDocumentParser. (kkolinko) 54801: Do not attempt to parse text that looks like an EL expressions inside a scriptlet in a JSP document because EL expressions are not permitted in scriptlets. (kkolinko/markt) 54821: Do not attept to parse text that looks like an EL expressions in a JSP document if EL expressions have been disabled. (kkolinko/markt) 54888: Add support for CSV lists with the ForEach tag plugin. Patch provided by Sheldon Shao. (markt)

Cluster

Add several improvements for FarmWarDeployer. (kfujino)

Web applications

54872: Correct Cluster Receiver page of Tomcat documentation. (violetagg)

jdbc-pool

Document StatementCache interceptor. (kkolinko) Fix minor threading issue in ConnectionPool. (markt/kkolinko) 54732: Fix leak of statements in StatementCache interceptor. (kkolinko) Fix NPE in SlowQueryReportJmx when running TestSlowQueryReport test. (kkolinko)

Other

Update to Eclipse JDT Compiler 4.2.2. (kkolinko) 54890: Update to Apache Commons Daemon 1.0.15. (mturk) Convert remaining unit tests to JUnit 4 and enable Checkstyle rule that forbids use of methods from JUnit 3. (markt/kkolinko) Remove unneeded permissions for reading UserDataHelper properties from catalina.policy file. The class that needed those was moved in 7.0.26. (kkolinko)

Catalina

Ensure a log message is generated when a web application fails to start due to an error processing a ServletContainerInitializer. (markt) Prevent NPE in JAR scanning when running in an environment where the bootstrap class loader is not an ancestor of the web application class loader such as OSGi environments. (violetagg) Ensure that, if a call to UEncoder#encodeURL is made, all internal structures are properly cleaned. (violetagg) 54660: Enable the modification of an access log's fileDateFormat attribute while the access log is in use. The change will take effect when the next entry is made to the access log. (markt) Update Tomcat's internal copy of Commons FileUpload to FileUpload trunk, revision 1458500 and the associated extract from Commons IO to 2.4. (markt) 54702: Prevent file descriptors leak and ensure that files are closed when parsing web application deployment descriptors. (violetagg) 54707: Further relax the parsing of DIGEST authentication headers to allow for buggy clients that quote values that RFC2617 states should not be quoted. (markt/kkolinko) Enable support for MBeans with multiple operations with the same name but different signatures. (markt) Deprecate Tomcat's internal Base 64 encoder/decoder and switch to using a package renamed copy of the Commons Codec implementation. (markt) Ensure that StandardJarScanner#scan will use the provided class loader when scanning the class loader hierarchy. (violetagg)

Coyote

54690: Fix a regression caused by the previous fix for 54406. If no values are specified for sslEnabledProtocols or ciphers use the default values for server sockets rather than the default values for client sockets. (markt)

Web applications

Correct Deployer, Manager and Context pages of Tomcat documentation. (kkolinko)

jdbc-pool

52318: Version for imported package org.apache.juli.logging is extended to include also 7.0.x versions. The fix is applicable only when running in OSGi environment. Patch provided by Martin Lichtin. (violetagg) 54599: Do not print connection password in PoolProperties.toString(). Based on a patch by Daniel Mikusa. (kkolinko) 54684: Add javax.naming.spi to Import-Package header in MANIFEST.MF in order to resolve ClassNotFoundException when running in OSGi environment. (violetagg)

Other

Update to Apache Commons Daemon 1.0.14 to resolve 54609 which meant that installation of Windows service could fail producing incorrect service launch command. (mturk) Ensure HEAD requests return the correct content length when the requested resource uses a Writer. Patch by Nick Williams. (markt)

Catalina

Ensure that the request start time (used by the access log valve to calculate request processing time) is correctly recorded for the HTTP NIO connector. In some cases the request processing time may have been longer than that recorded. (markt) Add one more library from JDK 7 to the value of jarsToSkip property in the catalina.properties file. (kkolinko) 53871: If annotation scanning results in a StackOverflowError due to broken class dependencies, add the class hierarchy that triggered the exception to the error message. (markt) Add a new option to the standard JarScanner implementation (scanBootstrapClassPath) to control if the bootstrap classpath is scanned or not. By default, it will not be scanned. (markt) Provide more consolidated servlet MBean data in the webapp MBean. (rjung) 54584: Take account of the delegate attribute when building the web application class path to pass to the JSP compiler. (markt) Copy the updated and re-packaged UTF-8 decoder from Tomcat 8.0.x and use this improved decoder for WebSocket connections. Remove the WebSocket specific UTF-8 decoder. (markt) 54602: Recycle the byte to character converter used for URIs between requests to ensure an error in one request does not trigger a failure in the next request. (markt) Use the newly added improved UTF-8 decoder for decoding UTF-8 encoded URIs and UTF-8 encoded request bodies. Invalid UTF-8 URIs will not cause an error but will make use of the replacement character when an error is detected. This will allow web applications to handle the URI which will most likely result in a 404 response. The fall-back to decoding with ISO-8859-1 if UTF-8 decoding fails has been removed. Invalid UTF-8 sequences in a request body will trigger an IOException. The way the decoder is used has also been improved. The notable change is that invalid sequences at the end of the input now trigger an error rather than being silently swallowed. (markt) 54624: Ensure that the correct request body length is used when swallowing a request body after FORM authentication prior to restoring the original request preventing possible hanging when restoring POST requests submitted over AJP. (markt) 54628: When writing binary WebSocket messages write from start position in array rather than the start of the array. Patch provided by blee. (markt)

Coyote

Refactor char encoding/decoding using NIO APIs. (remm)

Web applications

54203: Complete the Javadoc for javax.servlet.http.Part. (markt) 54638: Fix display of "Used" memory value for memory pools on the status page in Manager web application when the page is rendered as XML. (kkolinko) Correct typos in configuration samples on SSL Configuration page of Tomcat documentation. (kkolinko) Disable support for comments on Changelog page of Tomcat documentation. (kkolinko) Fix several issues with status.xsd schema in Manager web application, testing it against actual output of StatusTransformer class. (kkolinko) Clarify the documentation on how context paths may be configured for web applications. (markt)

Other

54601: Change catalina.sh to consistently use LOGGING_MANAGER variable to configure logging, instead of modifying JAVA_OPTS one. (kkolinko)

Catalina

54521: Ensure that concurrent requests that require a DIGEST authentication challenge receive different nonce values. (markt) 54534: Ensure that, if a call to StandardWrapper#isSingleThreadModel() triggers the loading of a Servlet, the correct class loader is used. (markt) 54536: Ensure the default error page is displayed if a custom HTTP status code is used when calling HttpServletResponse#sendError(int, String). (markt)

Coyote

54456: Ensure that if a client aborts a request when sending a chunked request body that this is communicated correctly to the client reading the request body. (markt) Update the native component of the APR/native connector to 1.1.27 and make that version the recommended minimum version. (markt)

Jasper

54239: Enable web applications to provide their own Expression Language interpreter to enable them to optimise processing of expressions. Based on a patch by Sheldon Shao. (markt)

Web applications

54505: Create clearer links from the JNDI How-To to the Tomcat specific options for configuring JNDI resources. (markt)

Other

Update to Apache Commons Daemon 1.0.13. (markt)

Catalina

Make additional allowances for buggy client implementations of HTTP DIGEST authentication. This is a follow-on to 54060. (markt) 54438: Fix a regression in the fix for 52953 that triggered a NPE when digested passwords were used and an authentication attempt was made for a user that did not exist in the realm. (markt) 54448: Correctly handle @Resource annotations on primitives. Patch provided by Violeta Georgieva. (markt) 54450: Correctly handle resource injection when part of the servlet properties uses @Resource and the other uses injection-target. Patch provided by Violeta Georgieva. (markt) 54458: Include exception when logging errors in the DataSourceRealm. Patch provided by Violeta Georgieva. (markt) 54483: Correct one of the Spanish translations. Based on a suggestion from adinamita. (markt) Prevent the SSO deregister when web application is stopped or reloaded. When StandardManager(pathname="") or DeltaManager stops normally, all sessions in the context are expired. In this case, because most sessions is not time-out, SSO deregister was triggered. (kfujino) Include the exception in the log message if the parsing of the context.xml file fails. (markt/kkolinko) 54497: Make memory leak detection code more robust so a failure in the leak detection code does not prevent the Context from stopping unless the error is fatal to the JVM. (markt) 54507: Do not start the background thread that is used for expiring sessions (amongst other things) until the web application is fully started. Stop the background thread as soon as the web application is stopped. (markt) Allow WebSocket Ping/Pong messages to be sent between fragments of a fragmented message. (markt) 54612: Check if the socket is closed before trying to write a WebSocket message to it. Also, flush any partial buffered data before closing the socket. (markt)

Coyote

54324: Allow APR connector to disable TLS compression if OpenSSL supports it. (schultz) 54406: Fix NIO HTTPS connector to prune specified ciphers and sslEnableProtocols options to those supported by the SSL implementation, sharing logic with the BIO connector. Modified ciphers and sslEnabledProtocols option pruning to not silently revert to JVM defaults when none of the options specified are supported - new behaviour is to warn and explicitly enable no options. (timw) Align NIO HTTP connector with other HTTP connectors and include leading blank lines when determining the size of the HTTP headers. (markt)

Jasper

53869: Performance improvement for pages with lots of heavily nested tags. Retain a reference to the root JSP context rather than traversing the hierarchy on every call. Based on a patch suggested by Sheldon Shao. (markt) 54440: Correct a regression caused by the changes for 54240 that broke compilation of JSPs with JspC. Patch provided by Sheldon Shao. (markt) 54466: Improve error message by including the name of the file when the java file generated from a tag file cannot be compiled. Based on a patch by Sheldon Shao. (markt)

Cluster

Fix incorrect increment of counterSend_EVT_SESSION_EXPIRED and counterSend_EVT_CHANGE_SESSION_ID. These values are not incremented if no members active in cluster group. (kfujino) 54476: Correct error in Javadoc of GroupChannel send methods to maker clear that the minimum length of the destination member array is one, not two. (markt) Prevent SSO deregister when node shutdown normally in cluster environment. (kfujino) Check cluster member before sending replicate message in ClusterSingleSignOn. (kfujino)

Web applications

54461: Improve the documentation for the compiler attribute in the Jasper how-to. (markt) Add Jespa to the list of third-party Windows authentication providers and make external links in the documentation for those providers no-follow. (markt)

Tribes

54496: Don't use a hard-coded class name in MemberImpl.toString(). (markt)

Other

Update to Apache Commons Daemon 1.0.12. (markt)

Catalina

54247: Prevent ClassNotFoundExceptions on stop when running as a service. (markt) 54249: Ensure resource properties are available when the context path contains encoded characters such as a space. This triggered compilation issues in Jasper. Patch provided by Polina Genova. (markt) 54256: Improve error reporting when a JAR file fails extension validation by including the name of the JAR file in the exception. (markt) Allow web applications to be stopped cleanly even if filters throw exceptions when their destroy() method is called. (markt/kkolinko) Fix memory leak of servlet instances when running with a SecurityManager and either init() or destroy() methods fail or the servlet is a SingleThreadModel one. (kkolinko) Cleanup method cache lookup code in SecurityUtil class. (kkolinko) Make the Tomcat 7 non-JSR356 WebSocket implementation non-blocking (where supported by the connector) between the HTTP upgrade and the first WebSocket message from the client to the server. (markt) 54262: Ensure that an empty <absolute-ordering /> element in the main web.xml file disables scanning for web fragments. Based on a patch by Violeta Georgieva. (markt) 54284: As per clarification from the Servlet EG, anonymous Filters and Servlets are not permitted. Patch by Violeta Georgieva. (markt) 54371: Prevent exceptions when processing web fragments for unexpanded WAR files when the context path contains characters that need to be encoded in URLs such as spaces. Based on a patch by Polina Genova. (markt) 54372: Make HTTP Digest authentication header parsing tolerant of invalid headers sent by known buggy clients. (markt) 54377: Correctly set request attributes for AccessLog in RemoteIpFilter. Patch by Violeta Georgieva. (markt) 54379: Implement support for post-construct and pre-destroy elements in web.xml. Patch by Violeta Georgieva. (markt) 54380: Do not try to register servlets or contexts into the mapper too early (which just caused a warning to be logged). (kkolinko) Fix NPE in WebappLoader.stopInternal when stop is called after a failed start. (kkolinko) 54381: Add support for receiving WebSocket pong messages. (markt) 54382: Fix NPE when SSI processing is enabled and an empty SSI directive is present. (markt) Fix ArrayIndexOutOfBoundsException in HttpParser when parsing incorrect HTTP headers. (kkolinko) 54387: Deployment must fail when multiple servlets are mapped to the same url-pattern. (markt) 54391: Provide a value for the javax.servlet.context.orderedLibs attribute. (markt)

Coyote

54248: Ensure that byte order marks are swallowed when using a Reader to read a request body with a BOM for those encodings that require byte order marks. (markt) Fix release of processors in AjpNioProtocol. Wrong object was used as a key in the connections map. (kkolinko)

Jasper

54240: Add support for auto-detection and configuration of JARs on the classpath that provide tag plug-in implementations. Based on a patch by Sheldon Shao. (markt) 54241: Revert the fix for 35410 as it was not compliant with the JSP specification, specifically that <%= obj %> must be translated to out.print(obj) which in turn becomes out.write(String.valueOf(obj)). This will trigger a NullPointerException if obj.toString() returns null. The fix for 35410 incorrectly suppressed the NullPointerException in this case. (markt) 54242: Correct handle null iterations with in the JSTL ForEach tag plug-in implementation. Patch provided by Sheldon Shao. (markt) 54260: Avoid NullPointerException when using JSP unloading and tag files. (markt) 54370: Improve handling of nulls when trying to match sets of parameters to a method in EL. (markt) 54338: Correctly coerce the value to the expected type when using the tag plug-in for the JSTL set tag. Patch provided by Sheldon Shao. (markt)

Web applications

54244: Clarify the documentation for the BIO and NIO SSL configuration attributes sslEnabledProtocols and sslProtocol within the documentation web application. (markt) Integrate documentation of Tomcat 7 with Apache Comments System. People can leave their comments when reading documentation online at the tomcat.apache.org site. (rjung)

Other

54390: Use 'java_home' on Mac OS X to auto-detect JAVA_HOME. (schultz)

Catalina

53871: Improve error message if annotation scanning fails during web application start due to poor configuration or illegal cyclic inheritance with the application's classes. (markt) Fix unit test for AccessLogValve when using non-GMT time zone. (rjung) 54170: Ensure correct registration of Filters and Servlets in the JMX registry if the Filter or Servlet name includes a character that must be quoted if used in an ObjectName value. (markt) Add new attribute renameOnRotate to the AccessLogValve. (rjung) 54190: Correct unit tests for BASIC authentication so that session timeout is correctly tested. Also refactor unit test to make it easier to add additional tests. Patch by Brian Burch. (markt) 54220: Ensure the ErrorReportValve only generates an error report if the error flag on the response has been set. (markt) Simplify time zone handling in the access log valve and correctly handle various edge cases for non-standard DST changes. (markt)

Web applications

54198: Clarify that HttpServletResponse.sendError(int) results in an HTML response by default. (markt) 54207: Correct JNDI factory package name in Javadoc for org.apache.naming.java.javaURLContextFactory. (markt)

jdbc-pool

Fix a handful of Eclipse warnings in the JDBC pool source code including the warnings reported in 53565. (markt) 54150: Make sure that SlowQueryReportJmx mbean deregistered during webapp shutdown. Reported by Alex Franken. (kfujino) 54194: Make sure that connection pool mbean is not registered when jmxEnabled is false. Patch provided by tobias.gierke. (kfujino)

Other

Update to Eclipse JDT Compiler 4.2.1. (markt)

Catalina

53960, 54115: Extensions to HttpClient test helper class. Patches by Brian Burch. (markt/kkolinko) 53993: Avoid a possible NPE in the AccessLogValve when the session ID is logged and a session is invalidated. (markt) Add support for LAST_ACCESS_AT_START system property to PersistentManager. (kfujino) Update MIME type mapping with additional / updated mime.types from the Apache web server. (markt) 54007: Fix a memory leak that prevented deletion of a context.xml file associated with a Context that had failed to deploy. Also fix the problems uncovered with undeploying such a Context once the leak had been fixed and the file could be deleted. (markt) 54044: Correct bug in timestamp cache used by logging (including the access log valve) that meant entries could be made with an earlier timestamp than the true timestamp. (markt) 54054: Do not share shell environment variables between multiple instances of the CGI servlet. (markt) 54060: Use a simple parser rather than a regular expression to parse HTTP Digest authentication headers so the header is correctly parsed. The new approach is also faster and generates less garbage. (markt) 54068: Rewrite the web fragment ordering algorithm to resolve multiple issues that resulted in incorrect ordering or failure to find a correct, valid order. (markt) The HTTP header parser added to address 52811 has been removed and replaced with the light-weight HTTP header parser created to address 54060. The new parser includes a work-around for a bug in the Adobe Acrobat Reader 9.x plug-in for Microsoft Internet Explorer that was identified when the old parser was introduced (53814). 54076: Add an alternative work-around for clients that use SPNEGO authentication and expect the authenticated user to be cached per connection (Tomcat only does this if an HTTP session is available). (markt) 54087: Correctly handle (ignore) invalid If-Modified-Since header rather than throwing an exception. (markt) 54096: In web.xml, <env-entry> should accept any type that has a constructor that takes a single String or char. (markt) 54127: Add support for sending a WebSocket Ping. Patch provided by Sean Winterberger. (markt) Fix CVE-2013-2067: In FormAuthenticator: If it is configured to change Session IDs, do the change before displaying the login form. (kkolinko) Ensure AsyncListener.timeout() and AsyncListener.complete() are called with the correct thread context class loader. (fhanik) 54123: If an asynchronous request times out without any AsyncListeners defined, a 500 error will be triggered. (markt) 54124: Correct provided value of request attribute javax.servlet.async.request_uri and add missing request attribute javax.servlet.async.path_info. (markt) Add denyStatus initialization parameter to CsrfPreventionFilter, allowing to customize the HTTP status code used for denied requests. (kkolinko) 54141: Increase the permitted number of nested Realm levels from 2 to 3 by default and make the limit configurable via a system property. (markt) Revert occasional API change in BaseDirContext class that was done in 7.0.32. Methods should not be final. (kkolinko) Prevent failures in the AccessLogValve when running under a SecurityManager and the first request received is an asynchronous one. (markt)

Coyote

Correct an issue that prevented WebSockets from being used over SSL when using the HTTP NIO connector. (markt) 54022: Ensure the Comet END event is triggered on client disconnect with APR/native on Windows Vista/2k8 or later. Patch provided by Douglas Beachy. (markt) 54067: Ensure responses with 1xx response codes are correctly marked as not containing an entity body. This caused an issue for some WebSocket clients when an Transfer-Encoding header was sent with the 101 (HTTP upgrade) response. (markt)

Jasper

53867: Optimise the XML escaping provided by the PageContext implementation. Based on a patch by Sheldon Shao. (markt) 53896: Use an optimised CompositeELResolver for Jasper that skips resolvers that are known to be unable to resolve the value. Patch by Jarek Gawor. (markt) 53986: Correct a regression introduced by the fix for 53713. JSP comments that ended with the sequence ---%> (or any similar sequence with a odd number of - characters) was not correctly parsed. (markt) 54011: Fix a bug in the tag plug-in for <c:out> that triggered a JSP compilation error if the escapeXml attribute was used. Patch provided by Sheldon Shao. (markt) Follow up to 54011. Simplify generated code for <c:out>. Based on a patch by Sheldon Shao. (markt) 54012: Fix a bug in the tag plug-in infrastructure that meant the <c:set> triggered a JSP compilation error when used in a tag file. Based on a patch provided by Sheldon Shao. (markt) 54017: Simplify coercion of String instances to Object. (markt) 54144: Fix a bug in the tag plug-in for <c:out> that meant that if the value of the tag evaluated to a java.io.Reader object then it was not correctly handled. (markt)

Cluster

Add getSessionIdsFull operation to mbeans-descriptor. listSessionIdsFull no longer exist. (kfujino) 54086: Fix threading issue when stopping an NioReceiver. (markt)

Web applications

54143: Add display of the memory pools usage (including PermGen) to the Status page of the Manager web application. (kkolinko)

Tribes

54045: Make sure getMembers() returns available member when TcpFailureDetector works in static cluster. (kfujino)

Catalina

Revert multiple operation support for the JMXProxyServlet pending further discussion. (schultz) CVE-2012-4431: Fix bypass of CsrfPreventionFilter when there is no session. Improve session management in the filter. (kkolinko)

Web applications

Correct the couple of broken links in the Tomcat Javadoc. (markt)

Other

Update optional Checkstyle library to 5.6. (kkolinko)

Catalina

Add one library from JDK 7 to the value of jarsToSkip property in the catalina.properties file. (kkolinko) 52777: Add an option to automatically remove old, unused versions (ones where there are no longer any active sessions) of applications deployed using parallel deployment. (markt) 53828: Use correct status code when closing a WebSocket connection normally in response to a close frame from a client. (markt) JMXProxyServlet now allows multiple operation commands like invokeAndSet, invokeAndGet, etc. (schultz) Note: reverted in 7.0.32. 53843: request.isAsyncStarted() must continue to return true until the dispatch actually happens (which at the earliest isn't until the thread where startAsync() was called returns to the container). (markt) 53863: Ensure the the implicit servlets (JSP and default) are marked as override-able when using embedded mode. (markt) When the DefaultServlet is under heavy load, the HTTP header parser added to address 52811 generates large amounts of garbage and uses significant CPU time. A cache has been added that significantly reduces the overhead of this parser. (markt) 53854: Make directory listings work correctly when aliases are used. (markt)

Jasper

53713: Performance improvement of up to four times faster parsing of JSP pages. Patch provided by Sheldon Shao. (markt)

Cluster

Make the cluster members and the cluster deployer associated with the cluster accessible via JMX. (markt) Fix a behavior of TcpPingInterceptor#useThread. If set to false, ping thread is never started. (kfujino)

Web applications

Improve the documentation web application to clarify the difference between the tag and version parameters when using text interface of the Manager web application. (markt) Make sessions saved in the Store associated with a Manager that extends PersistentManager optionally visible (via the showProxySessions Servlet initialisation parameter in web.xml) to the Manager web application. (markt)

Catalina

Automatically delete temporary files used by Servlet 3.0 file upload (for parts which size is greater than file-size-threshold option in web.xml) when request processing completes. (kkolinko) 53071: This additional fix for this issue improves the formatting of Jasper errors (or any exceptions that use a multi-line message) with the ErrorReportValve. (markt) 53469: If a URL passed to javax.servlet.http.HttpServletResponse.encodeURL() cannot be made absolute, never encode it and return it unchanged. Previously, the fix for 53062 meant than an IllegalArgumentException was thrown. (markt) 53481: Added support for SSLHonorCipherOrder to allow the server to impose its cipher order on the client. Based on a patch provided by Marcel Šebek. This feature requires Tomcat Native 1.1.25 or later. (schultz) 53498: Fix atomicity bugs in use of concurrent collections. Based on a patch by Yu Lin. (markt) Correct a regression in the previous fix for 53062 that did not always correctly normalize redirect URLs when the redirect URL included a query string or fragment component. (markt) Add missing getter and setter for roleSearchAsUser option on JNDI Realm. (markt) Add some HTTP status codes registered at IANA. (rjung) 53531: Fix ExpandWar.expand to check the return value of File.mkdir and File.mkdirs. (schultz) 53535: Reduce memory footprint when performing class scanning on Context start. Patch provided by Cedomir Igaly. (markt) 53541: Fix JAR scanning when WEB-INF/lib is provided via VirtualDirContext. Patch provided by Philip Zuev. (markt) 53574: Ensure Servlets defined using jsp-file are available when metadata-complete is true. (markt) 53584: Ignore path parameters when comparing URIs for FORM authentication. This prevents users being prompted twice for passwords when logging in when session IDs are being encoded as path parameters. (markt) 53623: When performing a asynchronous dispatch after series of forwards, ensure that the request properties are correct for the request at each stage. (markt) 53624: Ensure that HttpServletResponse.sendRedirect() works when called after a dispatch from an AsyncContext. (markt) 53641: Correct name of HTTP header used in WebSocket handshake for listing the preferred protocols. (markt) Document the constants that were added to the RequestDispatcher interface in Servlet 3.0. (kkolinko) Ensure custom error pages are not truncated if the page that triggered the error set a content length header. (markt) 53677: Ensure that a 500 response rather than no response is returned if the HTTP headers exceed the size limit. (markt) 53702: When merging web.xml fragments, allow for <jsp-property-group> elements having multiple <url-pattern> elements. (markt) Always make the resulting web.xml available even if metadata-complete is true. (markt) 53714: Provide separate system properties to control which JARs are excluded from which scans when using the JarScanner. This allows JARs to be excluded from all scans or only from TLD scanning and/or Servlet 3.0 pluggability scanning. (markt) Add several JDK libraries to the value of jarsToSkip property in the catalina.properties file. (markt, kkolinko) Fix typos etc. in the code that logs merged web.xml (as enabled by logEffectiveWebXml option on Context). (kkolinko) 53758: When adding filters via FilterRegistration.Dynamic the filters were added at the wrong point because the isMatchAfter logic was inverted. (markt) 53783: Correctly handle JARs generated by tools that do not create specific entries for directories. Patch provided by Violeta Georgieva. (markt) Improvements to DIGEST authenticator including the disabling caching of authenticated user in session by default, tracking server rather than client nonces and better handling of stale nonce values. (markt) Improve performance of DIGEST authenticator for concurrent requests. (markt) CVE-2012-3546: Fix bypass of security constraint checks with FORM authentication. Remove unneeded processing in RealmBase. (kkolinko) 53800: FileDirContext.list() did not provide correct paths for subdirectories. Patch provided by Kevin Wooten. (kkolinko) 53801: Overlapping URL patterns were sometimes merged incorrectly in security constraints leading to incorrect 401 responses. Note: it was possible for access to be denied when it should have been granted but it was not possible for access to be granted when it should have been denied. (markt)

Coyote

Remove the socket.soTrafficClass from the BIO and NIO HTTP and AJP connectors because any use of the option is either ignored or in some cases (Java 7 with NIO) throws an Exception. (mark) Prevent possible NPE when processing Comet requests during Connector shutdown. (markt) 42181: Better handling of edge conditions in chunk header processing. (kkolinko) 53697: Correct a regression in the fix for 51881 that mean that in some circumstances the comet flag was not reset on HttpAprProcessor instances. This caused problems when the Processor was re-used for a new connection that would trigger a NullPointerException and could result in a JVM crash. (markt) 53725: Fix possible corruption of GZIP'd output. (markt/kkolinko) Better parsing of line-terminators for requests using chunked encoding. (markt) Further improvements to handling of Comet END events when the connector is stopped. (markt)

Jasper

53545: Ensure buffered data is cleared when using a jsp:forward action inside a classic custom tag. (markt) 53654: Support file:// URLs for JSP dependencies. Patch provided by Viola Lu. (markt) 53792: Support MethodExpressions that include a method invocation that is not at the end of the expression. (markt)

Cluster

Fix an issue when running under Java 7 which throws exceptions when trying to set an invalid option whereas Java 6 silently swallowed them. The option using the problem was soTrafficClass. Investigations showed that this option had no effect for Cluster Channel Receivers so it was removed. (markt) 53513: Fix race condition between the processing of session sync message and transfer complete message. (kfujino)

Web applications

Update JSTL version information in the JNDI section of the documentation web application. (markt) 53524: Correct a typo in the cluster how-to section of the documentation web application. Also fix a handful of spelling errors. (markt) 53601: Clarify in documentation that building Apache Tomcat 7 from sources requires a Java 6 JDK. (kkolinko) 53653: Allow for wrapped source code example in config/context.html. Patch provided by Terence Bandoian. (schultz) 53793: Change links on the list of applications in the Manager to point to '/appname/' instead of '/appname'. (kkolinko)

Tribes

Avoid potential NPE identified by Find Bugs in org.apache.catalina.tribes.io.ReplicationStream. (markt) 53606: Fix potential NPE in TcpPingInterceptor. Based on a patch by F. Arnoud. (markt) 53607: To avoid NPE, set TCP PING data to ChannelMessage. Patch provided by F.Arnoud (kfujino)

Other

53701: Javadoc fixes. Patch provided by sebb. (markt) Remove some unused code from Tomcat's package renamed, cut-down copy of Commons BCEL used for annotation scanning. (markt) 53735: Add support for Java 7 byte code to Tomcat's package renamed, cut-down copy of Commons BCEL used for annotation scanning. (markt)

Catalina

Add support for searching for roles in JNDI/LDAP using another value than the actual DN or username specified. Rather it will use a value from the users directory entry. The new attribute introduced to the JNDIRealm is userRoleAttribute (fhanik) Fix checking of recommended tcnative library version when using the APR connector. (rjung) 50306: Improve StuckThreadDetectionValve: add stuckThreadNames property as a pair for the stuckThreadIds one, add thread ids to the log messages. (kkolinko) 52135: Add support for a default error page to be defined in web.xml by defining an error page with just a nested location element. It appears this feature was intended to be included in the Servlet 3.0 specification but was accidently left out. (markt) 53450: Correct regression in fix for 52999 that could easily trigger a deadlock when deploying a ROOT web application. (markt) As per section 1.6.2 of the Servlet 3.0 specification and clarification from the Servlet Expert Group, the servlet specification version declared in web.xml no longer controls if Tomcat scans for annotations. Annotation scanning is now always performed - regardless of the version declared in web.xml - unless metadata complete is set to true. (markt) 53619: As per clarification from the Servlet Expert Group, JARs will always be scanned for ServletContainerInitializers regardless of the setting of metadata complete. However, if an absolute ordering is specified and a JAR is excluded from that ordering it will not be scanned for ServletContainerInitializers nor will it be scanned for matches to any HandleTypes annotations. (markt) 53465: Populate mapped-name property for resources defined in web.xml. Based on a patch by Violeta Georgieva. (markt) Make the request available when establishing a WebSocket connection. (markt) 53467: Correct a regression in the fix for 53257 that introduced problems for JSPs that used characters that must be encoded if used in a URI. (markt)

Coyote

53430: Avoid a JVM crash when a connector that requires the APR/native library is explicitly specified and the library, or a recent enough version of it, is not available. (markt)

Jasper

53421: Provide a more helpful error message if a getter or setter cannot be found for a bean property when using expression language. (markt) 53460: Allow container to handle errors if the creation of the PageContext fails rather than swallowing the error. (markt)

Web applications

Update the WebSocket examples in the examples web application so that they work with secure connections (wss) as well as non-secure (ws) connections. (markt) 53456: Minor corrections and improvements to the HTTP connector configuration reference. Patch provided by sebb. (markt) 53459: Correction and clarifications to the SSL Connector configuration examples in the SSL how-to. (markt) 53464: Correct reference to sample init.d script for use with jsvc in the documentation web application. (markt) 53473: Correct the allowed values for the SSI option isVirtualWebappRelative which are true or false. (markt) Document roleNested property of JNDIRealm in Configuration Reference. (kkolinko)

jdbc-pool

53445 (r1354173): Allow configurable name for SlowQueryReportJmx (fhanik) 53416 (r1354641): Multiple pools with the same name should register under JMX (fhanik)

Other

Fix cleanup of temporary files in TestNamingContext test. (kkolinko) Remove a few files from the source distribution that are not required since they are copied / generated during the build. (markt) Add manifest files to the set of files for which the line-ending is changed to match the OS defaults in the source distributions. (markt) Align Jk Ant tasks definitions between antlib.xml and catalina.tasks files, introducing jkupdate as synonym for jkstatus. The latter one is deprecated. Simplify bin/catalina-tasks.xml, replacing taskdef with typedef and adding Ant condition implementations used with JMX to jmxaccessor.tasks file. (kkolinko) 53454: Return correct content-length header for HEAD requests when content length is greater than 2GB. (markt)

Catalina

52055: An additional fix to ensure that the ChunkedInputFilter is correctly recycled. (markt) 52954: Make DIGEST authentication tolerant of clients (mainly older Android implementations) that do not follow RFC 2617 exactly. (markt) 52955: Implement custom thread factory for container start-stop thread pool. It allows to use daemon threads and give them more distinct names. (kfujino) 52999: Remove synchronization bottleneck from the firing of Container events. (markt) 53008: Additional test cases for BASIC authentication and RFC2617 compliance. Patch provided by Brian Burch. (markt) 53021: Correct WebSocket protocol version detection. (pero) Add new attributes of allow and deny to UserConfig. (kfujino) 53024: Fix context reloading so requests received during the reload are paused and processed when reloading completes rather than receiving 404 responses. (markt) Improve the handling of watched resources so that changes trigger a reload rather than a stop followed by a start which allows requests received to be paused and processed when reloading completes rather than receiving 404 responses. (markt) Remove potential bottleneck on creation of new WebSocket connections. (markt) 53047: If a JDBC Realm or DataSource Realm is configured for an all roles mode that only requires authorization (and no roles) and no role table or column is defined, don't populate the Principal's roles. (markt) 53056: Add APR version number to tcnative version INFO log message. (schultz) 53057: Add OpenSSL version number INFO log message when initializing. (schultz) Save a bit of memory in annotations cache in DefaultInstanceManager by trimming annotation lists to their size. (kkolinko) Correctly configure the parser used to process server.xml so that external entities may be used to include the content of external files into server.xml. (markt) Make sure ContextMBean#findFilterDefs returns correct filter definitions. (kfujino) Ensure that maxParameterCount applies to multi-part requests handled via the Servlet 3 file upload API. (markt) 53062: When constructing absolute URLs for redirects from relative URLs ensure that the resulting URLs are normalized. (markt) 53067: Ensure the WebSocket Servlet continues to work when requests are wrapped. (markt) Enable host's xmlBase attribute in ContextConfig. (kfujino) 53071: Use the message from the throwable (if there is one) when generating the report in the ErrorReportValve and no message has been specified via sendError(). (markt) 53074: Switch to an infinite socket timeout by default for WebSocket connections. (markt) 53081: Do not always cache resources loaded by the web application class loader since they may be very large which in turn could trigger a memory leak. Calls to the web application class loader's getResourceAsStream() method will now access the resource directly rather than via the cache in most cases. (markt) 53090: Include superclasses when considering injection targets. Patch provided by Borislav Kapukaranov. (markt) 53161: Provide a better error message if a ClassFormatException occurs during annotation scanning and do not prevent the web application from starting in this case. (markt) 53180: Improve check for setter method when processing annotations. Patch provided by Violeta Georgieva. (markt) 53225: Fix an IllegalStateException due to the JAR file being closed when accessing static resources in a JAR file when urlCacheProtection="false" in the JreMemoryLeakPreventionListener. (markt) 53230: Changed ManagerBase to throw TooManyActiveSessionsException instead of IllegalStateException when the maximum number of sessions has been exceeded and a new session will not be created. (schultz) 53257: Ensure that resources, including JSP files, that have names that include characters with special meanings in URLs (such as ampersand, semicolon, plus, hash and percent) are correctly handled. This bug is partially a regression caused by the original fix for 51584 and partially an existing issue that had not previously been identified. This fix reverts the original fix for 51584, correctly fixes that issue and fixes the additional issues identified by the test cases that were also added as part of this fix. (markt/kkolinko) 53266: If a class specified in a @HandlesTypes annotation on a ServletContainerInitializer is missing log a more helpful message and do not prevent the web application from starting. (markt) 53267: Ensure that using the GC Daemon Protection feature of the JreMemoryLeakPreventionListener does not trigger a full GC every hour. (markt) 53285: Do not require security-role-ref elements to contain a role-link element. (markt) 53301: Prevent double initialization of pre-created Servlet instances when used in embedded mode. (markt) 53322: When processing resource injection, correctly infer property name from its setter method if the name starts with several uppercase characters. (kkolinko) 53333: When processing JNDI resources, take account of the types of any specified injection targets to ensure that the resource definition and the injection target types are consistent. Based on a patch provided by Violeta Georgieva. (markt) 53337: Forwarding via a RequestDispatcher to an asynchronous Servlet always failed. Includes a test case based on code by Rossen Stoyanchev. (markt) 53339: Ensure WebSocket call backs (onOpen etc.) are called using the web application's class loader. (markt) 53342: To avoid BindException, make startStopThreads into a demon thread. (kfujino) 53353: Make the internal HTTP header parser more tolerant of Content-Type values that contain invalid parameters by ignoring the invalid parameters. It is a followup to bug 52811. (markt) 53354: Correctly handle @WebFilter annotations that do not include a mapping. (markt) 53356: Add support for servlets mapped explicitly to the context root of a web application. (markt) 53366: Ensure new HTTP header parser works correctly when running Tomcat under a security manager. (markt/kkolinko) 53368: Configure the default security policy to allow web applications to use WebSocket when running under a security manager. (markt/kkolinko) 53373: Allow whitespace around delimiters in <Context> aliases for readability. (schultz)

Coyote

52858, CVE-2012-4534: Correct fix for high CPU load. (fhanik) 53138: Broken Sendfile on SSL introduced in 7.0.27 (fhanik) 52055: Additional fix required to ensure that InputFilters are recycled between requests. (markt) 53061: Fix a problem in the NIO connector whereby if the poller was under low but consistent load (>1 request/per second and always less than 1 second between requests) timeouts never took place. (markt) 53063: When using an Executor with BIO, use the executor's maxThreads as the default for maxConnections. (markt) 53119: Prevent buffer overflow errors being reported when a client disconnects before the response has been fully written from an AJP connection using the APR/native connector. (markt) 53169: Allow developers to avoid chunked encoding for a response of unknown length by setting the Connection: close header. Based on a patch suggested by Philippe Marschall. (markt) 53173: Properly count down maxConnections (fhanik) Update default value of pollerThreadCount for the NIO connector. The new default value will never go above 2 regardless of available processors. (fhanik) Allow to retrieve the current connectionCount via getter from the endpoint and as JMX attribute of the ThreadPool mbean. (rjung) Correct an edge case where Comet END events were not send to connected clients when the Tomcat connector was stopped. (markt) 53406: Fix possible stack overflow on connection close when using Comet. (fhanik) Improve InternalNioInputBuffer.parseHeaders(). (kkolinko) Implement maxHeaderCount attribute on Connector. It is equivalent of LimitRequestFields directive of Apache HTTPD. Default value is 100. (kkolinko)

Jasper

48097#c7, 53366#c1: If JSP page unexpectedly fails to initialize PageContext instance, write exception to the logs instead of silent swallowing. (kkolinko) 53032: Modify JspC so it extends org.apache.tools.ant.Task enabling it to work with features such as namespaces within build.xml files. (markt)

Cluster

Avoid NPE when reload if a state of a BackupManager is FAILED. (kfujino) 53087: In order to avoid that a backup node expire a session, replicate session access time in BackupManager. (kfujino) Add support for SecureRandom to cluster manager template. (kfujino)

Web applications

Remove obsolete bug warning from Windows service documentation page. (rjung) 50182: Various improvements to the Compression Filter. Patch provided by David Becker. (markt) 52853: Clarify how Jar Scanner handles directories. (markt) 53158: Fix documented defaults for DBCP. Patch provided by ph.dezanneau at gmail.com. (rjung) 53203: Correct documentation for the default value of connectionTimeout attribute for AJP protocol connectors. (kkolinko) 53289: Clarify ResourceLink example that uses DataSource.getConnection(username, password) method. Not all data source implementations support it. (kkolinko) Fix several HTML markup errors in servlets of examples web application. (kkolinko) 53398: Correct spelling of "received" in the Manager application's XML output. (markt) 53403: Update a reference to the Servlet specification in the first web applciation section of the documentation web application to include newer versions of the specificarion. (markt)

jdbc-pool

50864 (r1311844): JMX enable most pool properties (fhanik) 53254 (r1340160): Add in the ability to purge connections from the pool (fhanik) 53367 (r1346691): Prevent pool from hanging during database failure (fhanik) When a connection is reconnected due to failed validation make sure the ConnectionState is reset or it will assume incorrect values (fhanik) 53374 (r1348056): Add support for the following properties in DataSourceFactory: commitOnReturn, rollbackOnReturn, useDisposableConnectionFacade, logValidationErrors and propagateInterruptState. Based on patch proposed by Suresh Avadhanula. (kkolinko)

Other

Update to Eclipse JDT Compiler 3.7.2 at maven tomcat-jasper.pom. (pero) Update the native component of the Tomcat APR/native connector to 1.1.24. (markt) Add missing dependencies in pom files. (markt) 53034: Add project.url and project.licenses sections to the POMs for the Maven artifacts. (markt) Properly mention jsp_2_2.xsd in the main LICENSE and INSTALLLICENSE files. (kkolinko) 53115: Fix using the command "catalina.bat run" when the value of %TEMP% contains spaces. (kkolinko) Add dependencies and description to "validate" target in build.xml, so that it could be run separately. Improve BUILDING.txt and RUNNING.txt. (kkolinko)

Catalina

Explicitly ignore empty path values in virtualClasspath attribute of VirtualWebappLoader class. Document that whitespace around the values is trimmed. Reformat documentation examples to make them more readable. (kkolinko) Further improve fix for 51197 to allow an error reporting Valve to write a response body if sendError() is called during an asynchronous request on a container thread. (markt) Correct fix for 51741 (r1307600): If VirtualDirContext class is configured with non-empty value of extraResourcePaths option (a feature added in 7.0.24), do not implicitly set allowLinking option to the value of true. If it is really needed, it should be set explicitly. (kkolinko) 52500: Added configurable mechanism to retrieve user names from X509 client certificates. Based on a patch provided by Michael Furman. (schultz) 52719: Fix a theoretical resource leak in the JAR validation that checks for non-permitted classes in web application JARs. (markt) Code clean-up identified by 52723, 52724, 52726, 52727, 52729, 52731 and 52732. (markt) 52792: Improve error message when a JNDI resource can not be found. (markt) 52811: Fix parsing of Content-Type header in HttpServletResponse.setContentType(). Introduces a new HTTP header parser that follows RFC2616. (markt/kkolinko) 52830: Correct JNDI lookups when using javax.naming.Name to identify the resource rather than a java.lang.String. (markt) 52833: Handle the case where the parent class loader for the Catalina object does not have the system class loader in its hierarchy. This may happen when embedding. Patch provided by olamy. (markt) 52839: Add a unit test for DigestAuthenticator and SingleSignOn. Patch provide by Brian Burch. (markt) 52846: Make sure NonLoginAuthenticator registers not MemoryUser but GenericPrincipal into a session when UserDatabaseRealm is used. (kfujino) 52850: Extend memory leak prevention and detection code to work with IBM as well as Oracle JVMs. Extend unit tests to check direct and indirect ThreadLocal memory leak detection. Based on a patch provided by Rohit Kelapure. (markt) Add support for the WebSocket protocol (RFC6455). Both streaming and message based APIs are provided and the implementation currently fully passes the Autobahn test suite. Also included are several examples. A significant contribution to this new functionality was provided by Johno Crawford — particularly the examples. Contributions were also provided by Petr Praus, Jonathan Drake & Slávka. (markt) When stopping a Context, ensure that any Servlets registered with JMX are unregistered. (markt) Make the implementation of Catalina.getParentClassLoader consistent with similar methods across the code base and have it return the system class loader if no parent class loader is set. (markt) 52953: Ensure users can authenticate when using DIGEST authentication with digested passwords if the digested password is stored using upper case hexadecimal characters since DIGEST authentication expects digests to use lower case characters. Based on a patch provided by Neale Rudd. (markt) 52957: Ensure that a Valve implements Lifecycle before calling any Lifecycle methods on that Valve. (markt) 52958: Fix MBean descriptors for org.apache.catalina.realm package. (markt) 52974: Fix NameNotFoundException when field/method is annotated with @Resource annotation. Patch provided by Violet Agg. (markt) Add support for multi-thread deployment in UserConfig. (kfujino)

Coyote

Correctly register NIO sockets with poller after processing Comet events to ensure that no read events are missed. This fixes an intermittent issue observed in the unit tests. (fhanik/markt) 52770: Fix a bug in the highly unlikely circumstance that an infinite timeout was specified for writing data to a client when using NIO. (markt) 52858: Fix high CPU load with SSL, NIO and sendfile when client breaks the connection before reading all the requested data. (markt) 52926: Avoid NPE when an NIO Comet connection times out on one thread at the same time as it is closed on another thread. (markt) Include port number when known in connector name when logging messages from connectors that use automatic free port allocation. (markt) Don't try an unlock the acceptor thread if it is not locked. This is unlikely to impact normal usage but it does fix some unit test issues. (markt) When using the APR connector ensure that any connections in a keep-alive state are closed when the connector is stopped rather than when the connector is destroyed. This is important when stop() followed by start() is called on the connector. (markt)

Jasper

52725: Use configurable package name for tags rather than hard-coded value so configuration actually works. (markt) 52758: Implement additional interface methods in Eclipse JDT integration required for Jasper to correctly with the latest Eclipse development code. (markt) 52772: Ensure uriRoot is fully validated before it is used. Patch based on a suggestion by Eugene Chung. (markt) 52776: Refactor the code so JspFragment.invoke cleans up after itself. Patch provided by Karl von Randow. (markt) 52970: Take account of coercion rules when invoking methods via EL. (markt) 52998: Partial fix. Remove static references to the EL expression factory and use per web application references instead. (markt) 52998: Remainder of fix. Cache the class to use for the EL expression factory per class loader. (kkolinko) 53001: Revert the fix for 46915 since the use case described in the bug is invalid since it breaks the EL specification. (markt)

Cluster

Replicate principal in ClusterSingleSignOn. (kfujino)

Web applications

52760: Fix expires filter mime type in javascript examples. (rjung) 52842: Exception in MBeanDumper when dumping MBean for StandardThreadExecutor. (rjung) Bring built-in mime types for embedded Tomcat more in line with the ones defined in the default web.xml configuration file. (rjung) Add support to the JMXProxyServlet which is part of the Manager application for fetching a specific key from a CompositeData value. Updated documentation, so that the entire 'get' command for the JMX proxy servlet is documented, including the new optional 'key' parameter. (schultz/markt)

jdbc-pool

Pool cleaner thread should be created using the classloader that loaded the pool, not the context loader (fhanik) 52804: Make pool properties serializable and cloneable. (fhanik) 51237 (r1302902): Slow Query Report should log using WARN level when queries are slow and within the threshold of caching it. (fhanik) 52002 (r1302948): Add in configuration option to disallow connection reuse. (r1305862): useDisposableConnectionFacade is by default enabled (fhanik) 52493 (r1302969): Java 7 DataSource method addition. (fhanik) 51893 (r1302990): Throw an error and notification when pool is exhausted. (fhanik) 50860 (r1303031): Add in option to configure logging for validation errors. (fhanik) 52066 (r1305931): Add in configuration option, progagateInterruptState, to allow threads to retain the interrupt state. (fhanik)

Other

52750: Fix the way how daemon.sh parses command options so that more then one can be provided. (mturk) Rearrange validate-eoln target in build.xml so that it could be run ahead of compilation. (kkolinko) Update Apache Commons Daemon to 1.0.10. (mturk) Update the native component of the Tomcat APR/native connector to 1.1.23 and take advantage of the simplified distribution. (mturk) Update to Eclipse JDT Compiler 3.7.2. (markt)

Catalina

Provide constants for commonly used Charset objects and use these constants where appropriate. (markt) Refactor the fix for 52184 to correct two issues (a missing class and incorrect class/method names) when using the extras logging packages. (markt) 52444: Only load classes during HandlesTypes processing if the class is a match. Previously, every class in the web application was loaded regardless of whether it was a match or not. (markt) 52488: Correct typo: exipre -> expire. (markt) Add a unit test for SSO authentication. Patch provided by Brian Burch. (markt) 52511: Correct regression in the fix for 51741 that caused a harmless exception to be logged when scanning for annotations and WEB-INF/classes did not exist. (markt) Refactor to remove a circular dependency between org.apache.catalina and org.apache.naming. (markt) Remove some initialisation code from the standard start process (i.e. via the scripts) that was intended for embedding but is not required when performing a standard start.(markt) Add new method to MBeanFactory that allows any Valve to be created and deprecate the methods to create specific Valves. (markt) Partial sync of MIME type mapping with mime.types from the Apache web server. (rjung) 52577: Fix a regression in the fix for 52328. Prevent output truncation when reset() is called on a response. (mark) 52586: Remove an old and now unnecessary hack that modified the path info reported via the javax.servlet.forward.path_info request attribute when forwarding to an error page. (markt) 52587: Ensure that if it is necessary to fall back to the default NullRealm, the NullRealm instance is created early enough for it to be correctly initialised. (markt) Fix millisecond output in AccessLogValve when using a SimpleDateFormat based time pattern. (rjung) 52591: When dumping MBean data, skip attributes where getters throw UnsupportedOperationException. (markt) 52607: Ensure that the extension validator checks the JARs in the shared and common class loaders for extensions. (markt) Correct a threading issue in the generation of the list of standard authenticators during Context initialization that could lead to a web application failing to start if Contexts were started in parallel. (markt) 52669: Correct regression that broke annotation processing in /WEB-INF/classes for web applications deployed as WARs, packageless classes and some embedding scenarios. The regression was introduced by the invalid assumptions made in the fix for 51741. (markt) 52671: When dumping MBean data, skip attributes where getters throw NullPointerException. (markt)

Coyote

51543: Provide a meaningful error message when writing more response headers than permitted. (markt) 52547: Ensure that bytes written (which is used by the access log) is correctly reset after an HTTP 1.0 request has been processed. (markt) Minor refactoring to reduce code duplication in the HTTP connectors. (markt) 52606: Ensure that POST bodies are available for reply after FORM authentication when using the AJP connectors. (markt)

Jasper

52474: Ensure that leading and trailing white space is removed from listener class names when parsing TLD files. (markt) 52480: When converting class path entries from URLs to files/directories, ensure that any URL encoded characters are converted. Fixes JSP compilation with javac when Tomcat is installed at a path that includes spaces. (markt) 52666: Correct coercion order in EL when processing the equality and inequality operators. (markt)

Web applications

Improve BUILDING.txt. Update instructions for building. Add instructions for using Checkstyle and running the tests. (kkolinko) 38216: Improve handling of null return values in the JMX proxy servlet which is part of the Manager application. (kkolinko) 52515: Make it clear in the Realm how-to in the documentation web application that digested password storage when using DIGEST authentication requires that MD5 digests are used. (markt) 52634: Fix typos in JSP examples. Patch provided by Felix Schumacher. (rjung) 52641: Remove mentioning of ldap.jar from docs. Patch provided by Felix Schumacher. (rjung)

jdbc-pool

Fix code style issues and enable Checkstyle checks for jdbc-pool when it is built within Tomcat. (kkolinko) 51582 Correct set and reset the query cache to avoid NPE (fhanik)

Other

Update Commons Daemon to 1.0.9 to resolve 52548 which meant that services created with service.bat did not set the catalina.home and catalina.base system properties. (markt) Implement check for correct end-of-line characters in the source files. It is run as separate target in build.xml. (kkolinko)

Web applications

Restore format of the first line of error message for JMX proxy servlet in case scripts were depending on it. (markt)

Other

When building a Windows installer do not copy whole "res" folder to output/dist, but only the files that we need. Apply fixcrlf filter only after the files are copied, so that INSTALLLICENSE file had correct line ends. (kkolinko) Remove res/License.rtf. The file that is actually shown by the Windows installer is res/INSTALLLICENSE. (kkolinko) Automate the OpenPGP signature generation for the release process. (markt) Don't exclude directories named target from the build process. (rjung)

Catalina

52184: Provide greater control over the logging of errors triggered by invalid input data (i.e. data over which Tomcat has no control). (markt/kkolinko) 52225: Fix ClassCastException in an Alias added to existing host through JMX. (kkolinko) Do not throw IllegalArgumentException from parseParameters() call when chunked POST request is too large, but treat it like an IO error. The FailedRequestFilter filter can be used to detect this condition. (kkolinko) 52245: Don't allow web applications to package classes from the javax.el package. Patch provided by pid. (markt) 52259: Fix regression caused by the addition of the threaded component start (46264) that triggered a deadlock on startup if no Realm was configured. (markt) 52293: Correctly handle the case when antiResourceLocking is enabled at the Context level when unpackWARs is disabled at the Host level. Based on a patch by Justin Miller. (markt) In ExtendedAccessLogValve when printing %-encoded value of a parameter, use UTF-8 encoding to convert parameter value to bytes instead of platform default encoding. (markt/kkolinko) 52303: Allow web applications that do not have a login configuration to participate in a SSO session. Patch provided by Brian Burch. (markt) 52316: When using sendfile, use the number of bytes requested to be written to the response in the access log valve for bytes written rather than recording a value of zero. (markt) 52326: Reduce log level for class loading errors during @HandlesTypes processing to debug. (markt) 52328: Improve performance when large numbers of single characters and/or small strings are written to the response via a Writer. (markt) 52384: Do not fail with parameter parsing when debug logging is enabled. (kkolinko) Do not flag extra '&' characters in parameters as parse errors. (kkolinko) Reduce log level for the message about hitting maxParameterCount limit from WARN to INFO. (kkolinko) 52387: Ensure that the correct host is used when configuring logging when Tomcat is embedded. Patch provided by David Calavera. (markt) 52405: Align the Servlet 3.0 implementation with the changes defined in the first maintenance release (also know as Rev. A). See the JCP documentation for a detailed list of changes (markt) Improve JMX names for objects related to Connectors that have the address attribute set. (markt) Remove some stale attributes from MBeans. (rjung) Move destruction of ContainerBase objects to ContainerBase to ensure that they are destroyed. (markt) 52443: Change the behaviour of the default Realm in the embedded use case so it is set once on the Engine rather than on every Context thereby avoiding the Lifecycle issues with having the same Realm set on multiple Contexts. (markt) Provide a new Realm implementation, the NullRealm, that does not contain any users and is used as the default Realm implementation (rather than the JAAS Realm which was used prior to this change) if no Realm is specified. (markt) 52461: Don't assume file based URLs when checking last modified times for global and host level web.xml files. Patch provided by violetagg. (markt) Add test cases for the BASIC and NonLogin Authenticators when not using SSO. Patch provided by Brian Burch. (markt)

Coyote

52028: Add support for automatic binding to a free port by a connector if the special value of zero is used for the port. This is mainly useful in embedded and testing scenarios. (markt) Remove obsolete emptySessionPath JMX attribute. (rjung) Correct error in fix for 49683. (markt) Ensure that the process of unlocking the acceptor thread does not trigger processing of the connection as if it were a valid request. (markt)

Jasper

52450: Add setter for entityResolver in ParserUtils. This is mainly useful when jasper and dtds are in different class loaders. (mturk) 52321: Ensure that the order of multiple prelude/coda values for JSP pages is respected. (markt) 52335: Only handle <\% and not \% as escaped in template text. (markt) 52440: Ensure that when using ValueExpression.getValueReference() if the expression is an EL variable that the value returned is the ValueReference for the ValueExpression associated with the EL variable. (markt) 52445: Don't assume that EL method expressions have exactly three components (identifier, method name, paramaters). (markt)

Web applications

38216: Add the ability to invoke MBean operations to the JMX proxy sevrlet in the Manager application. Based on a patch by Christopher Hlubek. (markt) Further clarify the relation between values used by RemoteIpValve and RemoteIpFilter and their use by AccessLogValve. (kkolinko) 52243: Improve windows service documentation to clarify how to include # and/or ; in the value of an environment variable that is passed to the service. (markt) 52366: Fix typo in VirtualWebappLoader documentation (configuration example). (rjung) Replace Bugzilla search link on ROOT/index.jsp page with one pointing to the bug reporting page of Tomcat site. (kkolinko) Move MBean dump code from JMXProxyServlet into a utility class. (rjung)

Tribes

52208: Fix threading issue that may lead to harmless NPE during shutdown that has occasionally been observed when running the unit tests. (markt) 52213, 52354, 52355 and 52356: Fix some potential concurrency issues in FastQueue. (markt)

jdbc-pool

r1207712: Pool cleaner should be a global thread, not spawn one thread per connection pool. (fhanik)

Other

Update Apache Commons Daemon to 1.0.8. (mturk) Update Apache Commons Pool to 1.5.7. (kkolinko) Fix line ends in .gitignore files contained in source distributions. (rjung) Run Mapper performance test twice if the first run took too long, to ignore occasional failures. (kkolinko) Align .gitignore and build.xml exclude patterns with svn:ignore. (kkolinko) Configure defaultexcludes for Ant 1.8.1/1.8.2. The .git and .gitignore patterns are in since Ant 1.8.2, but we include .gitignore in src distributions. (kkolinko) 52237: Allow JUnit logs to be generated in formats other than plain text. Patch provided by M Hasko. (markt/kkolinko) Fix build condition for tomcat-dbcp to always rebuild whan a new version of commons-pool or commons-dbcp is downloaded. (kkolinko) Add example of configuration for SetCharacterEncodingFilter to the default web.xml file. (kkolinko) Switch unit tests to bind Connectors to localhost rather than all available IP addresses. (markt) Update to Eclipse JDT Compiler 3.7.1. (markt) Add Netbeans nbproject folder to svn:ignore and .gitignore. (rjung) Align .gitignore with trunk. (rjung)

Catalina

46264: Add the ability to start and stop containers (primarily Contexts) using a thread pool rather than a single thread. This can significantly improve start and stop time. Based on patches by Joe Kislo and Felix Schumacher. (markt) 50570: Enable FIPS mode to be set in AprLifecycleListener. Based upon a patch from Chris Beckey. (schultz/kkolinko) 51744: Throw the correct exception if an application attempts to modify the associated JNDI context. (markt) 51744: Add an option to the StandardContext that allows exception throwing when an application attempts to modify the associated JNDI context to be disabled. (markt) 51910: Prevent NPE on connector stop if Comet applications are being used without the CometConnectionManagerValve. (markt) 51940: Do not limit saving of request bodies during FORM authentication to POST requests since any HTTP method may include a request body. Based on a patch by Nicholas Sushkin. (markt/kkolinko) 51956: RemoteAddrFilter used getRemoteHost instead of getRemoteAddr when filtering Comet events. (schultz) 51952: Make the inclusion of a response body with a redirect response introduced to address 41718 optional and disabled by default due to the side-effects of including a body with the response in this case. (markt) 51972: Correctly handle protocol relative URLs when used with sendRedirect(). (markt) Simplify the deployment code and use full paths in log messages to remove any ambiguity in where a context is being deployed from. (markt) 52009: Fix a NPE during access log entry recording when an error occurred during the processing of a Comet request. (markt) In OneLineFormatter log formatter in JULI always use the US locale to format the date (esp. the month names). (rjung) Cache the results of parsing the global and host level web.xml files to improve web application start time. (markt) 52042: Correct threading issue in annotation caching that could lead to an NPE if multiple threads were processing the same class hierarchy for annotations. (markt) Correct additional threading and premature clearance issues with the annotation cache. (markt) Correct a regression in the fix for 49779 that parameters POSTed by an unauthenticated user to a page that required FORM authentication were lost during the authentication process. (markt) 52055: Ensure that the input and output buffers are correctly reset between keep-alive requests when using Servlet 3.0 asynchronous request processing. (markt) Ensure changes to the configuration of the RemoteHostValve and the RemoteAddrValve via JMX are thread-safe. (markt) Ensure the the memory leak protection for the HttpClient keep-alive always operates even if the thread has already stopped. (markt) Remove the Java 1.2 specific error handling around the adding of the shutdown hook. (markt) Correct errors in i18n resources and resource usage that meant some messages were either not used or were incorrectly formatted. (markt) Replace the use of deprecated auth method names from authenticator.Constants with the auth method names from HttpServletRequest. (kkolinko) Make configuration issues for security related Valves and Filters result in the failure of the valve or filter rather than just a warning message. (markt) Improve performance of parameter processing for GET and POST requests. Also add an option to limit the maximum number of parameters processed per request. This defaults to 10000. Excessive parameters are ignored. Note that FailedRequestFilter can be used to reject the request if some parameters were ignored. (markt/kkolinko) 52091: Address performance issues related to lock contention in StandardWrapper. Patch provided by Taiki Sugawara. (markt) Switch to using Collections.enumeration() rather than custom code that does the same thing. (markt) 52113: Don't assume presence of context.xml file with JMX deployment. (markt) In RequestFilterValve (RemoteAddrValve, RemoteHostValve): refactor value matching logic into separate method and expose this new method isAllowed through JMX. (kkolinko) 52156: Ensure that getServletContext().getResource(path) returns the correct resource when path contains /../ sequences or any other sequences that require normalization. (markt) Report existence of HTTP request parameter parsing errors via new special ServletRequest attribute, org.apache.catalina.parameter_parse_failed. (kkolinko) New filter FailedRequestFilter that will reject a request if there were errors during HTTP parameter parsing. (kkolinko) Improve special attributes handling in Request object by using hash table lookup instead of series of string comparisons. (kkolinko) Deprecate unused methods in IntrospectionUtils class. (kkolinko) Improve processing of errors that are wrapped in InvocationTargetException. Rethrow fatal errors that must be rethrown. (kkolinko) Improve handling of failed web application deployments during automatic deployment. Once deployment of a web application fails in one form (e.g. WAR), no further attempt (e.g. directory) will be made to deploy that web application. The base Lifecycle implementation has been improved to allow failed web applications to be started once the configuration issues have been resolved. Any changes to a context.xml file (global, per host or web application specific) will now result in a redeploy of the affected web application(s) that ensures that any changes are correctly applied rather than a reload which ignores changes in context.xml files. (markt/kkolinko) 52173: Improve Javadoc for delegate attribute of WebappClassLoader. Based on a patch by bmargulies. (markt) Add denyStatus attribute to RequestFilterValve (RemoteAddrValve, RemoteHostValve valves) and RequestFilter (RemoteAddrFilter, RemoteHostFilter filters). It allows to use different HTTP response code when rejecting denied request. E.g. 404 instead of 403. (kkolinko) Slightly improve performance of UDecoder.convert(). Align %2f handling between implementations. (kkolinko)

Coyote

51881: Correctly complete Comet requests when the Comet END event is triggered asynchronously. (markt) 51905: Fix infinite loop in AprEndpoint shutdown if acceptor unlock fails. Reduce timeout before forcefully closing the socket from 30s to 10s. (kkolinko) 51912: Fix HTTP header processing in NIO HTTP connector. (kkolinko) Improve MimeHeaders.toString(). (kkolinko) Fix threading issue in NIO connectors during shutdown that meant Comet connections were not always shut down cleanly. (markt) In HTTP connectors: self-guard against using a non-recycled input buffer. Requests will be rejected with response status 400. (kkolinko) 52121: Fix possible output corruption when compression is enabled for a connector and the response is flushed. Includes a test case provided by David Marcks. (kkolinko/markt) Improve multi-byte character handling in Coyote output for HTTP and AJP. (rjung) Refactor acceptor unlock code to reduce waiting time during connector pause and stop. (markt)

Jasper

Correct possible (but very small) memory leak when using maxLoadedJsps to limit the number of JSPs loaded at any one time. (markt) 52051: Better handling of missing resource problems with non-standard Servlet mappings so that a 404 response is returned to the client rather than a 500 response. (markt) 52091: Address performance issues related to log creation in TagHandlerPool. Patch provided by Taiki Sugawara. (markt) Switch to using Collections.enumeration() rather than custom code that does the same thing. (markt)

Cluster

Avoid an unnecessary session ID change notice. Notice of changed session ID by JvmRouteBinderValve is unnecessary to BackupManager. In BackupManager, change of session ID is replicated by the call of a setId() method. (kfujino) Fix duplicate resetDeltaRequest() call in DeltaSession.setId(String). (kkolinko) Work around a known JVM bug that is fixed in 1.7.0_01 but still present in 1.6.0_29 and was triggering intermittent unit test failure for org.apache.catalina.tribes.group. TestGroupChannelMemberArrival.testMemberArrival. The bug affects any components that use NIO although it was more likely to be observed in the clustering module than the HTTP or AJP NIO connector. (markt) When Context manager does not exist, no context manager message is replied in order to avoid timeout (default 60sec) of GET_ALL_SESSIONS sync phase. (kfujino) Fix setting maxInactiveInterval, sessionIdLength and processExpiresFrequency for cluster managers. Use setter when setting maxActiveSessions. (rjung)

Web applications

50923: Use distinct background color for code tag in Tomcat documentation, for better readability. (kkolinko) 51630: Fix bug in async0 example that triggered an IllegalStateException in the application log. (markt) 52025: Add additional information regarding DriverManager, the service provider mechanism and memory leaks. (markt) 52049: Improve setup instructions for running as a Windows service: remove references to specific Windows operating systems - it easily becomes dated; correct information on how a JRE is identified and selected. (markt) 52172: Clarify Tomcat build instructions. Patch provided by bmargulies. (kkolinko)

jdbc-pool

52015: In jdbc-pool: JdbcInterceptor passes not 'this' but 'proxy' to getNext().invoke. (kfujino) In jdbc-pool: Improve handling of Errors that originate from methods invoked through reflection. In TrapException interceptor: rethrow Error as is, without wrapping it in a RuntimeException. (kkolinko) In jdbc-pool: Unwrap InvocationTargetException if it is caught in ResultSetProxy, like we do it elsewhere. (kkolinko) When building jdbc-pool from within Tomcat, use Tomcat's output directory location. This allows to move all build output away from the source tree. (kkolinko)

Other

Update the package re-named copy of Commons BCEL (formerly Jakarta BCEL) to the latest code from Commons BCEL trunk. (markt) Remove some unused code from the packaged renamed Commons BCEL. (markt) 52059: In Windows uninstaller: Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. (kkolinko) Start the process of deprecating unused and unnecessary code that will be removed in the next major release (8.0.x). (markt) Ignore .git directory when building the source distributive. (markt) Remove trailing whitespace from the default configuration files. (kkolinko) Improve RUNNING.txt. (kkolinko) Update optional Checkstyle library to 5.5. (kkolinko) In test suite: add LoggingBaseTest class to allow use of Tomcat logging configuration in tests that do not start Tomcat. (kkolinko) In test suite: speed up TestGroupChannelSenderConnections. Remove 48 seconds worth of waits. (kkolinko) 52148: Add tomcat-coyote.jar to catalina-tasks.xml as this JAR is now required by the Ant tasks. Patch provided by Volker Krebs. (markt) Add sample Apache Commons Daemon JSVC wrapper script bin/daemon.sh that can be used with /etc/init.d. (mturk)

Catalina

51550: An additional change that ensures any exceptions thrown by an Authenticator (or any other Valve configured for the Context) will be handled by the custom error pages for the Context if an appropriate error page is configured. (markt) 51580: Added a nicer error message when a WAR file contains filenames not properly encoded in UTF-8. (schultz) 51687: Added (optional) protection against sun.java2d.Disposer thread pinning a WebappClassLoader into memory in the JreMemoryLeakPreventionListener. (schultz) 51741: Fixes a problem with Eclipse WTP "Serve modules without publishing" feature where applications failed to access resources when using getResource() on the classloader. (slaurent) 51744: Prevent application code from closing the associated JNDI context while the application is running. (markt) Correct a regression with the fix for 51653 that broke custom error pages for 4xx responses from the Authenticators. Error handling and request listeners are now handled in the StandardHostValve to ensure they wrap all Context level activity. (markt) 51758: The digester (used for processing XML files) used the logger name org.apache.commons.digester.Digester rather than the expected org.apache.tomcat.util.digester.Digester. The digester has been changed to use the expected logger name. (markt/kkolinko) 51774: Fix incorrect cached method signature that prevented session tracking modes from being defined in web.xml when running under a security manager. (markt) Add an annotation cache to the DefaultInstanceManager that improves performance for applications that make use of a lot of non-poolable objects (e.g. tag files) that need to be scanned for annotations when created. (markt) Use the specification compliant request attribute of javax.servlet.request.ssl_session_id to access the SSL session ID and deprecated the Tomcat specific request attribute. (markt) Allow to overwrite the check for distributability of session attributes by session implementations. (rjung) Add Java 7 sunec.jar and zipfs.jar to the list of JARs to skip when scanning for TLDs and web fragments. (rjung) 51862: Added a classesToInitialize attribute to JreMemoryLeakPreventionListener to allow pre-loading of configurable classes to avoid some classloader leaks. (slaurent) Reduce visibility of static field ManagerBase.name and make it final. (kkolinko) Add thread name to juli OneLineFormatter. (rjung) Ensure Servlets that implement ContainerServlet always get treated as restricted. (markt) 51872: Ensure that the access log always uses the correct value for the remote IP address associated with the request and that requests with multiple errors do not result in multiple entries in the access log. (markt)

Coyote

Remove unused and undocumented socketCloseDelay attribute from NIO connector. (markt) 49683: Support separate connection and keep-alive timeouts for the APR/native connector HTTP and AJP connectors. (markt) Further re-factoring of the HTTP connectors to align the BIO, NIO and APR implementations. (markt) 51794: Fix race condition in NioEndpoint. (fhanik) 51811: Correct SSL configuration property name from sslImplemenationName to sslImplementationName. (rjung) Fix a timing issue in NIO connector that meant that stopping a connector did not trigger a Comet END event if the associated processor was processing a READ event when the connector was stopped. (markt) Replace unneeded call that iterated events queue in NioEndpoint.Poller. (kkolinko) 51860: Fix issues if using NIO with a custom SSLImplementation. Based on a suggestion by Roman Tsirulnikov. (markt) Allow the BIO HTTP connector to be used with SSL when running under Java 7. (markt) Don't send AJP CPONG if endpoint is already paused. (rjung) Align APR AJP connector with NIO one. Send 503 if endpoint is paused. (rjung) Accept AJP request even if endpoint is paused, if CPING was successful. (rjung)

Jasper

When unloading JSPs due to configuration of the maxLoadedJsps initialisation parameter, the unloading code was retaining a reference to the to the unloaded JSP preventing the associated class from being unloaded until the JSP that replaced it was itself unloaded. (markt) 51852: Correct two problems in the handling of varargs methods with the BeanELResolver. The first meant the wrong method was sometimes called and the second that an ArrayIndexOutOfBoundsExceptions could be thrown. Patch (including a test case) provided by Matt Benson. (markt)

Cluster

Refactor cluster manager configuration: move handling of common attributes to base class. (kfujino, rjung) New cluster manager attribute sessionAttributeFilter allows to filter which session attributes are replicated using a regular expression applied to the attribute name. (rjung)

Web applications

Correct the documentation for connectionLinger attribute for the AJP and HTTP connectors. (markt) Document caveat of using RemoteAddrValve with IPv6 addresses. (kkolinko)

jdbc-pool

In jdbc-pool: Avoid IllegalArgumentException when setting maxActive less than or equal to 0. ArrayBlockingQueue doesn't allow capacity of 0 or less. (kfujino) 48392 (r1169796): Fix typo in StatementDecoratorInterceptor. (fhanik) 51139: In jdbc-pool: validatorClassName and suspectTimeout are ignored. In order to support them correctly, validatorClassName and suspectTimeout are added to a property list. (kfujino) 51786: In jdbc-pool: Discarded connection is not active in a pool any longer. It removes from the active connection list. (kfujino) 51871: Fix dependency in Maven POM file of tomcat-jbdc. (kkolinko)

Other

Update the "test" target in the default build file to report a test failure only after all available connector variants (bio, nio, apr) have been tested. Do not stop after first connector that fails. (kkolinko) 51887: When running the unit tests, use a fast but insecure random number source for session ID generation to reduce the delays caused by waiting for entropy. (kkolinko/markt) Code clean-up to further reduce the number of warnings reported by Eclipse, FindBugs and CheckStyle. (markt/kkolinko)