On 05/11/2020 09:50, ma...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch 7.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/7.0.x by this push:
> new fde779b Additional fix for BZ 64848. Ensure Processor instances are
> cleaned up
> fde779b is described below
>
> commit fde779b2f84e56aa118d6d58b8958964dd2fd7f4
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Thu Nov 5 09:41:06 2020 +0000
>
> Additional fix for BZ 64848. Ensure Processor instances are cleaned up
Sorry. Looks like my back-port went wrong here. This was the additional
debug logging.
Mark
> ---
> java/org/apache/coyote/AbstractProcessor.java | 3 +++
> java/org/apache/coyote/LocalStrings.properties | 1 +
> webapps/docs/changelog.xml | 7 +++++--
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/java/org/apache/coyote/AbstractProcessor.java
> b/java/org/apache/coyote/AbstractProcessor.java
> index 5405fc4..36843d8 100644
> --- a/java/org/apache/coyote/AbstractProcessor.java
> +++ b/java/org/apache/coyote/AbstractProcessor.java
> @@ -86,6 +86,9 @@ public abstract class AbstractProcessor<S> implements
> ActionHook, Processor<S> {
> * @param t The error which occurred
> */
> protected void setErrorState(ErrorState errorState, Throwable t) {
> + if (getLog().isDebugEnabled()) {
> + getLog().debug(sm.getString("abstractProcessor.setErrorState",
> errorState), t);
> + }
> // Use the return value to avoid processing more than one async error
> // in a single async cycle.
> boolean setError = response.setError();
> diff --git a/java/org/apache/coyote/LocalStrings.properties
> b/java/org/apache/coyote/LocalStrings.properties
> index 3de0cd7..e0963d7 100644
> --- a/java/org/apache/coyote/LocalStrings.properties
> +++ b/java/org/apache/coyote/LocalStrings.properties
> @@ -21,6 +21,7 @@
> abstractConnectionHandler.socketexception.debug=SocketExceptions are normal,
> ign
> abstractProcessor.fallToDebug=\n\
> \ Note: further occurrences of request parsing errors will be logged at
> DEBUG level.
> abstractProcessor.hostInvalid=The host [{0}] is not valid
> +abstractProcessor.setErrorState=Error state [{0}] reported while processing
> request
>
> abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]
> abstractProtocolHandler.destroyError=Failed to destroy end point associated
> with ProtocolHandler [{0}]
> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
> index 0686895..42d0c53 100644
> --- a/webapps/docs/changelog.xml
> +++ b/webapps/docs/changelog.xml
> @@ -101,6 +101,10 @@
> <bug>55160</bug>: Re-fix this bug after the original fix was
> reverted by
> a separate fix to timeouts in 7.0.81. (markt)
> </fix>
> + <add>
> + Add additional debug logging for I/O issues when communicating with
> the
> + user agent. (markt)
> + </add>
> </changelog>
> </subsection>
> <subsection name="Web applications">
> @@ -141,8 +145,7 @@
> <fix>
> Complete the fix for <bug>63815</bug>. Users wishing to use system
> properties that require quoting with <code>catalina.sh</code> and the
> - <code>debug</code> option must use a JRE that includes the fix for <a
> -
> href="https://bugs.openjdk.java.net/browse/JDK-8234808";>JDK-8234808</a>.
> + <code>debug</code> option must use a JRE that includes the fix for
> <a href="https://bugs.openjdk.java.net/browse/JDK-8234808";>JDK-8234808</a>.
> (markt)
> </fix>
> <add>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
