Catalina

Use a more reliable mechanism for the DefaultServlet when determining if the current request is for custom error page or not. (markt) Ensure that when the Default or WebDAV servlets process an error dispatch that the error resource is processed via the doGet() method irrespective of the method used for the original request that triggered the error. (markt)

Coyote

Improve sendfile handling when requests are pipelined. (markt)

Catalina

Make it easier for sub-classes of Tomcat to modify the default web.xml settings by over-riding getDefaultWebXmlListener(). Patch provided by Aaron Anderson. (markt) Reduce the contention in the default InstanceManager implementation when multiple threads are managing objects and need to reference the annotation cache. (markt) 60674: Remove final marker from CorsFilter to enable sub-classing. (markt) 60683: Security manager failure causing NPEs when doing IO on some JVMs. (coty) 60688: Update the internal fork of Apache Commons BCEL to r1782855 to add early access Java 9 support to the annotation scanning code. (markt) 60718: Improve error handling for asynchronous processing and correct a number of cases where the requestDestroyed() event was not being fired and an entry wasn't being made in the access logs. (markt) 60808: Ensure that the Map returned by ServletRequest.getParameterMap() is fully immutable. Based on a patch provided by woosan. (markt)

Coyote

Ensure that executor thread pools used with connectors pre-start the configured minimum number of idle threads. (markt) 60594: Allow some invalid characters that were recently restricted to be processed in requests by using the system property tomcat.util.http.parser.HttpParser.requestTargetAllow. (csutherl)

Cluster

Make the accessTimeout configurable in ClusterSingleSignOn. The accessTimeout is used as a timeout period for PING in replication map. (kfujino) 60806: To avoid ClassNotFoundException, make sure that the web application class loader is passed to ReplicatedContext. (kfujino)

WebSocket

60617: Correctly create a CONNECT request when establishing a WebSocket connection via a proxy. Patch provided by Svetlin Zarev. (markt)

Tribes

Ensure that NoRpcChannelReply messages are not received on RpcCallback. (kfujino) When HTTP TRACE requests are disabled on the Connector, ensure that the HTTP OPTIONS response from custom the WebDAV servlet does not include TRACE in the returned Allow header. (markt) 60722: Take account of the dispatchersUseEncodedPaths setting on the current Context when generating paths for dispatches triggered by AsyncContext.dispatch(). (markt)

Other

60620: Fix configuration of Eclipse projects, broken by introduction of SafeForkJoinWorkerThreadFactory helper class. This class cannot be built with Java 6. (kkolinko) Update the packaged version of the Tomcat Native Library to 1.2.12 to pick up the latest Windows binaries built with OpenSSL 1.0.2k. (violetagg) 60784: Update all unit tests that test the HTTP status line to check for the required space after the status code. Patch provided by Michael Osipov. (markt) Update the NSIS Installer used to build the Windows installer to version 3.01. (markt) Refactor the build script and the NSIS installer script so that either NSIS 2.x or NSIS 3.x can be used to build the installer. This is primarily to re-enable building the installer on the Linux based CI system where the combination of NSIS 3.x and wine leads to failed installer builds. (markt)

Cluster

Make the accessTimeout configurable in BackupManager. The accessTimeout is used as a timeout period for PING in replication map. (kfujino)

Web applications

Ensure the ASF logo image is correctly displayed in docs and host-manager applications. (violetagg) 60824: Correctly cache the Subject in the session - if there is a session - when running under a SecurityManager. Patch provided by Jan Engehausen. (markt) Ensure request and response facades are used when firing application listeners. (markt/remm)

Catalina

53602: Add HTTP status code 451 (RFC 7725) to the list of HTTP status codes recognised by Tomcat. (markt) Correctly handle the configClass attribute of a Host when embedding Tomcat. (markt) 60379: Dispose of the GSS credential once it is no longer required. Patch provided by Michael Osipov. (markt) 60380: Ensure that a call to HttpServletRequest#logout() triggers a call to TomcatPrincipal#logout(). Based on a patch by Michael Osipov. (markt) 60387: Correct the javadoc for o.a.catalina.AccessLog.setRequestAttributesEnabled. The default value is different for the different implementations. (violetagg) 60393: Use consistent parameter naming in implementations of Realm#authenticate(GSSContext, boolean). (markt) 60395: Log when an Authenticator passes an incomplete GSSContext to a Realm since it indicates a bug in the Authenticator. Patch provided by Michael Osipov. (markt) Update the warnings that reference required options for running on Java 9 to use the latest syntax for those options. (markt) 60513: Fix thread safety issue with RMI cleanup code. (remm) 60620: Extend the JreMemoryLeakPreventionListener to provide protection against ForkJoinPool.commonPool() related memory leaks. (markt)

Coyote

Ensure that the endpoint is able to unlock the acceptor thread during shutdown if the endpoint is configured to listen to any local address of a specific type such as 0.0.0.0 or ::. (markt) Ensure sendfile is enabled by default for APR. (markt) Prevent read time out when the file is deleted while serving the response. The issue was observed only with APR Connector and sendfile enabled. (violetagg) Improve the logic that selects an address to use to unlock the Acceptor to take account of platforms what do not listen on all local addresses when configured with an address of 0.0.0.0 or ::. (markt) 60409: When unable to complete sendfile request, ensure the Processor will be added to the cache only once. (markt/violetagg)

Jasper

44294: Add support for varargs in UEL expressions. (markt) 60356: Fix pre-compilation of JSPs that depend on nested tag files packaged in a JAR. (markt) 60431: Improve handling of varargs in UEL expressions. Based on a patch by Ben Wolfe. (markt) 60497: Restore previous tag reuse behavior following the use of try/finally. (remm) Improve the error handling for simple tags to ensure that the tag is released and destroyed once used. (remm) 60497: Follow up fix using a better variable name for the tag reuse flag. (remm) Revert use of try/finally for simple tags. (remm) Refactor code generated for JSPs to reduce the size of the code required for tags. (markt)

Web applications

Correct a typo in Host Configuration Reference. Issue reported via comments.apache.org. (violetagg) In the documentation web application, be explicit that clustering requires a secure network for all of the cluster network traffic. (markt) Update the ASF logos to the new versions.

Tribes

Reduce the warning logs for a message received from a different domain in order to avoid excessive log outputs. (kfujino) Add log message that PING message has received beyond the timeout period. (kfujino) When a PING message that beyond the time-out period has been received, make sure that valid member is added to the map membership. (kfujino)

WebSocket

60437: Avoid possible handshake overflows in the websocket client. (remm)

jdbc-pool

58816: Implement the statistics of jdbc-pool. The stats infos are borrowedCount, returnedCount, createdCount, releasedCount, reconnectedCount, releasedIdleCount and removeAbandonedCount. (kfujino) 60194: If validationQuery is not specified, connection validation is done by calling the isValid() method. (kfujino) 60398: Fix testcase of TestSlowQueryReport. (kfujino) Enable reset the statistics without restarting the pool. (kfujino)

Other

60366: Change catalina.bat to use directly LOGGING_MANAGER and LOGGING_CONFIG variables in order to configure logging, instead of modifying JAVA_OPTS. Patch provided by Petter Isberg. (violetagg) New property is added test.verbose in order to control whether the output of the tests is displayed on the console or not. Patch provided by Emmanuel Bourg. (violetagg) Update the ASF logos used in the Apache Tomcat installer for Windows to use the new versions. Spelling corrections provided by Josh Soref. (violetagg)

Catalina

60117: Ensure that the name of LogLevel is localized when using OneLineFormatter. Patch provided by Tatsuya Bessho. (kfujino) 60151: Improve the exception error messages when a ResourceLink fails to specify the type, specifies an unknown type or specifies the wrong type. (markt) 60167: Ignore empty lines in /etc/passwd files when using the PasswdUserDatabase. (markt) Improve the access checks for linked global resources to handle the case where the current class loader is a child of the web application class loader. (markt) 60199: Log a warning if deserialization issues prevent a session attribute from being loaded. (markt) Correctly test for control characters when reading the provided shutdown password. (markt) When configuring the JMX remote listener, specify the allowed types for the credentials. (markt)

Coyote

60123: Avoid potential threading issues that could cause excessively large vales to be returned for the processing time of a current request. (markt) 60174: Log instances of HeadersTooLargeException during request processing. (markt) Correct the HTTP header parser so that DEL is not treated as a valid token character. (markt) 60319: When using an Executor, disconnect it from the Connector attributes maxThreads, minSpareThreads and threadPriority to enable the configuration settings to be consistently reported. These Connector attributes will be reported as -1 when an Executor is in use. The values used by the executor may be set and obtained via the Executor. (markt) If an I/O error occurs during async processing on a non-container thread, ensure that the onError() event is triggered. (markt) Improve detection of I/O errors during async processing on non-container threads and trigger async error handling when they are detected. (markt) Add additional checks for valid characters to the HTTP request line parsing so invalid request lines are rejected sooner. (markt)

Web applications

Add an example of using the classesToInitialize attribute of the JreMemoryLeakPreventionListener to the documentation web application. Based on a patch by Cris Berneburg. (markt) 60192: Correct a typo in the status output of the Manager application. Patch provided by Radhakrishna Pemmasani. (markt) Correct a typo in HTTP Connector How-To. Issue reported via comments.apache.org. (violetagg) Fix default value of validationInterval attribute in jdbc-pool. (kfujino) Correct a typo in CGI How-To. Issue reported via comments.apache.org. (violetagg) 60344: Add a note to BUILDING.txt regarding using the source bundle with the correct line endings. (markt)

Tribes

When the proxy node sends a backup retrieve message, ensure that using the channelSendOptions that has been set rather than the default channelSendOptions. (kfujino)

jdbc-pool

60099: Ensure that use all method arguments as a cache key when using StatementCache. (kfujino) 60139: Correct Javadocs for PoolConfiguration.getValidationInterval and setValidationInterval. Reported by Phillip Webb. (kfujino)

Other

Add documentation to the bin/catalina.bat script to remind users that environment variables don't affect the configuration of Tomcat when run as a Windows Service. Based upon a documentation patch by James H.H. Lampert. (schultz)

Catalina

Ensure Digester.useContextClassLoader is considered in case the class loader is used. (violetagg)

Jasper

60101: Remove preloading of the class that was deleted. (violetagg)

jdbc-pool

Notify jmx when returning the connection that has been marked suspect. (kfujino) Ensure that the POOL_EMPTY notification has been added to the jmx notification types. (kfujino)

Other

Update the packaged version of the Tomcat Native Library to 1.2.10 to pick up the latest Windows binaries built with OpenSSL 1.0.2j. (markt)

Catalina

57705: Add debug logging for requests denied by the remote host and remote address valves and filters. Based on a patch by Graham Leggett. (markt) Change the default of the sessionCookiePathUsesTrailingSlash attribute of the Context element to false since the problems caused when a Servlet is mapped to /* are more significant than the security risk of not enabling this option by default. (markt) 59708: Modify the LockOutRealm logic. Valid authentication attempts during the lock out period will no longer reset the lock out timer to zero. (markt) Improve error handling around user code prior to calling InstanceManager.destroy() to ensure that the method is executed. (markt) Ensure that reading the singleThreadModel attribute of a StandardWrapper via JMX does not trigger initialisation of the associated servlet. With some frameworks this can trigger an unexpected initialisation thread and if initilisation is not thread-safe the initialisation can then fail. (markt) By default, treat paths used to obtain a request dispatcher as encoded. This behaviour can be changed per web application via the dispatchersUseEncodedPaths attribute of the Context. (markt) 59839: Apply roleSearchAsUser to all nested searches in JNDIRealm. (fschumacher) Provide a mechanism that enables the container to check if a component (typically a web application) has been granted a given permission when running under a SecurityManager without the current execution stack having to have passed through the component. Use this new mechanism to extend SecurityManager protection to the system property replacement feature of the digester. (markt) When retrieving an object via a ResourceLink, ensure that the object obtained is of the expected type. (markt) 59866: When scanning WEB-INF/classes for annotations, don't scan the contents of WEB-INF/classes/META-INF (if present) since classes will never be loaded from that location. (markt) 59912: Fix an edge case in input stream handling where an IOException could be thrown when reading a POST body. (markt) 59966: Do not start the web application if the error page configuration in web.xml is invalid. (markt) Switch the CGI servlet to the standard logging mechanism and remove support for the debug attribute. (markt) Add a new initialisation parameter, envHttpHeaders, to the CGI Servlet to mitigate httpoxy (CVE-2016-5388) by default and to provide a mechanism that can be used to mitigate any future, similar issues. (markt) When adding and removing ResourceLinks dynamically, ensure that the global resource is only visible via the ResourceLinkFactory when it is meant to be. (markt) 60008: When processing CORs requests, treat any origin with a URI scheme of file as a valid origin. (markt) Improve handling of exceptions during a Lifecycle events triggered by a state transition. The exception is now caught and the component is now placed into the FAILED state. (markt) Fix a file descriptor leak when reading the global web.xml. (markt) 60041: Better error message if a JAR is deleted while a web application is running. Note: Deleting a JAR while the application is running is not supported and errors are expected. Based on a patch by gehui. (markt)

Coyote

Improve error handling around user code prior to calling InstanceManager.destroy() to ensure that the method is executed. (markt) 59904: Add a limit (default 200) for the number of cookies allowed per request. Based on a patch by gehui. (markt) Make timing attacks against the Realm implementations harder. (schultz) Refactor the code that implements the requirement that a call to complete() or dispatch() made from a non-container thread before the container initiated thread that called startAsync() completes must be delayed until the container initiated thread has completed. Rather than implementing this by blocking the non-container thread, extend the internal state machine to track this. This removes the possibility that blocking the non-container thread could trigger a deadlock. (markt)

Jasper

Improve error handling around user code prior to calling InstanceManager.destroy() to ensure that the method is executed. (markt) Improve the error handling for custom tags to ensure that the tag is returned to the pool or released and destroyed once used. (markt) Fixed StringIndexOutOfBoundsException. Based on a patch provided by wuwen via Github. (violetagg)

WebSocket

Improve error handling around user code prior to calling InstanceManager.destroy() to ensure that the method is executed. (markt) 59868: Clarify the documentation for the Manager web application to make clearer that the host name and IP address in the server section are the primary host name and IP address. (markt) 59908: Ensure that a reason phrase is included in the close message if a session is closed due to a timeout. (markt)

Web Applications

Do not log an additional case of IOExceptions in the error handler for the Drawboard WebSocket example when the root cause is the client disconnecting since the logs add no value. (markt) 59642: Mention the localDataSource in the DataSourceRealm section of the Realm How-To. (markt) Follow-up to the fix for 59399. Ensure that the new attribute transportGuaranteeRedirectStatus is documented for all Realms. Also document the NullRealm and when it is automatically created for an Engine. (markt) MBeans Descriptors How-To is moved to mbeans-descriptors-howto.html. Patch provided by Radoslav Husar. (violetagg) 60034: Correct a typo in the Manager How-To page of the documentation web application. (markt)

Tribes

Add log message when the ping has timed-out. (kfujino) If the ping message has been received at the AbstractReplicatedMap#leftOver method, ensure that notify the member is alive than ignore it. (kfujino)

jdbc-pool

Fix the duplicated connection release when connection verification failed. (kfujino) Ensure that do not remove the abandoned connection that has been already released. (kfujino) In order to avoid the unintended skip of PoolCleaner, remove the check code of the execution interval in the task that has been scheduled. (kfujino) 59849: Ensure that the connection verification is executed by initSQL (if required) if the borrowing PooledConnection has not been initialized. (kfujino) 59850: Ensure that the ResultSet is closed when enabling the StatementCache interceptor. (kfujino) 59923: Reduce the default value of validationInterval in order to avoid the potential issue that continues to return an invalid connection after database restart. (kfujino) Ensure that the ResultSet is returned as Proxy object when enabling the StatementDecoratorInterceptor. (kfujino) 60043: Ensure that the suspectTimeout works without removing connection when the removeAbandoned is disabled. (kfujino) Add log message of when returning the connection that has been marked suspect. (kfujino) Correct Javadoc for ConnectionPool.suspect(). Based on a patch by Yahya Cahyadi. (markt)

Other

Use the mirror network rather than the ASF master site to download the current ASF dependencies. (markt) Update the packaged version of the Tomcat Native Library to 1.2.8 to pick up the latest fixes and make 1.2.8 the minimum recommended version. (markt) Fixed typos in mbeans-descriptors.xml files. (violetagg) Update the internal fork of Commons BCEL to r1757132 to align with the BCEL 6 release. (markt) Update the internal fork of Commons Codec to r1757174. Code formatting changes only. (markt) Update the internal fork of Commons FileUpload to afdedc9. This pulls in a fix to improve the performance with large multipart boundaries. (markt) Update the download location for Objenesis. (violetagg)

Catalina

59219: Ensure AsyncListener.onError() is called if an Exception is thrown during async processing. (markt) 59220: Ensure that AsyncListener.onComplete() is called if the async request times out and the response is already committed. (markt) 59261: ServletRequest.getAsyncContext() now throws an IllegalStateException as required by the Servlet specification if the request is not in asynchronous mode when called. (markt) 59310: Do not add a Content-Length: 0 header for custom responses to HEAD requests that do not set a Content-Length value. (markt) When normalizing paths, improve the handling when paths end with /. or /.. and ensure that input and output are consistent with respect to whether or not they end with /. (markt) 59317: Ensure that HttpServletRequest.getRequestURI() returns an encoded URI rather than a decoded URI after a dispatch. (markt) Ensure that the value for the header X-Frame-Options is constructed correctly according to the specification when ALLOW-FROM option is used. (violetagg) 59399: Add a new option to the Realm implementations that ship with Tomcat that allows the HTTP status code used for HTTP -> HTTPS redirects to be controlled per Realm. (markt) 59449: In ContainerBase, ensure that the process to remove a child container is the reverse of the process to add one. Patch provided by Huxing Zhang. (markt) RMI Target related memory leaks are avoidable which makes them an application bug that needs to be fixed rather than a JRE bug to work around. Therefore, start logging RMI Target related memory leaks on web application stop. Add an option that controls if the check for these leaks is made. Log a warning if running on Java 9 with this check enabled but without the command line option it requires. (markt) Fix a potential concurrency issue with the web application class loader and concurrent reads and writes of the resource cache. (markt) 59619: Within the web application class loader, always use path as the key for the resource cache to improve the hit ratio. This also fixes a problem exposed by the fix for 56777 that enabled file based configuration resources to be loaded from the class path. (markt) Fix error message when failed to register MBean. (kfujino)

Coyote

58970: Fix a connection counting bug in the NIO connector that meant some dropped connections were not removed from the current connection count. (markt) 59289: Do not recycle upgrade processors in unexpected close situations. (remm) Ensure that requests with HTTP method names that are not tokens (as required by RFC 7231) are rejected with a 400 response. (markt) When an asynchronous request is processed by the AJP connector, ensure that request processing has fully completed before starting the next request. (markt) If an async dispatch results in the completion of request processing, ensure that any remaining request body is swallowed before starting the processing of the next request else the remaining body may be read as the start of the next request leading to a 400 response. (markt)

Jasper

Fix a memory leak in the expression language implementation that caused the class loader of the first web application to use expressions to be pinned in memory. (markt) 59654: Enforce the requirements of section 7.3.1 of the JSP specification regarding the permitted locations for TLD files. Patch provided by Huxing Zhang. (markt)

WebSocket

Ensure that a client disconnection triggers the error handling for the associated WebSocket end point. (markt)

Web Applications

Correct a typo in SSL/TLS Configuration How-To. Issue reported via comments.apache.org. (violetagg) 58891: Update the SSL how-to. Based on a suggestion by Alexander Kjäll. (markt)

Tribes

Fix potential NPE that depends on the setting order of attributes of static member when using the static cluster. (kfujino) Add get/set method for the channel that is related to ChannelInterceptorBase. (kfujino) As with the multicast cluster environment, in the static cluster environment, the local member inherits properties from the cluster receiver. (kfujino) Add get/set method for the channel that is related to each Channel services. (kfujino) Add name to channel in order to identify channels. In tomcat cluster environment, it is set the cluster name + "-Channel" as default value. (kfujino) Add the channel name to the thread which is invoked by channel services in order to identify the associated channel. (kfujino) Ensure that clear the channel instance from channel services when stopping channel. (kfujino) Implement map state in the replication map. (kfujino) Ensure that the ping is not executed during the start/stop of the replication map. (kfujino) In ping processing in the replication map, send not the INIT message but the newly introduced PING message. (kfujino)

jdbc-pool

Fix a memory leak with the pool cleaner thread that retained a reference to the web application class loader for the first web application to use a connection pool. (markt)

Other

Update the packaged version of the Tomcat Native Library to 1.2.7 to pick up the Windows binaries that are based on OpenSSL 1.0.2h and APR 1.5.2. (violetagg/markt) Remove native code (Windows Service Wrapper, APR/native connector) support for Windows Itanium. (markt) Update the internal fork of Commons File Upload to r1743698 (1.3.1 plus additional fixes). (markt) 58626: Add support for a new environment variable (USE_NOHUP) that causes nohup to be used when starting Tomcat. It is disabled by default except on HP-UX where it is enabled by default since it is required when starting Tomcat at boot on HP-UX. (markt)

Catalina

Fix the type of InstanceManager attribute of mbean definition of StandardContext. (kfujino) 58351: Make the server build date and server version number accessible via JMX. Patch provided by Huxing Zhang. (markt) 59001: Correctly handle the case when Tomcat is installed on a path where one of the segments ends in an exclamation mark. (markt) Expand the fix for 59001 to cover the special sequences used in Tomcat's custom jar:war: URLs. (markt) 59043: Avoid warning while expiring sessions associated with a single sign on if HttpServletRequest.logout() is used. (markt) 59054: Ensure that using the CrawlerSessionManagerValve in a distributed environment does not trigger an error when the Valve registers itself in the session. (markt) Log a warning message if a user tries to configure the default session timeout via the deprecated (and ignored) Manager.setMaxInactiveInterval() method. (markt) Correct a regression introduced in 7.0.68 where the deprecated Manager.getMaxInactiveInterval() method returned the current default session timeout in minutes rather than seconds. (markt) When a Host is configured with an appBase that does not exist, create the appBase before trying to expand an external WAR file into it. (markt) 59115: When using the Servlet 3.0 file upload, the submitted file name may be provided as a token or a quoted-string. If a quoted-string, unquote the string before returning it to the user. (markt) 59123: Close NamingEnumeration objects used by the JNDIRealm once they are no longer required. (fschumacher/markt) 59138: Correct a false positive warning for ThreadLocal related memory leaks when the key class but not the value class has been loaded by the web application class loader. (markt) 59145: Don't log an invalid warning when a user logs out of a session associated with SSO. (markt) 59151: Fix a regression in the fix for 56917 that added additional (and arguably unnecessary) validation to the provided redirect location. (markt) 59206: Ensure NPE will not be thrown by o.a.tomcat.util.file.ConfigFileLoader when catalina.base is not specified. (violetagg) 59213: Async dispatches should be based off a wrapped request. (remm) 59217: Remove duplication in the recycling of the path in o.a.tomcat.util.http.ServerCookie. Patch is provided by Kyohei Nakamura. (violetagg) Ensure that javax.servlet.ServletRequest and javax.servlet.ServletResponse provided during javax.servlet.AsyncListener registration are made available via javax.servlet.AsyncEvent.getSuppliedRequest and javax.servlet.AsyncEvent.getSuppliedResponse (violetagg) Clarify the log message that specifying both urlPatterns and value attributes in WebServlet and WebFilter annotations is not allowed. (violetagg) Ensure the exceptions caused by Valves will be available in the log files so that they can be evaluated when o.a.catalina.valves.ErrorReportValve.showReport is disabled. Patch is provided by Svetlin Zarev. (violetagg) 59247: Preload ResourceEntry as a workaround for security manager issues on some JVMs. (kkolinko/remm) 59269: Correct the implementation of PersistentManagerBase so that minIdleSwap functions as designed and sessions are swapped out to keep the active session count below maxActiveSessions. (markt)

Coyote

58646: Correct a problem with sendfile that resulted in a Processor being added to the cache twice leading to broken responses. (markt) 59015: Fix potential cause of endless APR Poller loop during shutdown if the Poller experiences an error during the shutdown process. (markt) Limit the default TLS ciphers for JSSE (BIO, NIO) and OpenSSL (APR) to those currently considered secure. (markt) Add a new environment variable JSSE_OPTS that is intended to be used to pass JVM wide configuration to the JSSE implementation. The default value is -Djdk.tls.ephemeralDHKeySize=2048 which protects against weak Diffie-Hellman keys. (markt)

WebSocket

59014: Ensure that a WebSocket close message can be sent after a close message has been received. (markt) Correctly handle compression of partial messages when the final message fragment has a zero length payload. (markt) Extend the WebSocket programmatic echo endpoint provided in the examples to handle binary messages and also partial messages. This aligns the code with Tomcat 8 and makes it easier to run the Autobahn testsuite against the WebSocket implementation. (markt) 59119: Correct read logic for WebSocket client when using secure connections. (markt) 59134: Correct client connect logic for secure connections made through a proxy. (markt) 59189: Explicitly release the native memory held by the Inflater and Deflater when using PerMessageDeflate and the WebSocket session ends. Based on a patch by Henrik Olsson. (markt)

Web Applications

Correct the description of the ServletRequest.getServerPort() in Proxy How-To. Issue reported via comments.apache.org. (violetagg) Fix a potential indefinite wait in the Comet Chat servlet in the examples web application. (markt) 59229: Fix error in HTTP docs and make clear the the HTTP NIO connector uses non-blocking I/O to read the HTTP request headers. (markt) Update in the documentation the link to the maven repository where Tomcat snapshot artifacts are deployed. (markt/violetagg) Clarify in the documentation that calls to ServletContext.log(String, Throwable) or GenericServlet.log(String, Throwable) are logged at the SEVERE level. (violetagg)

Tribes

If promoting a proxy node to a primary node when getting a session, notify the change of the new primary node to the original backup node. (kfujino) Avoid NPE when a proxy node failed to retrieve a backup entry. (kfujino) Add log of when received an unexpected messages. (kfujino) Add the flag indicating that member is a localMember. (kfujino)

Other

58283: Change the default download location for libraries during the build process from /usr/share/java to ${user.home}/tomcat-build-libs. Patch provided by Ahmed Hosni. (markt) 59031: When using the Windows uninstaller, do not remove the contents of any directories that have been symlinked into the Tomcat directory structure. (markt) Modify the default tomcat-users.xml file to make it harder for users to configure the entries intended for use with the examples web application for the Manager application. (markt) 59211: Add hamcrest to Eclipse classpath. Patch is provided by Huxing Zhang. (violetagg) 59280: Update the NSIS Installer used to build the Windows Installers to version 2.51. (kkolinko)

General

Allow to configure multiple JUnit test class patterns with the build property test.name and document the property in BUILDING.txt. (rjung)

Catalina

Correct implementation of validateClientProvidedNewSessionId so client provided session IDs may be rejected if validation is enabled. (markt) 56785: Avoid NullPointerException if directory exists on the class path that is not readable by the Tomcat user. (kkolinko) 57906: Suppress WebappClassLoader log messages when running with a security manager on Java 6, caused by java.beans.Introspector.findExplicitBeanInfo() calls during evaluation of EL expressions. (kkolinko) 58692: Make StandardJarScanner more robust. Log a warning if a class path entry cannot be scanned rather than triggering the failure of the web application. (markt) 58701: Reset the instanceInitialized field in StandardWrapper when unloading a Servlet so that a new instance may be correctly initialized. (markt) 58702: Ensure an access log entry is generated if the client aborts the connection. (markt) Fixed various issues reported by Findbugs. (violetagg) 58735: Add support for the X-XSS-Protection header to the HttpHeaderSecurityFilter. Patch provided by Jacopo Cappellato. (markt) 58751: Correctly handle the case where an AsyncListener dispatches to a Servlet on an asynchronous timeout and the Servlet uses sendError() to trigger an error page. Includes a test case based on code provided by Andy Wilkinson.(markt) 58765: Change default for mapperContextRootRedirectEnabled to true since this is required for correct session management because of the default for sessionCookiePathUsesTrailingSlash. (markt) Add the StatusManagerServlet to the list of Servlets that can only be loaded by privileged applications. (markt) Simplify code and fix messages in org.apache.catalina.core.DefaultInstanceManager class. (kkolinko) Ensure that the proper file encoding if specified will be used when a readme file is served by DefaultServlet. (violetagg) Fix declaration of localPort attribute of Connector MBean: it is read-only. (kkolinko) 58766: Make skipping non-class files during annotation scanning faster by checking the file name first. Improve debug logging. (kkolinko) 58768: Log a warning if a redirect fails because of an invalid location. (markt) 58836: Correctly merge query string parameters when processing a forwarded request where the target includes a query string that contains a parameter with no value. (markt/kkolinko) Make sure that shared Digester is reset in an unlikely error case in HostConfig.deployWAR(). (kkolinko) Fix a potential JDBC resource leak in DataSourceRealm. (schultz) 58900: Correctly undeploy symlinked resources and prevent an infinite cycle of deploy / undeploy. (markt) Protect initialization of ResourceLinkFactory when running with a SecurityManager. (kkolinko) Extend the feature available in the cluster session manager implementations that enables session attribute replication to be filtered based on attribute name to all session manager implementations. Note that configuration attribute name has changed from sessionAttributeFilter to sessionAttributeNameFilter. Apply the filter on load as well as unload to ensure that configuration changes made while the web application is stopped are applied to any persisted data. (markt) Extend the session attribute filtering options to include filtering based on the implementation class of the value and optional WARN level logging if an attribute is filtered. These options are available for all of the Manager implementations that ship with Tomcat. When a SecurityManager is used filtering will be enabled by default. (markt) 58905: Ensure that Tomcat.silence() silences the correct logger and respects the current setting. (markt) 58946: Ensure that the request parameter map remains immutable when processing via a RequestDispatcher. (markt)

Coyote

New configuration option ajpFlush for the AJP connectors to disable the sending of AJP flush packets. (rjung)

Jasper

Fix handling of missing messages in org.apache.el.util.MessageFactory. (violetagg) Ignore engineOptionsClass and scratchdir when running under a security manager. (markt)

Cluster

In order to avoid that the heartbeat thread and the background thread to run Channel.heartbeat simultaneously, if heartbeatBackgroundEnabled of SimpleTcpCluster set to true, ensure that the heartbeat thread does not start. (kfujino)

WebSocket

57489: Ensure onClose() is called when a WebSocket connection is closed even if the sending of the close message fails. Includes test cases by Barry Coughlan. (markt) Fix a timing issue on session close that could result in an exception being thrown for an incomplete message even through the message was completed. (markt)

Web Applications

Correct some typos in the JNDI resources How-To. (markt) Don't create sessions unnecessarily in the Manager application. (markt) Don't create sessions unnecessarily in the Host Manager application. (markt) 58723: Clarify documentation and error messages for the text interface of the manager to make clear that version must be used with path when referencing contexts deployed using parallel deployment. (markt) Correct an error in the documentation of the expected behaviour for automatic deployment. If a WAR is updated and an expanded directory is present, the directory will always be deleted and recreated by expanding the WAR if unpackWARs is true. (markt) 58935: Remove incorrect references in the documentation to using jar:file: URLs with the Manager application. (markt)

Tribes

Add support for the startup notification of local members in the static cluster. (kfujino) Ignore the unnecessary member remove operation from different domain. (kfujino) Add support for the shutdown notification of local members in the static cluster. (kfujino) Ensure that asynchronous session replication thread is a daemon thread. (kfujino)

Other

Update the NSIS Installer used to build the Windows Installers to version 2.50. (markt/kkolinko)

Catalina

56917: As per RFC7231 (HTTP/1.1), allow HTTP/1.1 and later redirects to use relative URIs. This is controlled by a new attribute useRelativeRedirects on the Context and defaults to true. (markt) 58660: Correct a regression in 7.0.66 caused by the change that moved the redirection for context roots from the Mapper to the Default Servlet. (markt) Fixed potential NPE in HostConfig while deploying an application. Issue reported by coverity scan. (violetagg) 58655: Fix an IllegalStateException when calling HttpServletResponse.sendRedirect() with the RemoteIpFilter. This was caused by trying to correctly generate the absolute URI for the redirect. With the fix for 56917, redirects may now be relative making the sendRedirect() implementation for the RemoteIpFilter much simpler. This also addresses issues where the redirect may not have behaved as expected when redirecting from http to https to from https to http. (markt)

WebSocket

58658: Correct a regression in 7.0.66 that prevented Tomcat from starting on Java 6 unless the WebSocket JARs (that require Java 7) were removed. (markt)

Web Applications

Add a description of the default value of heartbeatSleeptime attribute and optionCheck attribute in the cluster channel docs. (kfujino)

Tribes

Fix potential NPE in AbstractReplicatedMap.breakdown(). (kfujino)

General

58596: Clarify the description in RUNNING.txt of how environment variables are used. (markt)

Catalina

34319: Only load those keys in StoreBase.processExpire from JDBCStore, that are old enough, to be expired. Based on a patch by Tom Anderson. (fschumacher) 56777: Allow file based configuration resources (user database, certificate revocation lists, keystores and trust stores) to be configured using URLs as well as files. Back-port provided by Huxing Zhang. (markt/violetagg) 57741: Enable the CGI servlet to use the standard error page mechanism. Note that if the CGI servlet's debug init parameter is set to 10 or higher then the standard error page mechanism will be bypassed and a debug response generated by the CGI servlet will be returned instead. (markt) 58486: Protect against two further possible memory leaks associated with XML parsing. (markt) 58497: Make AbstractHttp11Processor easy to extend. (markt) 58508: Escape role names when generating associated MBeans in case the role name contains characters not permitted in an MBean name. (markt) 58522: Fixed concurrency issue when iterating web application's resources. (violetagg) 58534: Removed repeated conditional tests in o.a.tomcat.websocket.pojo.PojoMethodMapping and o.a.tomcat.util.net.AprEndpoint Patch provided by Anthony Whitford. (violetagg) 58535: Use Collections.reverseOrder when a reverse ordering is needed. (violetagg) 58537: Some of the inner classes in o.a.catalina.valves.ExtendedAccessLogValve are made static. Patch provided by Anthony Whitford. (violetagg) 58540: Removed unused code from o.a.catalina.connector.Request. Patch provided by Anthony Whitford. (violetagg) 58541, 58544: It is more efficient to call Integer.toString(int) instead of Integer.valueOf(int).toString() when only a string representation of a primitive is needed. Based on a patch provided by Anthony Whitford. (violetagg) 58541, 58547: It is more efficient to call valueOf(...) instead of Number constructor. Based on a patch provided by Anthony Whitford. (violetagg) 58545: In some use cases it is more efficient to use Map.entrySet() instead of Map.keySet() Based on a patch provided by Anthony Whitford. (violetagg) Add a new RestCsrfPreventionFilter that provides basic CSRF protection for REST APIs. (violetagg) 58581: If a custom error page fails, fall back to the standard error page rather than throwing an NPE. Based on a patch by Huxing Zhang. (markt) 58582: Combined realm should perform background processing on its sub-realms. Based upon a patch provided by Aidan. (kkolinko) Handle the unlikely case where different versions of a web application are deployed with different session settings. (markt) Add a new Context option, enabled by default, that enables an additional check that a client provided session ID is in use in at least one other web application before allowing it to be used as the ID for a new session in the current web application. (markt) Add support for DIGEST authentication to the JNDIRealm. Based on a patch by Alexis Hassler. (markt) 58603: Ensure that HttpServletRequest.getRequestURL() returns the correct value when using the RemoteIpFilter. (markt) Ensure that in an embedded Tomcat the logging configuration is not lost during garbage collection. (violetagg) Move the functionality that provides redirects for context roots and directories where a trailing / is added from the Mapper to the DefaultServlet. This enables such requests to be processed by any configured Valves and Filters before the redirect is made. This behaviour is configurable via the mapperContextRootRedirectEnabled and mapperDirectoryRedirectEnabled attributes of the Context which may be used to restore the previous behaviour. (markt) 58635: Enable break points to be set within agent code when running Tomcat with a Java agent. Based on a patch by Huxing Zhang. (markt) Add path parameter handling to HttpServletRequest.getContextPath(). This is a follow-up to the fix for 57215. (markt)

Jasper

57136#c25: Implement a setting that controls what quoting rule is used when parsing EL expressions in attributes on a JSP page (chapter JSP.1.6 of specification). The setting name is quoteAttributeEL and it is configured as initialisation parameter of JSP Servlet (per web application configuration is possible) and as a command line option for JspC. The default value was changed to true, which restores behaviour implemented in Tomcat 7.0.64. It means that attribute quoting is applied on top of EL quoting. This provides better compatibility with older versions of Tomcat and other implementations. (kkolinko)

Cluster

Optimize the session lock range in DeltaManager.requestCompleted. (kfujino) Enable an explicit configuration of local member in the static cluster membership. (kfujino) Fix potential integer overflow in DeltaSession. Reported by coverity scan. (fschumacher)

Tribes

Distinguish the handling of the shutdown payload and member verification clearly. When handling shutdown payload, verification completion message is not required. (kfujino) When starting the StaticMembershipInterceptor, StaticMembershipInterceptor checks the required Interceptors. If the required Interceptor does not exist, it issues warning logs. (kfujino) Ensure that the static member is registered to the add suspect list even if the static member that is registered to the remove suspect list has disappeared. (kfujino) Correct the warning log of when the member that is not registered in the membership is detected. (kfujino) When using a static cluster, add the members that have been cached in the membership service to the map members list in order to ensure that the map member is a static member. (kfujino)

WebSocket

Use instance manager for server endpoint instances. (remm) 55006: The WebSocket client now honors the java.net.java.net.ProxySelector configuration (using the HTTP type) when establishing WebSocket connections to servers. Based on a patch by Niki Dokovski. (markt) 58624: Correct a thread safety issue that meant that blocking message writes could block indefinitely if the WebSocket connection was closed while a message write was in progress. (markt)

Web applications

Make it clear in the documentation for the CGI servlet that the debug page is not considered secure and should not be used in production. (markt) The domain attribute of StaticMember is not required but optional. (kfujino) 58631: Correct the continuation character use in the Windows Service How-To page of the documentation web application. (markt)

jdbc-pool

58489: Correct QueryStatsComparator to hold up the general contract for Comparator. (fschumacher) When creating a QueryStats object, ensure that maxQueries is checked. If maxQueries is a value less than or equal to 0, QueryStats are never created. (kfujino) Fix potential integer overflow in ConnectionPool and PooledConnection. Reported by coverity scan. (fschumacher)

Catalina

57681: Add a web application class loader implementation that supports the parallel loading of web application classes. Use of this feature requires a Java 7 or later JRE. Based on a patch by Huxing Zhang. (markt) 58187: Correct a regression in the fix for 57765 that meant that deployment of web applications deployed via the Manager application was delayed until the next execution of the automatic deployment background process. (markt) 58284: Correctly implement session serialization so non-serializable attributes are skipped with a warning. Patch provided by Andrew Shore. (markt) 58313: Fix concurrent access of encoders map when clearing encoders prior to switch to async. (markt) 58320: Fix concurrent access of request attributes which is possible during asynchronous processing. (markt) In preparation for implementing enhancement 57681, replace the use of the StandardClassLoader with URLClassLoader. This removes the server class loader from JMX. (markt) 58352: Always trigger a thread dump if Tomcat fails to stop gracefully from catalina.sh even if using -force. Patch provided by Alexandre Garnier. (markt) 58416: Correctly detect when a forced stop fails to stop Tomcat because the Tomcat process is waiting on some system call or is uninterruptible. (markt) 58436: Fix some rare data races in JULI's ClassLoaderLogManager during shutdown. (markt)

Coyote

Correct some edge cases in RequestUtil.normalize(). (markt) 58275: The IBM JREs accept cipher suite names starting with TLS_ or SSL_ but when listing the supported cipher suites only the SSL_ version is reported. This can break Tomcat's check that at least one requested cipher suite is supported. Tomcat now includes a work-around so either form of the cipher suite name can be used when running on an IBM JRE. (markt) 58357: For reasons not currently understood when the APR/native connector is used with OpenSSL reads can return an error code when there is no apparent error. This was work-around for HTTP upgrade connections by treating this as EAGAIN. The same fix has now been applied to the standard HTTP connector. (markt) 57799: Remove useless sendfile check for NIO SSL. (remm)

Jasper

57136: Correct a regression in the previous fix for this issue. \${ should only be an escape for ${ within an EL expression. Within a JSP page \$ should be an escape for $. The EL specification applies when parsing the expression delimited by ${ and }. Parsing of the delimiting ${ and } is the responsibility of the JSP specification. (markt) 58296: Fix a memory leak in the JSP unloading feature that meant that using a value other than -1 for maxLoadedJsps triggered a memory leak once the limit was reached. (markt) 58340: Improve error reporting for tag files packaged in JARs. (markt) 58444: Ensure that JSPs work with any custom base class that meets the requirements defined in the JSP specification without requiring that base class to implement Tomcat specific code. (markt)

Cluster

Fix a default clusterListeners in SimpleTcpCluster. The optimal default value is different for each session manager. ClusterSessionListener is never used in BackupManager. (kfujino) Correct log messages in case of using BackupManager. (kfujino)

WebSocket

58342: Fix a copy and paste error that meant MessageHandler removal could fail for binary and pong MessageHandlers. Patch provided by DJ. (markt) 58414: Correctly handle sending zero length messages when using per message deflate. (markt)

Web applications

Correct documentation for cluster-howto. (kfujino)

Extras

Ensure JULI adapters does not include the LogFactoryImpl class. Patch provided by Benjamin Gandon. (markt)

Tribes

Add support for configurations of ChannelListener and MembershipListener in server.xml. (kfujino) Correct log messages in case of using ReplicatedMap. (kfujino)

jdbc-pool

Make sure the pool has been properly configured when attributes that related to the pool size are changed via JMX. (kfujino)

Catalina

55317: Facilitate weaving by allowing ClassFileTransformer to be added to WebappClassLoader. Patch by Nick Williams. (markt) 58031: Make the (first) reason parameter parsing failed available as a request attribute and then use it to provide a better status code via the FailedRequstFilter (if configured). (markt) 58086: Ensure that WAR URLs are handled properly when using Apache Ant for web application deployment. (violetagg) 58094: Fix cosmetic error log when using non standard non cacheable resources, like with the empty resources used in some tests. (remm) 58096: Classes loaded from /WEB-INF/classes/ should use that directory as their code base. (markt) Fix possible resource leaks by closing streams properly. Issues reported by Coverity Scan. (violetagg) 58116: Fix a regression in the fix for 57281 that broke Comet support when running under a security manager. Based on a patch provided by Johno Crawford. (markt) 58179: Fix a thread safety issues that could mean concurrent threads setting the same attribute on a ServletContext could both see null as the old value. (markt) 58192: Correct a regression in the previous fix for 58023. Ensure that classes are associated with their manifest even if the class file is first read (and cached) without the manifest. (markt) Fix thread safety issue in the AsyncContext implementation that meant a sequence of start();dispatch(); calls using non-container threads could result in a previous dispatch interfering with a subsequent start. (markt)

Coyote

57943: Prevent the same socket being added to the cache twice. Patch based on analysis by Ian Luo / Sun Qi. (markt) Add text/javascript,application/javascript to the default list of compressable MIME types. (violetagg) 58103: When pipelining requests, and the previous request was an async request, ensure that the socket is removed from the waiting requests so that the async timeout thread doesn't process it during the next request. (markt) Fix a concurrency issue that meant that a change in socket timeout (e.g. when switching to asynchronous I/O) did not always take effect immediately. (markt) In the AJP and HTTP NIO connectors, ensure that the socket timeout is correctly set before adding the socket back to the poller for read. (markt) 58157: Ensure that the handling of async timeouts does not result in an unnecessary dispatch to a container thread that could result in the current socket being added to the Poller multiple times with multiple attempts to process the same event for the same socket. (markt) Correct a couple of edge cases in RequestUtil.normalize(). (markt)

Jasper

58110: Like scriptlet sections, declaration sections of JSP pages have a one-to-one mapping of lines to the generated .java file. Use this information to provide more accurate error messages if a compilation error occurs in a declaration section. (markt) 58119: When tags are compiled they must be placed in the org/apache/jsp/tag/web directory. Correct a regression in the fix for 52725. (violetagg) 58178: Expressions in a tag file should use the tag file's PageContext rather than that of the containing page. (markt)

WebSocket

58166: Allow applications to send close codes in the range 3000-4999 inclusive. (markt) 58232: Avoid possible NPE when adding endpoints programmatically to the javax.websocket.server.ServerContainer. Based on a patch provided by bastian.(violetagg)

Web applications

Correct the incorrect document of QueryTimeoutInterceptor. The setting value is not in milliseconds but in seconds. (kfujino) 58112: Update the documentation for using the Catalina tasks in an Apache Ant build file. (markt) Improve the Javadoc for some of the APR socket read functions that have inconsistent behaviour for return values. (markt) 58255: Document the Semaphore valve. Patch provided by Kyohei Nakamura. (markt)

jdbc-pool

Fix potential NPE in QueryTimeoutInterceptor. (kfujino) Add support for stopping the pool cleaner via JMX. (kfujino) The fairness attribute and ignoreExceptionOnPreLoad attribute do not allow a change via JMX. (kfujino) If the timeBetweenEvictionRunsMillis attribute is changed via jmx, it should restart the pool cleaner because this attribute affects the execution interval of the pool cleaner. (kfujino) Eliminate the dependence on maxActive of busy queues and idle queue in order to enable the expansion of the pool size via JMX. (kfujino)

Other

Update sample Eclipse IDE configuration to exclude test/webapp* and similar paths from compiler sourcepath. (kkolinko)

Catalina

57938: Correctly handle empty form fields when a form is submitted as multipart/form-data, the maxPostSize attribute of the Connector has been set to a negative value and the Context has been configured with a value of true for allowCasualMultipartParsing. The meaning of the value zero for the maxPostSize has also been changed to mean a limit of zero rather than no limit to align it with maxSavePostSize and to be more intuitive. (markt) 54618: Add a new HttpHeaderSecurityFilter that adds the Strict-Transport-Security, X-Frame-Options and X-Content-Type-Options HTTP headers to the response. (markt) Add a workaround for issues with SPNEGO authentication when running on Java 8 update 40 and later. The workaround should be safe for earlier Java versions but it can be disabled with the applyJava8u40Fix attribute of the SPNEGO authenticator if necessary. (markt) 57154: Add support for web applications (Context elements) that do not have a docBase. This is primarily for use when embedding but it also fixes a rare issue when running the unit test. Patch provided by Huxing Zhang. (markt) 57959: Fixed deadlock in org.apache.juli.FileHandler when log is rotated. (violetagg) 57977: Correctly bind and unbind the web application class loader during execution of the PersistentValve. (markt) 58023: Fix potentially excessive memory usage due to unnecessary caching of JAR manifests in the web application class loader. (markt) 57700: Ensure that Container event ADD_CHILD_EVENT will be sent in all cases. (violetagg) Add configuration fields for header names in SSLValve. (remm)

Coyote

57265: Further fix to address a potential threading issue for NIO when sendfile is used in conjunction with TLS. (markt) 57931: Ensure that TLS connections with the NIO HTTP connector that experience issues during the handshake (e.g. missing or invalid client certificate) are closed cleanly and that the client receives the correct error code rather than simply closing the connection. (markt) 57943: Added a work-around to catch ConcurrentModificationExceptions during Poller timeout processing that were causing the Poller thread to stop. The root cause of these exceptions is currently unknown. (markt) Fix possible very long (1000 seconds) timeout with APR/native connector. (markt) Support "-" separator in the SSLProtocol configuration of the APR/native connector for protocol exclusion. (rjung)

Cluster

Make sure that stream is closed after using it in DeltaSession.applyDiff(). (kfujino)

WebSocket

57676: List conflicting WebSocket endpoint classes when there is a path conflict. Based upon a patch proposed by yangkun. (schultz) Extend support for the permessage-deflate extension to the client implementation. 57969: Provide path parameters to POJO via per session javax.websocket.server.ServerEndpointConfig as they vary between different requests. (violetagg) 57974: Session.getOpenSessions should return all sessions associated with a given endpoint instance, rather than all sessions from the endpoint class. (remm)

Web applications

57282: Update request processing sequence diagrams. Updated diagrams provided by Stephen Chen. (markt) 57971: Correct the documentation for the cluster configuration setting recoverySleepTime. (markt) 57758: Add document of testOnConnect attribute in jdbc-pool doc. (kfujino) Add description of validatorClassName attribute to testXXXX attributes in jdbc-pool docs. (kfujino)

Tribes

Ensure that the state transfer flag is updated to true only when the map states have been transferred correctly from existing map members. (kfujino) Do not set the nodes that failed to replication to the backup nodes. Ensure that the nodes that the data has been successfully replicated are set to the backup node. (kfujino) When failed to replication, rather than all member is handled as a failed member, exclude the failure members from backup members. (kfujino)

jdbc-pool

Refactoring of the removeOldest method in SlowQueryReport to behave as expected. (kfujino) 57783: Fix NullPointerException in SlowQueryReport. To avoid this NPE, Refactor SlowQueryReport#removeOldest and handle the abandoned connection properly. (kfujino)

Other

Update package renamed Apache Commons BCEL to r1682271 to pick up some some code clean up. (markt) Update package renamed Apache Commons File upload to r1682322 to pick up the post 1.3.1 fixes. (markt) Update package renamed Apache Commons Codec to r1682326. No functional changes. Javadoc only. (markt)

Catalina

Allow logging of the remote port in the access log using the format pattern %{remote}p. (rjung) 57765: When checking last modified times as part of the automatic deployment process, account for the fact that File.lastModified() has a resolution of one second to ensure that if a file has been modified within the last second, the latest version of the file is always used. Note that a side-effect of this change is that files with modification times in the future are treated as if they are unmodified. (markt) Align redeploy resource modification checking with reload modification checking so that now, in both cases, a change in modification time rather than an increase in modification time is used to determine if the resource has changed. (markt) Cleanup o.a.tomcat.util.digester.Digester from debug messages that do not give any valuable information. Patch provided by Polina Genova. (violetagg) 57772: When reloading a web application and a directory representing an expanded WAR needs to be deleted, delete the directory after the web application has been stopped rather than before to avoid potential ClassNotFoundExceptions. (markt) 57801: Improve the error message in the start script in case the PID read from the PID file is already owned by a process. (rjung) 57824: Correct a regression in the fix for 57252 that broke request listeners for non-async requests that triggered an error that was handled by the ErrorReportingValve. (markt/violetagg) 57841: Improve error logging during web application start. (markt) 57856: Ensure that any scheme/port changes implemented by the RemoteIpFilter also affect HttpServletResponse.sendRedirect(). (markt) 57896: Support defensive copying of "cookie" header so that unescaping double quotes in a cookie value does not corrupt original value of "cookie" header. This is an opt-in feature, enabled by org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER or org.apache.catalina.STRICT_SERVLET_COMPLIANCE system property. (kkolinko)

Coyote

57779: When an I/O error occurs on a non-container thread only dispatch to a container thread to handle the error if using Servlet 3+ asynchronous processing. This avoids potential deadlocks if an application is performing I/O on a non-container thread without using the Servlet 3+ asynchronous API. (markt) 57833: When using JKS based keystores for NIO, ensure that the key alias is always converted to lower case since that is what JKS key stores expect. Based on a patch by Santosh Giri Govind M. (markt) 57837: Add text/css to the default list of compressable MIME types. (markt)

Jasper

57845: Ensure that, if the same JSP is accessed directly and via a <jsp-file> declaration in web.xml, updates to the JSP are visible (subject to the normal rules on re-compilation) regardless of how the JSP is accessed. (markt) 57855: Explicitly handle the case where a MethodExpression is invoked with null or the wrong number of parameters. Rather than failing with an ArrayIndexOutOfBoundsException or a NullPointerException throw an IllegalArgumentException with a useful error message. (markt)

Cluster

Add new attribute that send all actions for session across Tomcat cluster nodes. (kfujino) Remove unused pathname attribute in mbean definition of BackupManager. (kfujino) 57338: Improve the ability of the ClusterSingleSignOn valve to handle nodes being added and removed from the Cluster at run time. (markt) Avoid unnecessary call of DeltaRequest.addSessionListener() in non-primary nodes. (kfujino)

WebSocket

57762: Ensure that the WebSocket client correctly detects when the connection to the server is dropped. (markt) 57776: Revert the 8.0.21 fix for the permessage-deflate implementation and incorrect op-codes since the fix was unnecessary (the bug only affected trunk) and the fix broke rather than fixed permessage-deflate if an uncompressed message was converted into more than one compressed message. (markt) Fix log name typo in WsRemoteEndpointImplServer class, caused by a copy-paste. (markt/kkolinko) 57788: Avoid NPE when looking up a class hierarchy without finding anything. (remm) Make WebSocket client more robust when handling errors during the close of a WebSocket session. (markt)

Web applications

57759: Add information to the keyAlias documentation to make it clear that the order keys are read from the keystore is implementation dependent. (markt) 57864: Update the documentation web application to make it clearer that hex values are not valid for cluster send options. Based on a patch by Kyohei Nakamura. (markt)

Tribes

Fix a concurrency issue when a backup message that has all session data and a backup message that has diff data are processing at the same time. This fix ensures that MapOwner is set to ReplicatedMapEntry. (kfujino) Clarify the handling of Copy message and Copy nodes. (kfujino) Copy node does not need to send the entry data. It is enough to send only the node information of the entry. (kfujino) ReplicatedMap should send the Copy message when replicating. (kfujino) Fix behavior of ReplicatedMap when member has disappeared. If map entry is primary, rebuild the backup members. If primary node of map entry has disappeared, backup node is promoted to primary. (kfujino) When a map member has been added to ReplicatedMap, make sure to add it to backup nodes list of all other members. (kfujino)

Catalina

55988: Correct the check used for Java 8 JSSE server-preferred TLS cipher suite ordering. Ensure that SSL parameters are provided to SSLServerSocket and SSLEngine. Patch provided by Ognjen Blagojevic. (violetagg)

WebSocket

57761: Ensure that the opening HTTP request is correctly formatted when the WebSocket client connects to a server root. (remm)

Catalina

Clarify threaded usage of variables by removing volatile marker in NonceInfo. Issue reported by Coverity Scan. (fschumacher) 49785: Enable StartTLS connections for JNDIRealm. (fschumacher) 55988: Add support for Java 8 JSSE server-preferred TLS cipher suite ordering. This feature requires Java 8 and is controlled by useServerCipherSuitesOrder attribute on an HTTP connector. Based upon patches provided by Ognjen Blagojevic. (schultz) 56438: Add logging that reports when a JAR is scanned for TLDs but nothing is found so that Tomcat may be configured to skip this JAR in future. Based on a patch by VIN. (markt) 56848: Use Locale.forLanguageTag to process Locale headers when running on a Java 7 or later JRE. (markt) 57021: Improve logging in AprLifecycleListener and jni.Library when Tomcat-Native DLL fails to load. Based on a patch by Pravallika Peddi. (markt/kkolinko) 57180: Further fixes to support the use of arbitrary HTTP methods with the CORS filter. (markt) Warn about problematic setting of appBase. (fschumacher) 57534: CORS Filter should only look at media type component of Content-Type request header. (markt) Ensure that user name checking in the optional SecurityListener is case-insensitive (as documented) and than the case-insensitive comparison is performed using the system default Locale. (markt) When docBase refers internal war and unpackWARs is set to false, avoid registration of the invalid redeploy resource that has been added ".war" extension in duplicate. (kfujino) If WAR exists, it is not necessary to trigger a reload when adding a Directory. (kfujino) 56608: When deploying an external WAR, add watched resources in the expanded directory based on whether the expanded directory is expected to exist rather than if it does exist. When triggering a reload due to a modified watched resource, ensure that multiple changed watched resources only trigger one reload rather than a series of reloads. 57601: Ensure that HEAD requests return the correct content length (i.e. the same as for a GET) when the requested resource includes a resource served by the Default servlet. (jboynes/markt) 57602: Ensure that HEAD requests return the correct content length (i.e. the same as for a GET) when the requested resource includes a resource served by a servlet that extends HttpServlet. (markt) 57621: When an async request completes, ensure that any remaining request body data is swallowed. (markt) 57637: Do not create unnecessary sessions when using PersistentValve. (jboynes/fschumacher) 57645: Correct a regression in the fix for 57190 that incorrectly required the path passed to ServletContext.getContext(String) to be an exact match to a path to an existing context. (markt) Make sure that unpackWAR attribute of Context is handled correctly in HostConfig. (kfujino) When deploying a WAR file that contains a context.xml file and unpackWARs is false ignore any context.xml file that may exist in an expanded directory associated with the WAR. (markt) 57675: Correctly quote strings when using the extended access log. (markt) 57704: Fix potential NPEs during web application start/stop when org.apache.tomcat.InstanceManager is not initialized. (violetagg) Add support for LAST_ACCESS_AT_START system property to SingleSignOn. (kfujino) 57723: Ensure that the Context name and path remain consistent when adding a web application to an embedded Tomcat instance via Tomcat.addWebapp(Host,String,String,String). (markt) 57724: Handle the case in the CORS filter where a user agent includes an origin header for a non-CORS request. (markt) Refactor Authenticator implementations to reduce code duplication. (markt) When searching for SCIs o.a.catalina.Context.getParentClassLoader will be used instead of java.lang.ClassLoader.getParent. Thus one can provide the correct parent class loader when running embedded Tomcat in other environments such as OSGi. (violetagg)

Coyote

57509: Improve length check when writing HTTP/1.1 response headers: reserve space for 4 extra bytes. (kkolinko) 57540: Make TLS/SSL protocol available in a new request attribute (org.apache.tomcat.util.net.secure_protocol_version). (Note that AJP connectors will require mod_jk 1.2.41 or later, or an as-yet-unknown version of mod_proxy_ajp, or configure the proxy to send the AJP_SSL_PROTOCOL request attribute to Tomcat. Please see the bug comments for details.) Based upon a patch provided by Ralf Hauser. (schultz) 57544: Fix potential infinite loop when preparing a kept alive HTTP connection for the next request. (markt) 57546: Ensure that a dropped network connection does not leave references to the UpgradeProcessor associated with the connection in memory. (markt) 57570: Make the processing of trailer headers with chunked input optional and disabled by default. (markt) When applying the maxSwallowSize limit to a connection read that many bytes first before closing the connection to give the client a chance to read the response. (markt) Prevent an async timeout being processed multiple times for the same socket when running on slow and/or heavily loaded systems. (markt) 57581: Change statistics byte counter in coyote Request object to be long to allow values above 2Gb. (kkolinko) Fix a concurrency issue in the APR Poller that meant it was possible under low load for a socket queued to be added to the Poller not to be added for 10 seconds. (markt) 57638: Avoid an IllegalArgumentException when an AJP request body chunk larger than the socket read buffer is being read. This typically requires a larger than default AJP packetSize. (markt) 57674: Avoid a BufferOverflowException when an AJP response body chunk larger than the socket write buffer is being written. This typically requires a larger than default AJP packetSize. (markt) Refactor Connector authentication (only used by AJP) into a separate method. (markt) 57708: Implement a new feature for AJP connectors - Tomcat Authorization. If the new tomcatAuthorization attribute is set to true (it is disabled by default) Tomcat will take an authenticated user name from the AJP protocol and use the appropriate Realm for the request to authorize (i.e. add roles) to that user. (markt) Fix an issue that meant that any pipe-lined data read by Tomcat before an asynchronous request completed was lost during the completion of the asynchronous request. This mean that the pipe-lined request(s) would be lost and/or corrupted. (markt) Update the minimum recommended version of the Tomcat Native library (if used) to 1.1.33. (markt)

Jasper

57136: Ensure only \${ and \#{ are treated as escapes for ${ and #{ rather than \$ and \# being treated as escapes for $ and # when processing literal expressions in expression language. (markt) 57148: When coercing an object to a given type and a PropertyEditor has been registered for the type correctly coerce the empty string to null if the PropertyEditor throws an exception. (kkolinko/markt)

Cluster

Remove unnecessary method that always returns true. The domain filtering works on DomainFilterInterceptor. (kfujino)

WebSocket

Correct a bug in the permessage-deflate implementation that meant that the incorrect op-codes were used if an uncompressed message was converted into more than one compressed message. (markt)

Web applications

Fix possible resource leaks by closing streams properly. Issues reported by Coverity Scan. (fschumacher) 56058: Add links to the AccessLogValve documentation for configuring reverse proxies and/or Tomcat to ensure that the desired information is used entered in the access log when Tomcat is running behind a reverse proxy. (markt) 57503: Make clear that the JULI integration for log4j only works with log4j 1.2.x. (markt) Remove incorrect note from context configuration page in the documentation web application that stated WAR files located outside the appBase were never unpacked. (markt) 57644: Update examples to use Apache Standard Taglib 1.2.5. (jboynes) 57683: Ensure that if a client aborts their connection to the stock ticker example (the only way a client can disconnect), the example continues to work for existing and new clients. (markt) Correct the documentation for deployOnStartup to make clear that if a WAR file is updated while Tomcat is stopped and unpackWARs is true, Tomcat will not detect the changed WAR file when it starts and will not replace the unpacked WAR file with the contents of the updated WAR. (markt)

Extras

57377: Remove the restriction that prevented the use of SSL when specifying a bind address with the JMXRemoteLifecycleListener. Also enable SSL to be configured for the registry as well as the server. (markt)

Tribes

Make sure that refuse the messages from a different domain in DomainFilterInterceptor. (kfujino)

Other

Enhance bean factory used for JNDI resources. New attribute forceString allows to support non-standard string argument property setters. (rjung) Fix TestAbstractAjpProcessor unit test failures on Windows. (kkolinko) Guard the digester from MbeansDescriptorsDigesterSource with its own lock object. (fschumacher) 57558: Add missing JAR in Ant task definition required by the validate task. (markt/kkolinko) List names of Testsuites that have failed or skipped tests when running tests with Ant. (kkolinko) 57703: Update the http-method definition for web applications using a Servlet 2.5 descriptor as per Servlet 2.5 MR 6. (markt) Update to Tomcat Native Library version 1.1.33 to pick up the Windows binaries that are based on OpenSSL 1.0.1m and APR 1.5.1. (markt)

Jasper

57504: Initialize TLD locations cache when creating the ServletContext. (jboynes)

Tribes

Fix a possible deadlock when receiver thread invokes mapMemberAdded() while ping thread invokes memberAlive(). (kfujino)

Catalina

57173: Revert the fix for 56953 that broke annotation scanning in some cases. (markt) 57178: The CORS filter now treats null as a valid origin that matches *. Patch provided by Gregor Zurowski. (markt) 57180: Do not limit the CORS filter to only accepting requests that use an HTTP method defined in RFC 7231. (markt) 57190: Fix ServletContext.getContext(String) when parallel deployment is used so that the correct ServletContext is returned. (markt) 57208: Prevent NPE in JNDI Realm when no results are found in a directory context for a user with specified user name. Based on a patch provided by Jason McIntosh. (violetagg) 57209: Add a new attribute, userSearchAsUser to the JNDI Realm. (markt) 57215: Ensure that the result of calling HttpServletRequest.getContextPath() is neither decoded nor normalized as required by the Servlet specification. (markt) 57216: Improve handling of invalid context paths. A context path should either be an empty string or start with a '/' and do not end with a '/'. Invalid context path are automatically corrected and a warning is logged. The null and "/" values are now correctly changed to "". (markt/kkolinko) Correct message that is logged when load-on-startup servlet fails to load. It was logging a wrong name. (kkolinko) 57239: Correct several message typos. Includes patch by vladk. (kkolinko) Make the session id generator extensible by adding a SessionIdGenerator interface, an abstract base class and a standard implementation. (rjung) Back-port clarification from Servlet 3.1 specification that during async processing an IllegalStateException should be thrown if getRequest() or getResponse() is called after complete() or dispatch(). (markt) Fix a concurrency issue in async processing. Ensure that a non-container thread can not change the async state until the container thread has completed. (markt) 57252: Provide application configured error pages with a chance to handle an async error before the built-in error reporting. (markt) 57281: Enable non-public Filter and Servlet classes to be configured programmatically via the Servlet 3.0 API and then used without error when running under a SecurityManager. (markt) 57308: Remove unnecessary calls to System.getProperty() where more suitable API calls are available. (markt) Add unit tests for RemoteAddrValve and RemoteHostValve. (rjung) Allow to configure RemoteAddrValve and RemoteHostValve to adopt behavior depending on the connector port. Implemented by optionally adding the connector port to the string compared with the patterns allow and deny. Configured using addConnectorPort attribute on valve. (rjung) Optionally trigger authentication instead of denial in RemoteAddrValve and RemoteHostValve. This only works in combination with preemptiveAuthentication on the application context. Configured using invalidAuthenticationWhenDeny attribute on valve. (rjung) Prevent file descriptors leak and ensure that files are closed after retrieving the last modification time. (violetagg) 57326: Enable AsyncListener implementations to re-register themselves during AsyncListener.onStartAsync. (markt) 57331: Allow ExpiresFilter to use "year" as synonym for "years" in its configuration. (kkolinko) Improve SnoopServlet in unit tests. (rjung) Add RequestDescriptor class to unit tests. Adjust TestRewriteValve to use RequestDescriptor. (rjung) Add more AJP unit tests. (rjung) 57363: Log to stderr if LogManager is unable to read configuration files rather than swallowing the exception silently. (markt) 57420: Make UEncoder a local variable in DirContextURLConnection to make it threadsafe. Based on ideas from kkolinko and violetagg. (fschumacher) 57425: Don't add attributes with null value or name to the replicated context. (fschumacher) 57431: Enable usage of custom class for context creation when using embedded tomcat. (fschumacher) 57446: Ensure that ServletContextListeners that have limited access to ServletContext methods are called with the same ServletContext instance for both contextInitialized() and contextDestroyed(). (markt) 57461: When an instance of org.apache.catalina.startup.VersionLoggerListener logs the result of System.getProperty("java.home") don't report it in a manner that makes it look like the JAVA_HOME environment variable. (markt) While closing streams for given resources ensure that if an exception happens it will be handled properly. Issue is reported by Coverity Scan. (violetagg) Change Response to use UEncoder instances with shared safeChars. (fschumacher) Allow VersionLoggerListener to log all system properties. This feature is off by default. (kkolinko)

Coyote

57234: Make SSL protocol filtering to remove insecure protocols case insensitive. (markt) 57265: Fix some potential concurrency issues with sendFile and the NIO connector. (markt) 57324: If the client uses Expect: 100-continue and Tomcat responds with a non-2xx response code, Tomcat also closes the connection. If Tomcat knows the connection is going to be closed when committing the response, Tomcat will now also send the Connection: close response header. (markt) 57340: When using Comet, ensure that Socket and SocketWrapper are only returned to their respective caches once on socket close (it is possible for multiple threads to call close concurrently). (markt) 57446: Ensure that ServletContextListeners that have limited access to ServletContext methods are called with the same ServletContext instance for both contextInitialized() and contextDestroyed(). (markt)

Jasper

CVE-2014-7810: Do not use a privileged code block when evaluating EL expressions when running under a security manager, which allowed to bypass code restrictions. (markt) Fix an issue with BeanELResolver when running under a security manager. Some classes may not be accessible but may have accessible interfaces. (markt) 57316: Fix JspC when directory name contains a character sequence that appears to be URL encoded. (markt)

Cluster

In order to enable define in Cluster element, ClusterSingleSignOn implements ClusterValve. (kfujino) Fix mbean descriptor of ClusterSingleSignOn. (kfujino) 57473: Add sanity check to FarmWebDeployer's WarWatcher to detect suspected incorrect permissions on the watch directory. (schultz)

WebSocket

Correct multiple issues with the flushing of batched messages that could lead to duplicate and/or corrupt messages. (markt) Correctly implement headers case insensitivity. (markt/remm) Allow optional use of user extensions. (remm) Allow using partial binary message handlers. (remm) Limit ping/pong message size. (remm) Allow configuration of the time interval for the periodic event. (remm) More accurate annotations processing. (remm) Allow optional default for origin header in the client. (remm) 57490: Make it possible to use Tomcat's WebSocket client within a web application when running under a SecurityManager. Based on a patch by Mikael Sterner. (markt) Add some debug logging to the WebSocket session to track session creation and session closure. (markt)

Web applications

Update documentation for CGI servlet. Recommend to copy the servlet declaration into web application instead of enabling it globally. Correct documentation for cgiPathPrefix. (kkolinko) Improve HTML version of build instructions and align with BUILDING.txt. Document creating second Eclipse project to compile WebSocket classes with Java 7 (ide-eclipse-websocket target added in 7.0.56). (kkolinko) Improve Tomcat Manager documentation. Rearrange, add section on HTML GUI, document /expire command and Server Status page. (kkolinko) Fix ambiguity of section links on Valves configuration reference page. (kkolinko) 57238: Update information on SSL/TLS on Security and SSL documentation pages. Based on patch by Glen Peterson. (kkolinko) 57261: Add vminfo and threaddump commands to Manager application. Implement VminfoTask and ThreaddumpTask Ant tasks. (kkolinko) 57323: Correct display of outdated sessions in sessions count listing in Manager application. (kkolinko) Add document of ClusterSingleSignOn. (kfujino) Clarify documentation for useBodyEncodingForURI attribute of a connector. (kkolinko)

Other

When downloading required libraries at build time, use random name for temporary file and automatically create destination directory (base.path). (kkolinko) Update optional Checkstyle library to 6.1.1. (kkolinko) Simplify setproxy task in build.xml. Taskdef there is not needed since Ant 1.8.2. (kkolinko) Improve Java 7 support in build.xml. Check whether the specified ${java.7.home} is valid. By default use Java that runs Ant (${java.home}) instead of the one found on $PATH to run JUnit tests. (kkolinko) 57344: Provide sha1 checksum files for Tomcat downloads. Correct filename patterns for apache-tomcat-*-embed.tar.gz archive to exclude an *.asc file. (kkolinko)

Catalina

47919: Extend the information logged when Tomcat starts to optionally log the values of command line arguments (enabled by default) and environment variables (disabled by default). Note that the values added to CATALINA_OPTS and JAVA_OPTS environment variables will be logged, as they are used to build up the command line. (markt) 56401: Log version information when Tomcat starts. (markt/kkolinko) 57022: Ensure SPNEGO authentication continues to work with the JNDI Realm using delegated credentials with recent Oracle JREs. (markt) Correct a couple of NPEs in the JNDI Realm that could be triggered with when not specifying a roleBase and enabling roleSearchAsUser. (markt) Remove the unnecessary registration of context.xml as a redeploy resource. The context.xml having an external docBase has already been registered as a redeploy resources at first. (kfujino) Improve the previous fix for 56401. Avoid logging version information in the constructor since it then gets logged at undesirable times such as when using StoreConfig. (markt) 57105: When parsing web.xml do not limit the buffer element of the jsp-property-group element to integer values as the allowed values are <number>kb or none. (markt) Update the minimum required version of the Tomcat Native library (if used) to 1.1.32. (markt) 57144: Improve ClientAbortException to provide non-null message. (kkolinko) AsyncContext should remain usable until fireOnComplete is called. (remm) AsyncContext createListener should wrap any instantiation exception using a ServletException. (remm)

Coyote

53952: Add support for TLSv1.1 and TLSv1.2 for APR connector. Based upon a patch by Marcel Šebek. This feature requires Tomcat Native library 1.1.32 or later. (schultz/jfclere) Disable SSLv3 by default for JSSE based HTTPS connectors (BIO and NIO). The change also ensures that SSLv2 is disabled for these connectors although SSLv2 should already be disabled by default by the JRE. (markt) Disable SSLv3 by default for the APR/native HTTPS connector. (markt) Do not increase remaining counter at end of stream in IdentityInputFilter. (kkolinko) Async state MUST_COMPLETE should still be started. (remm)

Jasper

57099: Ensure that semi-colons are not permitted in JSP import page directives. (markt)

Cluster

Avoid possible integer overflows reported by Coverity Scan. (fschumacher)

WebSocket

57054: Correctly handle the case in the WebSocket client when the HTTP response to the upgrade request can not be read in a single pass; either because the buffer is too small or the server sent the response in multiple packets. (markt) Fix client subprotocol handling. (remm) Add null checks for arguments in remote endpoint. (remm/kkolinko) 57091: Work around the behaviour of the Oracle JRE when creating new threads in an applet environment that breaks the WebSocket client implementation. Patch provided by Niklas Hallqvist. (markt) 57118: Ensure that that an EncodeException is thrown by RemoteEndpoint.Basic.sendObject(Object) rather than an IOException when no suitable Encoder is configured for the given Object. (markt)

Web applications

Correct documentation for ServerCookie.ALLOW_NAME_ONLY system property. (kkolinko) 57049: Clarified that jvmRoute can be set in <Engine>'s jvmRoute or in a system property. (schultz) Correct version of Java WebSocket mentioned in documentation (s/1.0/1.1/). (markt/kkolinko) In examples web application move Async and Comet examples from JSP to Servlet examples page. (kkolinko) Suppress timestamp comments and enable charset header in Javadoc. (kkolinko)

jdbc-pool

57079: Use Tomcat version number for jdbc-pool module when building and shipping the module as part of Tomcat. (markt/kkolinko) Fix broken overview page in javadoc generated via "javadoc" task in jdbc-pool build.xml file. (kkolinko)

Other

56079: The Apache Tomcat Windows service and the Apache Tomcat Windows service monitor application are now digitally signed. (markt) Fix timestamps in Tomcat build and jdbc-pool to use 24-hour format instead of 12-hour one and use UTC timezone. (markt/kkolinko) Improve Tomcat build script to ensure that only one ecj-nn.jar file is present in Tomcat lib directory when Eclipse JDT Compiler is updated to a new version. (kkolinko) 56596: Update to Tomcat Native Library version 1.1.32 to pick up the Windows binaries that are based on OpenSSL 1.0.1j and APR 1.5.1. (markt) In Tomcat tests: log name of the current test method at start time. (kkolinko)

Catalina

When scanning class files (e.g. for annotations) and reading the number of parameters in a MethodParameters structure only read a single byte (rather than two bytes) as per the JVM specification. Patch provided by Francesco Komauli. (markt) Allow the JNDI Realm to start even if the directory is not available. The directory not being available is not fatal once the Realm is started and it need not be fatal when the Realm starts. Based on a patch by Cédric Couralet. (markt) 56736: Avoid an incorrect IllegalStateException if the async timeout fires after a non-container thread has called AsyncContext.dispatch() but before a container thread starts processing the dispatch. (markt) 56739: If an application handles an error on an application thread during asynchronous processing by calling HttpServletResponse.sendError(), then ensure that the application is given an opportunity to report that error via an appropriate application defined error page if one is configured. (markt) 56771: When lookup for a resource in all the alternate or backup javax.naming.directory.DirContext, javax.naming.NameNotFoundException will be thrown at the end of the search if the resource is not available in these alternate or backup javax.naming.directory.DirContext. Based on a patch by Sheldon Shao. (violetagg) 56796: Remove unnecessary sleep when stopping a web application. (markt) 56801: Improve performance of org.apache.tomcat.util.file.Matcher which is to filter JARs for scanning during web application start. Based on a patch by Sheldon Shao. (kkolinko) 56825: Enable pre-emptive authentication to work with the SSL authenticator. Based on a patch by jlmonteiro. (markt) 56857: Fix thread safety issue when calling ServletContext methods while running under a security manager. (markt) 56882: Add testcase for processing of forwards and includes when Context have been reloaded. (kkolinko) 56900: Fix some potential resource leaks when reading property files reported by Coverity Scan. Based on patches provided by Felix Schumacher. (markt) 56902: Fix a potential resource leak in the Default Servlet reported by Coverity Scan. Based on a patch provided by Felix Schumacher. (markt) 56903: Correct the return value for StandardContext.getResourceOnlyServlets() so that multiple names are separated by commas. Identified by Coverity Scan and fixed based on a patch by Felix Schumacher. (markt) Fixed the multipart elements merge operation performed during web application deployment. Identified by Coverity Scan. (violetagg) Correct the information written by ExtendedAccessLogValve when a format token x-O(XXX) is used so that multiple values for a header XXX are separated by commas. Identified by Coverity Scan. (violetagg) Fix a potential resource leak when reading MANIFEST.MF file for extension dependencies reported by Coverity Scan. (violetagg) Correctly handle multiple accept-language headers rather than just using the first header to determine the user's preferred Locale. (markt) Fix some potential resource leaks when reading properties, files and other resources. Reported by Coverity Scan. (violetagg) When using parallel deployment and undeployOldVersions feature is enabled on a Host, correctly undeploy context of old version. Make sure that Tomcat does not undeploy older Context if current context is not running. (kfujino) When deploying war, add XML file in the config base to the redeploy resources if war does not have META-INF/context.xml or deployXML is false. If XML file is created in the config base, redeploy will occur. (kfujino) Various changes to reduce unnecessary code in Tomcat's copy of Apache Commons BCEL to reduce the time taken for annotation scanning when web applications start. Includes contributions from kkolinko and hzhang9. (markt) 56938: Ensure web applications that have mixed case context paths and are deployed as directories are correctly removed on undeploy when running on a case sensitive file system. (markt) 57004: Add stuckThreadCount property to StuckThreadDetectionValve's JMX bean. Patch provided by Jiří Pejchal. (schultz) 57011: Ensure that the request and response are correctly recycled when processing errors during async processing. (markt) 57016: When using the PersistentValve do not remove sessions from the store when persisting them. (markt)

Coyote

56780: Enable Tomcat to start when using SSL with an IBM JRE in strict SP800-131a mode. (markt) 56910: Prevent the invalid value of -1 being used for maxConnections with APR connectors. (markt) Ensure that AjpNioProtocol and AjpAprProtocol enable the KeepAliveTimeout. (kfujino)

Jasper

43001: Enable the JspC Ant task to set the JspC option mappedFile. (kkolinko) 56797: When matching a method in an EL expression, do not treat bridge methods as duplicates of the method they bridge to. In this case always call the target of the bridge method. (markt) Correct a logic error in the JasperElResolver. There was no functional impact but the code was less efficient as a result of the error. Based on a patch by martinschaef. (markt) Ensure that the implementation of javax.servlet.jsp.PageContext.include(String) and javax.servlet.jsp.PageContext.include(String, boolean) will throw IOException when an I/O error occur during the operation. (violetagg) 56908: Fix some potential resource leaks when reading jar files. Reported by Coverity Scan. Based on patch provided by Felix Schumacher. (violetagg) 56991: Deprecate the use of a request attribute to pass a <jsp-file> declaration to Jasper and prevent an infinite loop if this technique is used in conjunction with an include. (markt) Fix a potential resource leak in JDTCompiler when checking whether a resource is a package. Reported by Coverity Scan. (fschumacher)

WebSocket

56446: Clearer handling of exceptions when calling a method on a POJO based WebSocket endpoint. Based on a suggestion by Eugene Chung. (markt) 56746: Allow secure WebSocket client threads to use the current context class loader rather than explicitly setting it to the class loader that loaded the WebSocket implementation. This allows WebSocket client connections from within web applications to access, amongst other things, the JNDI resources associated with the web application. (markt) 56905: Make destruction on web application stop of thread group used for WebSocket connections more robust. (kkolinko/markt) 56907: Ensure that client IO threads are stopped if a secure WebSocket client connection fails. (markt) When a WebSocket client attempts to write to a closed connection, handle the resulting IllegalStateException in a manner consistent with the handling of an IOException. (markt) Add support for the permessage-deflate extension. This is currently limited to decompressing incoming messages on the server side. It is expected that support will be extended to outgoing messages and to the client side shortly. (markt) Extend support for the permessage-deflate extension to compression of outgoing messages on the server side. (markt) 56982: Return the actual negotiated extensions rather than an empty list for Session.getNegotiatedExtensions(). (markt) Update the WebSocket implementation to support the Java WebSocket specification version 1.1. (markt)

Web applications

Correct the label in the list of sessions by idle time for the bin that represents the idle time immediately below the maximum permitted idle time when using the expire command of the Manager application. (markt) Update the Windows authentication documentation after some additional testing to answer the remaining questions. (markt) Correct a couple of broken links in the Javadoc. (markt)

Other

56788: Display the full version in the list of installed applications when installed via the Windows installer package. Patch provided by Alexandre Garnier. (markt) 56829: Add the ability for users to define their own values for _RUNJAVA and _RUNJDB environment variables. Be more strict with executable filename on Windows (s/java/java.exe/). Based on a patch by Neeme Praks. (markt/kkolinko) 56895: Correctly compose JAVA_OPTS in catalina.bat so that escape sequences are preserved. Patch by Lucas Theisen. (markt) 56988: Allow to use relative path in base.path setting when building Tomcat. (kkolinko) 56990: Ensure that the ide-eclipse build target downloads all the libraries required by the default Eclipse configuration files and configures Eclipse to use Java 6 for the project. Add build target ide-eclipse-websocket that creates a separate linked project that compiles websocket classes of Tomcat 7 with Java 7 compiler. (kkolinko)

Catalina

44312: Log an error if there is a conflict between Host and Alias names. Improve host management methods in Mapper to avoid occasionally removing a wrong host. Check that host management operations are performed on the host and not on an alias. (kkolinko) 55282: Ensure that one and the same application listener is added only once when starting the web application. (violetagg) 56461: New failCtxIfServletStartFails attribute on Context and Host configuration to force the context startup to fail if a load-on-startup servlet fails its startup. (slaurent) 56526: Improved the StuckThreadDetectionValve to optionally interrupt stuck threads to attempt to unblock them. (slaurent) 56545: Pre-load an additional class, the loading of which may otherwise be triggered by a web application which in turn would trigger an exception when running under a security manager. (kkolinko) 56578: Correct regression in the fix for 56339 that prevented sessions from expiring when using clustering. (markt) 56588: Update deprecation of Context.addApplicationListener() methods according to changes in Tomcat 8. (kkolinko) 56600: In WebdavServlet: Do not waste time generating response for broken PROPFIND request. (kkolinko) Provide a better error message when asynchronous operations are not supported by a filter or servlet. Patch provided by Romain Manni-Bucau. (violetagg) 56606: User entries in tomcat-users.xml file are recommended to use "username" attribute rather than legacy "name" attribute. Fix inconsistencies in Windows installer, examples. Update digester rules and documentation for MemoryRealm. (markt/kkolinko) 56611: Refactor code to remove inefficient calls to Method.isAnnotationPresent(). Based on a patch by Jian Mou. (markt/kkolinko) 56653: Fix concurrency issue with lists of contexts in Mapper when stopping Contexts. (kkolinko) 56657: When using parallel deployment, if the same session id matches different versions of a web application, prefer the latest version. Ensure that remapping selects the version that we expect. (kkolinko) Assert that mapping result object is empty before performing mapping work in Mapper. (kkolinko) 56658: Avoid delay between registrations of mappings for context and for its servlets. (kkolinko) 56665: Correct the generation of the effective web.xml when elements contain an empty string as value. (violetagg) 56666: When clearing the SSO cookie use the same values for domain, path, httpOnly and secure as were used to set the SSO cookie. (markt) 56677: Ensure that HttpServletRequest.getServletContext() returns the correct value during a cross-context dispatch. (markt) 56684: Ensure that Tomcat does not shut down if the socket waiting for the shutdown command experiences a SocketTimeoutException. (markt) When the current PathInfo is modified as a result of dispatching a request, ensure that a call to HttpServletRequest.getPathTranslated() returns a value that is based on the modified PathInfo. (markt) 56698: When persisting idle sessions, only persist newly idle sessions. Patch provided by Felix Schumacher. (markt) 56710: Do not map requests to servlets when context is being reloaded. (kkolinko) 56712: Fix session idle time calculations in PersistenceManager. (kkolinko) 56717: Fix duplicate registration of MapperListener during repeated starts of embedded Tomcat. (kkolinko) 56724: Write an error message to Tomcat logs if container background thread is aborted unexpectedly. (kkolinko)

Coyote

56518: When using NIO, do not attempt to write to the socket if the thread is marked interrupted as this will lead to a connection limit leak. This fix was based on analysis of the issue by hanyong. (markt) 56521: Re-use the asynchronous write buffer between writes to reduce allocation and GC overhead. Based on a patch by leonzhx. Also make the buffer size configurable and remove copying of data within buffer when the buffer is only partially written on a subsequent write. (markt) Correct a copy/paste error and return a 500 response rather than a 400 response when an internal server error occurs on early stages of request processing. (markt) 56582: Use switch(actionCode) in processors instead of a chain of "elseif"s. (kkolinko) Fix CVE-2014-0227: Various improvements to ChunkedInputFilter including clean-up, i18n for error messages and adding an error flag to allow subsequent attempts at reading after an error to fail fast. (markt) If request contains an unrecognized Expect header, respond with error 417 (Expectation Failed), according to RFC2616 chapter 14.20. (markt) When an error occurs after the response has been committed close the connection immediately rather than attempting to finish the response to make it easier for the client to differentiate between a complete response and one that failed part way though. (markt) 56620: Avoid bogus access log entries when pausing the NIO HTTP connector and ensure that access log entries generated by error conditions use the correct request start time. (markt) Fix CVE-2014-0230: Add a new limit, defaulting to 2MB, for the amount of data Tomcat will swallow for an aborted upload. The limit is configurable by maxSwallowSize attribute of an HTTP connector. (markt) Allow to configure maxSwallowSize attribute of an HTTP connector via JMX. (kkolinko) 56661: Fix getLocalAddr() for AJP connectors. The complete fix is only available with a recent AJP forwarder like the forthcoming mod_jk 1.2.41. (rjung) 59451: Correct Javadoc for MessageBytes. Patch provided by Kyohei Nakamura. (markt)

Jasper

56334#c15: Fix a regression in EL parsing when quoted string follows a whitespace. (kkolinko/markt) 56543: Update to the Eclipse JDT Compiler 4.4. (violetagg) 56561: Avoid NoSuchElementException while handling attributes with empty string value. (violetagg) 56581: If an error on a JSP page occurs when response has already been committed, do not clear the buffer of JspWriter, but flush it. It will make more clear where the error occurred. (kkolinko) 56612: Correctly parse two consecutive escaped single quotes when used in UEL expression in a JSP. (markt) Move code that parses EL expressions within JSP template text from Parser to JspReader class for better performance. (kkolinko)

WebSocket

56577: Improve the executor configuration used for the callbacks associated with asynchronous writes. (markt)

Web applications

Set the path for cookies created by the examples web application so they only returned to the examples application. This reduces the opportunity for using such cookies for malicious purposes should the advice to remove the examples web application from security sensitive systems be ignored. (markt/kkolinko) Attempt to obfuscate session cookie values associated with other web applications when viewing HTTP request headers with the Request Header example from the examples web application. This reduces the opportunity to use this example for malicious purposes should the advice to remove the examples web application from security sensitive systems be ignored. (markt)

Other

Update optional Checkstyle library to 5.7. (kkolinko) 56685: Add quotes necessary for daemon.sh to work correctly on Solaris. Based on a suggestion by lfuka. (markt) 56596: Update to Tomcat Native Library version 1.1.31 to pick up the Windows binaries that are based on OpenSSL 1.0.1h. (markt)

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) Fix CVE-2014-0119: Only create XML parsing objects if required and fix associated potential memory leak in the default Servlet. Extend XML factory, parser etc. memory leak protection to cover some additional locations where, theoretically, a memory leak could occur. Ensure that a TLD parser obtained from the cache has the correct value of blockExternal. (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) 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) Fix CVE-2014-0096: 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 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) Fix CVE-2014-0075: 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 CVE-2014-0099: 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. Note that this change means that, by default, the web application class loader is now a higher priority for loading classes than the system class loader. (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)