svn commit: r1763694 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardSession.java

[markt]

Author: markt
Date: Fri Oct  7 08:08:11 2016
New Revision: 1763694

URL: http://svn.apache.org/viewvc?rev=1763694&view=rev
Log:
Fix backport

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardSession.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1763694&r1=1763693&r2=1763694&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardSession.java 
Fri Oct  7 08:08:11 2016
@@ -1610,10 +1610,10 @@ public class StandardSession implements
 } catch (WriteAbortedException wae) {
 if (wae.getCause() instanceof NotSerializableException) {
 String msg = 
sm.getString("standardSession.notDeserializable", name, id);
-if (manager.getContext().getLogger().isDebugEnabled()) {
-manager.getContext().getLogger().debug(msg, wae);
+if (manager.getContainer().getLogger().isDebugEnabled()) {
+manager.getContainer().getLogger().debug(msg, wae);
 } else {
-manager.getContext().getLogger().warn(msg);
+manager.getContainer().getLogger().warn(msg);
 }
 // Skip non serializable attributes
 continue;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/568

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1763694
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763700 - /tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java

[markt]

Author: markt
Date: Fri Oct  7 08:54:34 2016
New Revision: 1763700

URL: http://svn.apache.org/viewvc?rev=1763700&view=rev
Log:
Add throwOnFailure to LifecycleBase. Defaults to no change to current
behaviour.

Modified:
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java

Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1763700&r1=1763699&r2=1763700&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Fri Oct  7 
08:54:34 2016
@@ -53,6 +53,37 @@ public abstract class LifecycleBase impl
 private volatile LifecycleState state = LifecycleState.NEW;
 
 
+private boolean throwOnFailure = true;
+
+
+/**
+ * Will a {@link LifecycleException} thrown by a sub-class during
+ * {@link #initInternal()}, {@link #startInternal()},
+ * {@link #stopInternal()} or {@link #destroyInternal()} be re-thrown for
+ * the caller to handle or will it be logged instead?
+ *
+ * @return {@code true} if the exception will be re-thrown, otherwise
+ * {@code false}
+ */
+public boolean getThrowOnFailure() {
+return throwOnFailure;
+}
+
+
+/**
+ * Configure if a {@link LifecycleException} thrown by a sub-class during
+ * {@link #initInternal()}, {@link #startInternal()},
+ * {@link #stopInternal()} or {@link #destroyInternal()} will be re-thrown
+ * for the caller to handle or if it will be logged instead.
+ *
+ * @param throwOnFailure {@code true} if the exception should be re-thrown,
+ *   otherwise {@code false}
+ */
+public void setThrowOnFailure(boolean throwOnFailure) {
+this.throwOnFailure = throwOnFailure;
+}
+
+
 /**
  * {@inheritDoc}
  */
@@ -105,9 +136,7 @@ public abstract class LifecycleBase impl
 initInternal();
 setStateInternal(LifecycleState.INITIALIZED, null, false);
 } catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-setStateInternal(LifecycleState.FAILED, null, false);
-throw new 
LifecycleException(sm.getString("lifecycleBase.initFail",toString()), t);
+handleSubClassException(t, "lifecycleBase.initFail", toString());
 }
 }
 
@@ -166,9 +195,7 @@ public abstract class LifecycleBase impl
 } catch (Throwable t) {
 // This is an 'uncontrolled' failure so put the component into the
 // FAILED state and throw an exception.
-ExceptionUtils.handleThrowable(t);
-setStateInternal(LifecycleState.FAILED, null, false);
-throw new 
LifecycleException(sm.getString("lifecycleBase.startFail", toString()), t);
+handleSubClassException(t, "lifecycleBase.startFail", toString());
 }
 }
 
@@ -237,9 +264,7 @@ public abstract class LifecycleBase impl
 
 setStateInternal(LifecycleState.STOPPED, null, false);
 } catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-setStateInternal(LifecycleState.FAILED, null, false);
-throw new 
LifecycleException(sm.getString("lifecycleBase.stopFail",toString()), t);
+handleSubClassException(t, "lifecycleBase.stopFail", toString());
 } finally {
 if (this instanceof Lifecycle.SingleUse) {
 // Complete stop process first
@@ -297,9 +322,7 @@ public abstract class LifecycleBase impl
 destroyInternal();
 setStateInternal(LifecycleState.DESTROYED, null, false);
 } catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-setStateInternal(LifecycleState.FAILED, null, false);
-throw new 
LifecycleException(sm.getString("lifecycleBase.destroyFail",toString()), t);
+handleSubClassException(t, "lifecycleBase.destroyFail", 
toString());
 }
 }
 
@@ -407,4 +430,19 @@ public abstract class LifecycleBase impl
 String msg = sm.getString("lifecycleBase.invalidTransition", type, 
toString(), state);
 throw new LifecycleException(msg);
 }
+
+
+private void handleSubClassException(Throwable t, String key, Object... 
args) throws LifecycleException {
+ExceptionUtils.handleThrowable(t);
+setStateInternal(LifecycleState.FAILED, null, false);
+String msg = sm.getString(key, args);
+if (getThrowOnFailure()) {
+if (!(t instanceof LifecycleException)) {
+t = new LifecycleException(msg, t);
+}
+throw (LifecycleException) t;
+} else {
+log.error(msg, t);
+}
+}
 }



-
To unsubscribe,

Re: [VOTE] Release Apache Tomcat 8.0.38

[Felix Schumacher]

Am 6. Oktober 2016 23:18:39 MESZ, schrieb Mark Thomas :
>The proposed Apache Tomcat 8.0.38 release is now available for voting.
>
>The main changes since 8.0.37 are:
>
>- Refactoring the non-container thread Async complete()/dispatch()
>  handling to remove the possibility of deadlock
>
>- 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
>
>- Improved UTF-8 handling for the RewriteValve
>
>
>It can be obtained from:
>https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.38/
>The Maven staging repo is:
>https://repository.apache.org/content/repositories/orgapachetomcat-1098/
>The svn tag is:
>http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
>
>The proposed 8.0.38 release is:
>[ ] Broken - do not release
>[ ] Stable - go ahead and release as 8.0.38

The pgp signatures seem to be missing.

Regards,
Felix

>
>-
>To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>For additional commands, e-mail: dev-h...@tomcat.apache.org

-- 
Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail gesendet.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763711 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Fri Oct  7 09:28:44 2016
New Revision: 1763711

URL: http://svn.apache.org/viewvc?rev=1763711&view=rev
Log:
Prepare for release.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1763711&r1=1763710&r2=1763711&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Oct  7 09:28:44 2016
@@ -44,7 +44,7 @@
 
-
+
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763712 - in /tomcat/trunk/java/org/apache/catalina: connector/Connector.java connector/mbeans-descriptors.xml mbeans/MBeanFactory.java

[markt]

Author: markt
Date: Fri Oct  7 09:45:40 2016
New Revision: 1763712

URL: http://svn.apache.org/viewvc?rev=1763712&view=rev
Log:
The Connector protocol only has an effect when passed into the constructor so 
remove the pointless setters that suggest otherwise.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1763712&r1=1763711&r2=1763712&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Fri Oct  7 
09:45:40 2016
@@ -62,12 +62,34 @@ public class Connector extends Lifecycle
 
 //  Constructor
 
+/**
+ * Defaults to using HTTP/1.1 NIO implementation.
+ */
 public Connector() {
-this(null);
+this("org.apache.coyote.http11.Http11NioProtocol");
 }
 
+
 public Connector(String protocol) {
-setProtocol(protocol);
+boolean aprConnector = AprLifecycleListener.isAprAvailable() &&
+AprLifecycleListener.getUseAprConnector();
+
+if ("HTTP/1.1".equals(protocol) || protocol == null) {
+if (aprConnector) {
+protocolHandlerClassName = 
"org.apache.coyote.http11.Http11AprProtocol";
+} else {
+protocolHandlerClassName = 
"org.apache.coyote.http11.Http11NioProtocol";
+}
+} else if ("AJP/1.3".equals(protocol)) {
+if (aprConnector) {
+protocolHandlerClassName = 
"org.apache.coyote.ajp.AjpAprProtocol";
+} else {
+protocolHandlerClassName = 
"org.apache.coyote.ajp.AjpNioProtocol";
+}
+} else {
+protocolHandlerClassName = protocol;
+}
+
 // Instantiate protocol handler
 ProtocolHandler p = null;
 try {
@@ -210,10 +232,9 @@ public class Connector extends Lifecycle
 
 /**
  * Coyote Protocol handler class name.
- * Defaults to the Coyote HTTP/1.1 protocolHandler.
+ * See {@link #Connector()} for current default.
  */
-protected String protocolHandlerClassName =
-"org.apache.coyote.http11.Http11NioProtocol";
+protected final String protocolHandlerClassName;
 
 
 /**
@@ -536,34 +557,6 @@ public class Connector extends Lifecycle
 
 
 /**
- * Set the Coyote protocol which will be used by the connector.
- *
- * @param protocol The Coyote protocol name
- */
-public void setProtocol(String protocol) {
-
-boolean aprConnector = AprLifecycleListener.isAprAvailable() &&
-AprLifecycleListener.getUseAprConnector();
-
-if ("HTTP/1.1".equals(protocol) || protocol == null) {
-if (aprConnector) {
-
setProtocolHandlerClassName("org.apache.coyote.http11.Http11AprProtocol");
-} else {
-
setProtocolHandlerClassName("org.apache.coyote.http11.Http11NioProtocol");
-}
-} else if ("AJP/1.3".equals(protocol)) {
-if (aprConnector) {
-
setProtocolHandlerClassName("org.apache.coyote.ajp.AjpAprProtocol");
-} else {
-
setProtocolHandlerClassName("org.apache.coyote.ajp.AjpNioProtocol");
-}
-} else {
-setProtocolHandlerClassName(protocol);
-}
-}
-
-
-/**
  * @return the class name of the Coyote protocol handler in use.
  */
 public String getProtocolHandlerClassName() {
@@ -571,17 +564,6 @@ public class Connector extends Lifecycle
 }
 
 
-/**
- * Set the class name of the Coyote protocol handler which will be used
- * by the connector.
- *
- * @param protocolHandlerClassName The new class name
- */
-public void setProtocolHandlerClassName(String protocolHandlerClassName) {
-this.protocolHandlerClassName = protocolHandlerClassName;
-}
-
-
 /**
  * @return the protocol handler associated with the connector.
  */

Modified: tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1763712&r1=1763711&r2=1763712&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml Fri 
Oct  7 09:45:40 2016
@@ -140,7 +140,8 @@
 
 
+ type="java.lang.String"
+  

svn commit: r1763714 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java

[markt]

Author: markt
Date: Fri Oct  7 09:48:06 2016
New Revision: 1763714

URL: http://svn.apache.org/viewvc?rev=1763714&view=rev
Log:
Deprecate methods that will be removed in 9.0.x

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java?rev=1763714&r1=1763713&r2=1763714&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Connector.java Fri 
Oct  7 09:48:06 2016
@@ -539,7 +539,11 @@ public class Connector extends Lifecycle
  * Set the Coyote protocol which will be used by the connector.
  *
  * @param protocol The Coyote protocol name
+ *
+ * @deprecated Will be removed in Tomcat 9. Protocol must be configured via
+ * the constructor
  */
+@Deprecated
 public void setProtocol(String protocol) {
 
 boolean aprConnector = AprLifecycleListener.isAprAvailable() &&
@@ -576,7 +580,11 @@ public class Connector extends Lifecycle
  * by the connector.
  *
  * @param protocolHandlerClassName The new class name
+ *
+ * @deprecated Will be removed in Tomcat 9. Protocol must be configured via
+ * the constructor
  */
+@Deprecated
 public void setProtocolHandlerClassName(String protocolHandlerClassName) {
 this.protocolHandlerClassName = protocolHandlerClassName;
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r16414 - in /dev/tomcat/tomcat-8/v8.0.38: bin/ bin/embed/ bin/extras/ src/

[markt]

Author: markt
Date: Fri Oct  7 09:51:57 2016
New Revision: 16414

Log:
Add missing signatures

Added:
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.zip.asc
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.exe.asc
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.tar.gz.asc
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.zip.asc
dev/tomcat/tomcat-8/v8.0.38/bin/embed/apache-tomcat-8.0.38-embed.tar.gz.asc
dev/tomcat/tomcat-8/v8.0.38/bin/embed/apache-tomcat-8.0.38-embed.zip.asc
dev/tomcat/tomcat-8/v8.0.38/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.0.38/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.0.38/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-8/v8.0.38/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-8/v8.0.38/src/apache-tomcat-8.0.38-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.0.38/src/apache-tomcat-8.0.38-src.zip.asc

Added: dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.tar.gz.asc
==
--- dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.tar.gz.asc 
(added)
+++ dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.tar.gz.asc 
Fri Oct  7 09:51:57 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJX92/mAAoJEBDAHFovYFnnL+YP/3ax1X28LJSd6azxBO/u3qXj
+Hlh9FEkiGJNRy0gWcaE2HYM0RH0a8zsFJ2Oknkv2s7kbnCUGVi9jG73JmGmX6gfY
+5JgAjc+9Zrs1aFzqI5/j5amGnglUuuXT4oYQoMEQE0A3EfNtnvGaDtmTVGdHUntN
+mo2cs9UxtfJlR5laYlK5QO+QfTJsd26ww0Q71HSVAD/kwRKPPA3quTZn9QmUvwt3
+6xMBaXPzYXsUNYERUTAwxtUs2ziOt9MivZV1ODxbS3XEVU9njXCZPwXgJ2pHcWT5
+iEaggGp0hzK/Cf0Eum2dyEienzlRGsT/hcxrRUFfIOzGMg4qexhMJdplv1QEf1oU
+C//lkEyYgP5bzLicUlmZsjDBsd2VIcukRwBYLnxFqDpjRP+GUJV67AaAKXzcBC07
+HiXMLhUEXX1w1keZYidW5DLFoyeaMRPD4nNM5X5vkMT3/+bjPKTII2WE5GV0wdGQ
+cRIk0Zuk7bS9h/dFG1n8JRB9n8N8vfXO9wbTQBAtYHFNWSgtvLrVzlS7HaIn6vYo
+LSB14TxfTtM2P6wmH2xbAWyY3xMcOE8Sg72v6LTY+N4HUPHkmqNSgZg5dQLjJIOT
+bYiR7XqBbVOXkfyLYdM/Sh7jgJ7P2nU+RHSxMwg/i+ZBmP10EHr2Fack+xhNQOXC
+ypB/qmWoxZnI4dWiGJEW
+=jd3D
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.zip.asc
==
--- dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.zip.asc 
(added)
+++ dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.zip.asc Fri 
Oct  7 09:51:57 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJX92/nAAoJEBDAHFovYFnncCoQAIhgUY2g159PYWwDziETrzJw
+mUYMMPXZ+jpkDmZKqtwb2Qz16r3yB4AQ9X33SiNmezr9680gYC0MxKoaJNbBdEty
+IBlH0skaSJqQt2Xf321F3HdY9gE3Bnibv4Iy9blFn0VxxZcMa/DjwPC8DMhOXVdV
+Dcl/uzsPRH+x96rktmo3zIVTwlPAYzFxD0q/cpL5NizCtrNX4eNoI/Z7YSiL/eSH
+7zpcHBcrlWP7YDVTKTBZh8/Lj6u9jRPgZRWJqQfPGtB1GYm4DcAfxxRwfAQPgkP6
+EPiNJq4hBZ8yxURn5NDrnkz1EBDQW0ilcgteAr60gzxuakalVr/J4Rl4thE89TfY
+3DuzT2vpQdmS4GDVMcbJBCtxOsFThV4b3+rSBirUJWPphavouO7t8s1f13MtQvdf
+Zw3+7XfIZrD20HcpIW7MQBOFQkCeijkwG/Kg/fKFaezxKE/UsfDWeMSqP2njQ4aG
+YBjFlaLj6M+A0ijgaB6CffUV5pgfJzc9OtV0SMkBX43sHiPTiyuhDkvBBl8RAtpS
+LcMT4sXlYGs8AeDIcTf7esCFGHQ92MimcJhls1t4z1yZZHwOhShfZkfeRxRzF41a
+0rTWSWCsb1Noa6QCv2BWCfgSIHHTgxr4Q3jVy9KApo4NOA8P0BaGBdtJi/qB75Jh
+D8DApkLZhSwkz+5BVTod
+=rI1a
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-fulldocs.tar.gz.asc
==
--- dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-fulldocs.tar.gz.asc 
(added)
+++ dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-fulldocs.tar.gz.asc 
Fri Oct  7 09:51:57 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJX92/oAAoJEBDAHFovYFnnX1MP/3loyqumZZP7orYDqvQtkQ4F
+cwASRA05ilFq+k7n+9sa0Xbc3M+B/o7TKbAAWJ8E9xbWp2Aif8qGkHQajd0xHk9S
+UXlNXnTaT1YmMc7lmWt3ysGEgpI5naPAnbE3j0jnMy1joA4aYwbLycrMtYelPRyq
+krVJCqIrPuOqGOHN3En7mDhtZrl5Ck5Xq1kNL84WTqtHA5MEGAy4snlfsZWWxfNs
+A9EXfkbssgoEdIsej5djC+kfUzNTSsY4cDSfkmHEoLHyp0HKsuxJcZfsg9Dq642i
+9O193o7Dfph1kWkfLmYqA7CNXdJ05CzHZXrciqt14IBQUGdq431QIFhtYr+rCXnz
+15piPO9QbUCyTM4Yd9uJcaVVVDVjdiWdcU/AvAAvYc+BUiHV6VdGiWuRLR/uE/he
+wtcrsJ0mMNQh6Pw6FV0OcO47Svx+CoSUGBhKgu26VmJzyhrfJ/lK4rw6rqxtT9Fv
+590gBcGwZCU8EUflgC27Mi7h5V66Ou3mDw1+t8Tbf47ju8daO+m8fFS8Lw0mDW2T
+XRPiz/IafQqbFCUF8RsQUPyC8gDQgMMEgyxyKrHkXF6noIUTYkJng34pcix3Sl8U
+6+v8nNfOdS9p0TFRp6KBgO09j64pexBH7tLG1q+yIcReLaZ1gSnDXs1D/Nl+oHYJ
+/9iH2mvNq+Vd+DH1nZko
+=37Ad
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-windows-x64.zip.asc

Re: [VOTE] Release Apache Tomcat 8.0.38

[Mark Thomas]

On 07/10/2016 10:27, Felix Schumacher wrote:
> 
> 
> Am 6. Oktober 2016 23:18:39 MESZ, schrieb Mark Thomas :
>> The proposed Apache Tomcat 8.0.38 release is now available for voting.
>>
>> The main changes since 8.0.37 are:
>>
>> - Refactoring the non-container thread Async complete()/dispatch()
>>  handling to remove the possibility of deadlock
>>
>> - 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
>>
>> - Improved UTF-8 handling for the RewriteValve
>>
>>
>> It can be obtained from:
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.38/
>> The Maven staging repo is:
>> https://repository.apache.org/content/repositories/orgapachetomcat-1098/
>> The svn tag is:
>> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
>>
>> The proposed 8.0.38 release is:
>> [ ] Broken - do not release
>> [ ] Stable - go ahead and release as 8.0.38
> 
> The pgp signatures seem to be missing.

Fixed. Thanks.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763717 - in /tomcat/tc6.0.x/tags/TOMCAT_6_0_46: ./ build.properties.default

[violetagg]

Author: violetagg
Date: Fri Oct  7 09:53:56 2016
New Revision: 1763717

URL: http://svn.apache.org/viewvc?rev=1763717&view=rev
Log:
Tag 6.0.46

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_46/   (props changed)
  - copied from r1763711, tomcat/tc6.0.x/trunk/
Modified:
tomcat/tc6.0.x/tags/TOMCAT_6_0_46/build.properties.default

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_46/
--
--- svn:ignore (added)
+++ svn:ignore Fri Oct  7 09:53:56 2016
@@ -0,0 +1,5 @@
+.*
+output
+build.properties
+work
+logs

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_46/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  7 09:53:56 2016
@@ -0,0 +1,4 @@
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968
 
,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1761631,1761748,1762772,1763236,1763415,1763
 580
+/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018
+/tomcat/tc8.5.x/trunk:1737199,1737966,1738044,1741174,1741182,1741191,1741209,1741226,1741233,1742277,1743118,1743139-1743140,1744059,1744127,1744151,1744232,1744377,1744687,1745228,1746940,1749375,1750016,1750976,1751062,1754112,1754144,1754726,1754806,1754878,1754889,1754894,1754900,1756412,1756940,1757272,1757282,1757501,1758488,1758493,1761629,1761741,1762770,1763233,1763413,1763578
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

svn commit: r1763718 - /tomcat/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Oct  7 09:55:37 2016
New Revision: 1763718

URL: http://svn.apache.org/viewvc?rev=1763718&view=rev
Log:
Update

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763718&r1=1763717&r2=1763718&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct  7 09:55:37 2016
@@ -45,6 +45,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+When creating a new Connector via JMX, ensure that both HTTP/1.1 and
+AJP/1.3 connectors can be created. (markt)
+  
+
+  
 
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763719 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/mbeans/MBeanFactory.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Oct  7 09:56:44 2016
New Revision: 1763719

URL: http://svn.apache.org/viewvc?rev=1763719&view=rev
Log:
When creating a new Connector via JMX, ensure that both HTTP/1.1 and AJP/1.3 
connectors can be created.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  7 09:56:44 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
 
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763635
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,

svn commit: r1763720 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/mbeans/MBeanFactory.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Oct  7 09:58:19 2016
New Revision: 1763720

URL: http://svn.apache.org/viewvc?rev=1763720&view=rev
Log:
When creating a new Connector via JMX, ensure that both HTTP/1.1 and AJP/1.3 
connectors can be created.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  7 09:58:19 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,168

buildbot failure in on tomcat-8-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/801

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1763720
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763731 - in /tomcat/trunk: java/org/apache/catalina/connector/Connector.java java/org/apache/catalina/startup/Catalina.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Oct  7 10:28:18 2016
New Revision: 1763731

URL: http://svn.apache.org/viewvc?rev=1763731&view=rev
Log:
Reduce multiple error messages when Connector fails to instantiate the 
associated ProtocolHandler.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1763731&r1=1763730&r2=1763731&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Fri Oct  7 
10:28:18 2016
@@ -280,6 +280,9 @@ public class Connector extends Lifecycle
  * @return the property value
  */
 public Object getProperty(String name) {
+if (protocolHandler == null) {
+return null;
+}
 String repl = name;
 if (replacements.get(name) != null) {
 repl = replacements.get(name);
@@ -296,6 +299,9 @@ public class Connector extends Lifecycle
  * @return true if the property was successfully set
  */
 public boolean setProperty(String name, String value) {
+if (protocolHandler == null) {
+return false;
+}
 String repl = name;
 if (replacements.get(name) != null) {
 repl = replacements.get(name);
@@ -870,7 +876,9 @@ public class Connector extends Lifecycle
  */
 public void pause() {
 try {
-protocolHandler.pause();
+if (protocolHandler != null) {
+protocolHandler.pause();
+}
 } catch (Exception e) {
 log.error(sm.getString
   ("coyoteConnector.protocolHandlerPauseFailed"), e);
@@ -883,7 +891,9 @@ public class Connector extends Lifecycle
  */
 public void resume() {
 try {
-protocolHandler.resume();
+if (protocolHandler != null) {
+protocolHandler.resume();
+}
 } catch (Exception e) {
 log.error(sm.getString
   ("coyoteConnector.protocolHandlerResumeFailed"), e);
@@ -896,6 +906,11 @@ public class Connector extends Lifecycle
 
 super.initInternal();
 
+if (protocolHandler == null) {
+throw new LifecycleException(
+
sm.getString("coyoteConnector.protocolHandlerInstantiationFailed"));
+}
+
 // Initialize adapter
 adapter = new CoyoteAdapter(this);
 protocolHandler.setAdapter(adapter);
@@ -973,7 +988,9 @@ public class Connector extends Lifecycle
 setState(LifecycleState.STOPPING);
 
 try {
-protocolHandler.stop();
+if (protocolHandler != null) {
+protocolHandler.stop();
+}
 } catch (Exception e) {
 throw new LifecycleException
 (sm.getString
@@ -985,7 +1002,9 @@ public class Connector extends Lifecycle
 @Override
 protected void destroyInternal() throws LifecycleException {
 try {
-protocolHandler.destroy();
+if (protocolHandler != null) {
+protocolHandler.destroy();
+}
 } catch (Exception e) {
 throw new LifecycleException
 (sm.getString

Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1763731&r1=1763730&r2=1763731&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Fri Oct  7 
10:28:18 2016
@@ -331,8 +331,8 @@ public class Catalina {
 
 digester.addRule("Server/Service/Connector",
  new ConnectorCreateRule());
-digester.addRule("Server/Service/Connector",
- new SetAllPropertiesRule(new String[]{"executor", 
"sslImplementationName"}));
+digester.addRule("Server/Service/Connector", new SetAllPropertiesRule(
+new String[]{"executor", "sslImplementationName", 
"protocol"}));
 digester.addSetNext("Server/Service/Connector",
 "addConnector",
 "org.apache.catalina.connector.Connector");

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763731&r1=1763730&r2=1763731&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ 

Early Access builds of JDK 8u122 b01 & JDK 9 EA b138 are available.

[Rory O'Donnell]

Hi Mark,

Early Access b01  for JDK 8u122 is 
available on java.net.


Early Access b138  for JDK 9 is 
available on java.net, summary of  changes are listed here 
.


Early Access b138  (#5561) for JDK 9 with 
Project Jigsaw is available on java.net, summary of  changes are listed 
here 
. 



There have been a number of fixes to bugs reported by Open Source 
projects since the last availability email  :


 * 8038348 - b137 - Instance field load is replaced by wrong data Phi
 * 8041480 - b137 - ArrayIndexOutOfBoundsException when JTable contains
   certain string
 * 8145542 - b137 - The case failed automatically and thrown
   java.lang.ArrayIndexOutOfBoundsException exception.
 * 8151725 - b137  - [macosx] ArrayIndexOOB exception when displaying
   Devanagari text in JEditorPane

There are two proposals requesting feedback via mailing lists :

 - More proposals for open JPMS issues [1]

 * One proposal to call out is #AwkwardStrongEncapsulation as this
   proposes to change setAccessible(true) so that it can't be used to
   break into non-public types/members in exported packages. This is a
   non-issue when using setAccessible to get access to non-public
   types/members of classes on the class path but will be an issue for
   code that uses this method to break into JDK-internals. We would
   appreciate as much help as possible testing these builds. If
   InaccessibleObjectException is thrown then examine the stack trace
   (run with -Dsun.reflect.debugModuleAccessChecks=true to uncover
   failed access attempts in code that shallows exceptions). If it
   looks like a library is attempting to access a non-public method or
   field of a platform class and make sure to *submit a bug in the
   issue tracker for the library.*

 - Proposal to Reorganize source classes in src.zip by modules [2]

 * This proposal might have a compatibility impact on IDEs or other
   tools that look in src.zip
 * Feedback via the jigsaw-dev mailing list

Other points of interest:

 * JavaOne Presentations
 o Recorded Presentations
   
 * JDK 9 Schedule change proposal
 o for proposed schedule proposal see [3]


Rgds,Rory

[1] 
http://mail.openjdk.java.net/pipermail/jigsaw-dev/2016-September/009365.html
[2] 
http://mail.openjdk.java.net/pipermail/jigsaw-dev/2016-October/009550.html
[3] 
http://mail.openjdk.java.net/pipermail/jdk9-dev/2016-September/004887.html



--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

Re: [VOTE] Release Apache Tomcat 8.5.6

[Violeta Georgieva]

Hi,

2016-10-06 23:33 GMT+03:00 Mark Thomas :
>
> The proposed Apache Tomcat 8.5.6 release is now available for voting.
>
> The major changes compared to the 8.5.5 release are:
>
> - Refactoring the non-container thread Async complete()/dispatch()
>   handling to remove the possibility of deadlock
>
> - 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
>
> - Improved UTF-8 handling for the RewriteValve
>
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.6/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1097/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
>
> The proposed 8.5.6 release is:
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 8.5.6
> [ ] Beta   - go ahead and release as 8.5.6
> [X] Stable - go ahead and release as 8.5.6

+1 my tests passed

Regards,
Violeta

>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

svn commit: r1763737 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/servlets/CGIServlet.java

[violetagg]

Author: violetagg
Date: Fri Oct  7 11:16:44 2016
New Revision: 1763737

URL: http://svn.apache.org/viewvc?rev=1763737&view=rev
Log:
Merged revision 1759567 from tomcat/tc7.0.x/trunk:
Fix javadoc

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  7 11:16:44 2016
@@ -1,4 +1,4 @@
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968
 
,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1761631,1761748,1762772,1763236,1763415,1763
 580
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968
 
,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,174

svn commit: r1763738 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_46/

[violetagg]

Author: violetagg
Date: Fri Oct  7 11:19:48 2016
New Revision: 1763738

URL: http://svn.apache.org/viewvc?rev=1763738&view=rev
Log:
Drop the tag in order to pick up a fix in javadoc.

Removed:
tomcat/tc6.0.x/tags/TOMCAT_6_0_46/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763741 - in /tomcat/tc6.0.x/tags/TOMCAT_6_0_46: ./ build.properties.default

[violetagg]

Author: violetagg
Date: Fri Oct  7 11:31:38 2016
New Revision: 1763741

URL: http://svn.apache.org/viewvc?rev=1763741&view=rev
Log:
Tag 6.0.46

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_46/   (props changed)
  - copied from r1763738, tomcat/tc6.0.x/trunk/
Modified:
tomcat/tc6.0.x/tags/TOMCAT_6_0_46/build.properties.default

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_46/
--
--- svn:ignore (added)
+++ svn:ignore Fri Oct  7 11:31:38 2016
@@ -0,0 +1,5 @@
+.*
+output
+build.properties
+work
+logs

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_46/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  7 11:31:38 2016
@@ -0,0 +1,4 @@
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968
 
,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759567,1761631,1761748,1762772,1763236,1763
 415,1763580
+/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018,1759565
+/tomcat/tc8.5.x/trunk:1737199,1737966,1738044,1741174,1741182,1741191,1741209,1741226,1741233,1742277,1743118,1743139-1743140,1744059,1744127,1744151,1744232,1744377,1744687,1745228,1746940,1749375,1750016,1750976,1751062,1754112,1754144,1754726,1754806,1754878,1754889,1754894,1754900,1756412,1756940,1757272,1757282,1757501,1758488,1758493,1761629,1761741,1762770,1763233,1763413,1763578
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,7649

svn commit: r1763747 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java LocalStrings.properties

[markt]

Author: markt
Date: Fri Oct  7 11:51:39 2016
New Revision: 1763747

URL: http://svn.apache.org/viewvc?rev=1763747&view=rev
Log:
Reduce instances of logging, rethrowing and logging again when an exception 
occurs for a connector. One log message is sufficient.

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1763747&r1=1763746&r2=1763747&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Oct  7 
11:51:39 2016
@@ -571,13 +571,7 @@ public abstract class AbstractProtocolhttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/LocalStrings.properties?rev=1763747&r1=1763746&r2=1763747&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/LocalStrings.properties Fri Oct  7 
11:51:39 2016
@@ -29,18 +29,12 @@ abstractProtocol.mbeanDeregistrationFail
 abstractProtocolHandler.getAttribute=Get attribute [{0}] with value [{1}]
 abstractProtocolHandler.setAttribute=Set attribute [{0}] with value [{1}]
 abstractProtocolHandler.init=Initializing ProtocolHandler [{0}]
-abstractProtocolHandler.initError=Failed to initialize end point associated 
with ProtocolHandler [{0}]
 abstractProtocolHandler.mbeanRegistrationFailed=Failed to register MBean [{0}] 
for ProtocolHandler [{1}]
 abstractProtocolHandler.start=Starting ProtocolHandler [{0}]
-abstractProtocolHandler.startError=Failed to start end point associated with 
ProtocolHandler [{0}]
 abstractProtocolHandler.pause=Pausing ProtocolHandler [{0}]
-abstractProtocolHandler.pauseError=Failed to pause end point associated with 
ProtocolHandler [{0}]
 abstractProtocolHandler.resume=Resuming ProtocolHandler [{0}]
-abstractProtocolHandler.resumeError=Failed to resume end point associated with 
ProtocolHandler [{0}]
 abstractProtocolHandler.stop=Stopping ProtocolHandler [{0}]
-abstractProtocolHandler.stopError=Failed to stop end point associated with 
ProtocolHandler [{0}]
 abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]
-abstractProtocolHandler.destroyError=Failed to destroy end point associated 
with ProtocolHandler [{0}]
 
 asyncStateMachine.invalidAsyncState=Calling [{0}] is not valid for a request 
with Async state [{1}]
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763748 - in /tomcat/trunk/java/org/apache: catalina/connector/Connector.java coyote/AbstractProtocol.java

[markt]

Author: markt
Date: Fri Oct  7 11:53:31 2016
New Revision: 1763748

URL: http://svn.apache.org/viewvc?rev=1763748&view=rev
Log:
Clean-up

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1763748&r1=1763747&r2=1763748&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Fri Oct  7 
11:53:31 2016
@@ -880,8 +880,7 @@ public class Connector extends Lifecycle
 protocolHandler.pause();
 }
 } catch (Exception e) {
-log.error(sm.getString
-  ("coyoteConnector.protocolHandlerPauseFailed"), e);
+
log.error(sm.getString("coyoteConnector.protocolHandlerPauseFailed"), e);
 }
 }
 
@@ -895,8 +894,7 @@ public class Connector extends Lifecycle
 protocolHandler.resume();
 }
 } catch (Exception e) {
-log.error(sm.getString
-  ("coyoteConnector.protocolHandlerResumeFailed"), e);
+
log.error(sm.getString("coyoteConnector.protocolHandlerResumeFailed"), e);
 }
 }
 
@@ -916,22 +914,20 @@ public class Connector extends Lifecycle
 protocolHandler.setAdapter(adapter);
 
 // Make sure parseBodyMethodsSet has a default
-if( null == parseBodyMethodsSet ) {
+if (null == parseBodyMethodsSet) {
 setParseBodyMethods(getParseBodyMethods());
 }
 
-if (protocolHandler.isAprRequired() &&
-!AprLifecycleListener.isAprAvailable()) {
-throw new LifecycleException(
-sm.getString("coyoteConnector.protocolHandlerNoApr",
-getProtocolHandlerClassName()));
+if (protocolHandler.isAprRequired() && 
!AprLifecycleListener.isAprAvailable()) {
+throw new 
LifecycleException(sm.getString("coyoteConnector.protocolHandlerNoApr",
+getProtocolHandlerClassName()));
 }
-if (AprLifecycleListener.isAprAvailable() &&
-AprLifecycleListener.getUseOpenSSL() &&
+if (AprLifecycleListener.isAprAvailable() && 
AprLifecycleListener.getUseOpenSSL() &&
 protocolHandler instanceof AbstractHttp11JsseProtocol) {
 AbstractHttp11JsseProtocol jsseProtocolHandler =
 (AbstractHttp11JsseProtocol) protocolHandler;
-if (jsseProtocolHandler.isSSLEnabled() && 
jsseProtocolHandler.getSslImplementationName() == null) {
+if (jsseProtocolHandler.isSSLEnabled() &&
+jsseProtocolHandler.getSslImplementationName() == null) {
 // OpenSSL is compatible with the JSSE configuration, so use 
it if APR is available
 
jsseProtocolHandler.setSslImplementationName(OpenSSLImplementation.class.getName());
 }
@@ -965,14 +961,8 @@ public class Connector extends Lifecycle
 try {
 protocolHandler.start();
 } catch (Exception e) {
-String errPrefix = "";
-if(this.service != null) {
-errPrefix += "service.getName(): \"" + this.service.getName() 
+ "\"; ";
-}
-
-throw new LifecycleException
-(errPrefix + " " + sm.getString
- ("coyoteConnector.protocolHandlerStartFailed"), e);
+throw new LifecycleException(
+
sm.getString("coyoteConnector.protocolHandlerStartFailed"), e);
 }
 }
 
@@ -992,9 +982,8 @@ public class Connector extends Lifecycle
 protocolHandler.stop();
 }
 } catch (Exception e) {
-throw new LifecycleException
-(sm.getString
- ("coyoteConnector.protocolHandlerStopFailed"), e);
+throw new LifecycleException(
+sm.getString("coyoteConnector.protocolHandlerStopFailed"), 
e);
 }
 }
 
@@ -1006,9 +995,8 @@ public class Connector extends Lifecycle
 protocolHandler.destroy();
 }
 } catch (Exception e) {
-throw new LifecycleException
-(sm.getString
- ("coyoteConnector.protocolHandlerDestroyFailed"), e);
+throw new LifecycleException(
+
sm.getString("coyoteConnector.protocolHandlerDestroyFailed"), e);
 }
 
 if (getService() != null) {

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1763748&r1=1763747&r2=1763748&view=diff
=

svn commit: r1763755 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties LocalStrings_es.properties StandardService.java

[markt]

Author: markt
Date: Fri Oct  7 12:20:20 2016
New Revision: 1763755

URL: http://svn.apache.org/viewvc?rev=1763755&view=rev
Log:
Connector logs all exceptions during pause(). No need to StandardService to do 
the same.

Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/StandardService.java

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1763755&r1=1763754&r2=1763755&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Fri Oct  
7 12:20:20 2016
@@ -192,7 +192,6 @@ standardServer.shutdownViaPort=A valid s
 standardServer.storeConfig.notAvailable=No StoreConfig implementation was 
registered as an MBean named [{0}] so no configuration could be saved. A 
suitable MBean is normally registered via the StoreConfigLifecyleListener.
 standardService.connector.destroyFailed=Failed to destroy connector [{0}]
 standardService.connector.initFailed=Failed to initialize connector [{0}]
-standardService.connector.pauseFailed=Failed to pause connector [{0}]
 standardService.connector.startFailed=Failed to start connector [{0}]
 standardService.connector.stopFailed=Failed to stop connector [{0}]
 standardService.engine.startFailed=Failed to start associated Engine

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1763755&r1=1763754&r2=1763755&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Fri 
Oct  7 12:20:20 2016
@@ -128,7 +128,6 @@ standardHost.notContext = El Hijo de una
 standardHost.nullName = Es necesario poner el nombre de M\u00E1quina
 standardServer.shutdownViaPort = Se ha recibido un comando de apagado a 
trav\u00E9s del puerto de apagado. Parando la instancia del Servidor.
 standardService.connector.initFailed = No pude inicializar el conector [{0}]
-standardService.connector.pauseFailed = No pude pausar el conector [{0}]
 standardService.connector.startFailed = No pude arrancar el conector [{0}]
 standardService.connector.stopFailed = No pude parar el conector [{0}]
 standardService.start.name = Arrancando servicio {0}

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1763755&r1=1763754&r2=1763755&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Fri Oct  7 
12:20:20 2016
@@ -463,13 +463,7 @@ public class StandardService extends Lif
 // Pause connectors first
 synchronized (connectorsLock) {
 for (Connector connector: connectors) {
-try {
-connector.pause();
-} catch (Exception e) {
-log.error(sm.getString(
-"standardService.connector.pauseFailed",
-connector), e);
-}
+connector.pause();
 }
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 8.5.6

[Rémy Maucherat]

2016-10-06 22:33 GMT+02:00 Mark Thomas :

> The proposed 8.5.6 release is:
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 8.5.6
> [ ] Beta   - go ahead and release as 8.5.6
> [X] Stable - go ahead and release as 8.5.6
>
> No problem found.

Rémy

Re: [VOTE] Release Apache Tomcat 8.0.38

[Rémy Maucherat]

2016-10-06 23:18 GMT+02:00 Mark Thomas :

> The proposed 8.0.38 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.0.38
>
> Rémy

Re: [VOTE] Release Apache Tomcat 8.5.6

[Martin Grigorov]

On Thu, Oct 6, 2016 at 10:33 PM, Mark Thomas  wrote:

> The proposed Apache Tomcat 8.5.6 release is now available for voting.
>
> The major changes compared to the 8.5.5 release are:
>
> - Refactoring the non-container thread Async complete()/dispatch()
>   handling to remove the possibility of deadlock
>
> - 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
>
> - Improved UTF-8 handling for the RewriteValve
>
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.6/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1097/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
>
> The proposed 8.5.6 release is:
> [ ] Broken - do not release
> [ ] Alpha  - go ahead and release as 8.5.6
> [ ] Beta   - go ahead and release as 8.5.6
> [ X ] Stable - go ahead and release as 8.5.6
>

The only thing that bothers me a bit is that I have a lot of those during
start:

07-Oct-2016 15:27:58.342 WARNING [RMI TCP Connection(4)-127.0.0.1]
org.apache.catalina.webresources.Cache.getResource Unable to add the
resource at [/WEB-INF/lib/lucene-memory-5.5.2.jar] to the cache because
there was insufficient free space available after evicting expired cache
entries - consider increasing the maximum size of the cache

I believe there is an entry for each library of my applications and for
(all ?!) .properties and .xml files in the classpath.

If this is normal then the message could be improved to say which cache I
need to touch.

The only thing I've changed in the default configuration was to enable the
HTTP2 connector:

07-Oct-2016 15:13:07.634 INFO [main]
org.apache.catalina.core.AprLifecycleListener.lifecycleEvent Loaded APR
based Apache Tomcat Native library 1.2.10 using APR version 1.5.2.
07-Oct-2016 15:13:07.634 INFO [main]
org.apache.catalina.core.AprLifecycleListener.lifecycleEvent APR
capabilities: IPv6 [true], sendfile [true], accept filters [false], random
[true].
07-Oct-2016 15:13:07.634 INFO [main]
org.apache.catalina.core.AprLifecycleListener.lifecycleEvent APR/OpenSSL
configuration: useAprConnector [false], useOpenSSL [true]
07-Oct-2016 15:13:07.637 INFO [main]
org.apache.catalina.core.AprLifecycleListener.initializeSSL OpenSSL
successfully initialized (OpenSSL 1.0.2e 3 Dec 2015)
07-Oct-2016 15:13:07.756 INFO [main]
org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
["http-nio-8080"]
07-Oct-2016 15:13:07.769 INFO [main]
org.apache.tomcat.util.net.NioSelectorPool.getSharedSelector Using a shared
selector for servlet write/read
07-Oct-2016 15:13:07.773 INFO [main]
org.apache.coyote.http11.AbstractHttp11Protocol.configureUpgradeProtocol
The ["https-openssl-apr-8443"] connector has been configured to support
negotiation to [h2] via ALPN
07-Oct-2016 15:13:07.773 INFO [main]
org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
["https-openssl-apr-8443"]











>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

svn commit: r16417 [2/2] - in /dev/tomcat/tomcat-6/v6.0.46: ./ bin/ bin/extras/ src/

[violetagg]

Added: dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.asc
==
--- dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.asc Fri Oct 
 7 14:00:27 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJX95PJAAoJECCLCrHWMBHHkmIP/1tTlFriKudTaGNmXlJar7l2
+6OsLUS98SVNL+23zJJY+SaLBQTZxTl9XXEDVn3CLu7VyLYGktANo7O0YH5cJIjeM
+RbR4u+gO6YY/qKW7jKCaRtkQQZJcItQ2/KEYrf8a9LAUJ5McrFv7V4L7THSuv07m
+WNI9EDmnhTuG/Zanq1aVpPRN5/Cw7ppv3xzB7HDnPd2iqbdBFIG6zxwwdtpmr8bp
+1Ugo5f+7GYeMVntuPd5anKeu0QsNJJWayBy1ypGS6nfLaxEi/eQjrg5OvMEOnA50
+qIGtwDUOtgcEnli/WnMVw53wcwrEpHK2RorVZL+rk1x7afB3cHGDDZ7kRhPnHLDW
+jhTrMmHxhIKj7+ZXjwPYbP8m9tLIz2Rrrtfnh1LPFudEdH0zChoD4VcjCIWMKxTY
+bMmTY+Ufl3lGxE1GjD70Q6Xhcw+UKXFti33UQ3+PwXnWQyvjNazzriYQnVq11z+W
+UryWh+R9an7PuH8siRYJFqpmNF1LsY81fjHDIB088OmiAgxFISCyyVQYWPaaVDoh
+VwfLMESEjJIj0qQ0ceBcXodhW9qpZr2pZXgbYAKtvv1lNuFuBr/FGfcG76nLaAjj
+UQ8KWxmQQxRUPAreeVdblli4QT12cnLkI4WYRdYu5E8uou0ZrOWgTFkFqp0MXhfh
+JS4gMJHJdCeA3B68bCrY
+=z35V
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.md5
==
--- dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.md5 (added)
+++ dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.md5 Fri Oct 
 7 14:00:27 2016
@@ -0,0 +1 @@
+28a2fdb0d0e688259e623222a7b7e34f *apache-tomcat-6.0.46-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.sha1
==
--- dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.sha1 (added)
+++ dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.sha1 Fri 
Oct  7 14:00:27 2016
@@ -0,0 +1 @@
+db451ffb8b4f45009181ba46da7ef874f6f1b43d *apache-tomcat-6.0.46-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.asc
==
--- dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.asc (added)
+++ dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.asc Fri Oct  7 
14:00:27 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCgAGBQJX95QQAAoJECCLCrHWMBHHGYwQAL11gx2XZY3X64glY6faAcfW
+bReUfHsKyQn+qc1SSOIny6oWmptiFL00ihEtu9riUDulsvrnEHPOHaUsgzXCbGP3
+CWmfA4x16ZU/tEjdu/FFLgie+jHp+yoZAz/W/O0SZT5hy6gpNeDRw5G+51NRYSAc
+fyNU2AMvtoVPMD9j1ON78CoLfmgPlxGosUVngPZzZiFssPxVwjnlEskttaWze0lB
+ygCqpXR4U55CeTIxRH7Bch5G/AUV1lUePNwxzunOOmKJNJxHz6M7Tzn28EqqehW6
+jD3OrlyrSQP+8vF/BR2jp5cZX1FWEGGNS/IcD00z3AO0Tzu2bVMO5HR4Y77tuiGf
+DzKbIQy6yWyf9JvHPC6jddUuXhf7uq+wgHSwrR3520B8U7Vc7/N4puJxP2pEwBCs
+w7o94oflDnsgHV2sKyLCArFhBm/s3E1/pca74yrUph5JoFboJdDQhHGBlZEW441p
+nBy1opQWkzs+sixl8MTWVN68hV4/xwMHt0x5+UXkIqOknBay5zRpRJId1vxnZZX8
+q0T/W6AYdp30apb7dNV//nhTiW1CPOJFxwb9XPNPosXq6d6S1kMx2Hi4hLs6XmdJ
+cndKdX7ufojBVB4blCLhXAHWjl0hCzjyJu6gadenXrvHDt7Oqx5v7ok0IxtQBLyD
+WzkrA7MQzhoQAvgmyk9T
+=ml9B
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.md5
==
--- dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.md5 (added)
+++ dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.md5 Fri Oct  7 
14:00:27 2016
@@ -0,0 +1 @@
+9e7c477feb8e44e7f2a74b4feb54ae42 *apache-tomcat-6.0.46-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.sha1
==
--- dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.sha1 (added)
+++ dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.sha1 Fri Oct  
7 14:00:27 2016
@@ -0,0 +1 @@
+c7978cb4c8f7c8459b8f223343d1fa1cf7d9e416 *apache-tomcat-6.0.46-src.zip
\ No newline at end of file



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r16417 [1/2] - in /dev/tomcat/tomcat-6/v6.0.46: ./ bin/ bin/extras/ src/

[violetagg]

Author: violetagg
Date: Fri Oct  7 14:00:27 2016
New Revision: 16417

Log:
Stage 6.0.46 RC

Added:
dev/tomcat/tomcat-6/v6.0.46/
dev/tomcat/tomcat-6/v6.0.46/KEYS
dev/tomcat/tomcat-6/v6.0.46/README.html
dev/tomcat/tomcat-6/v6.0.46/RELEASE-NOTES
dev/tomcat/tomcat-6/v6.0.46/bin/
dev/tomcat/tomcat-6/v6.0.46/bin/README.html
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-deployer.tar.gz.asc
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-deployer.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-deployer.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-deployer.zip   (with 
props)
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-deployer.zip.asc
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-deployer.zip.md5
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-deployer.zip.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-fulldocs.tar.gz.asc
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-fulldocs.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-windows-x64.zip   
(with props)
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-windows-x64.zip.asc
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-windows-x64.zip.md5
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-windows-x64.zip.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-windows-x86.zip   
(with props)
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-windows-x86.zip.asc
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-windows-x86.zip.md5
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46-windows-x86.zip.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.exe   (with props)
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.exe.asc
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.exe.md5
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.exe.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.tar.gz   (with props)
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.tar.gz.asc
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.zip   (with props)
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.zip.asc
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.zip.md5
dev/tomcat/tomcat-6/v6.0.46/bin/apache-tomcat-6.0.46.zip.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/extras/
dev/tomcat/tomcat-6/v6.0.46/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-6/v6.0.46/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-6/v6.0.46/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-6/v6.0.46/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-6/v6.0.46/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-6/v6.0.46/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-6/v6.0.46/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-6/v6.0.46/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-6/v6.0.46/bin/extras/tomcat-juli-adapters.jar.md5
dev/tomcat/tomcat-6/v6.0.46/bin/extras/tomcat-juli-adapters.jar.sha1
dev/tomcat/tomcat-6/v6.0.46/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-6/v6.0.46/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-6/v6.0.46/bin/extras/tomcat-juli.jar.md5
dev/tomcat/tomcat-6/v6.0.46/bin/extras/tomcat-juli.jar.sha1
dev/tomcat/tomcat-6/v6.0.46/src/
dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz   (with 
props)
dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.asc
dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip   (with props)
dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.asc
dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.md5
dev/tomcat/tomcat-6/v6.0.46/src/apache-tomcat-6.0.46-src.zip.sha1

Added: dev/tomcat/tomcat-6/v6.0.46/KEYS
==
--- dev/tomcat/tomcat-6/v6.0.46/KEYS (added)
+++ dev/tomcat/tomcat-6/v6.0.46/KEYS Fri Oct  7 14:00:27 2016
@@ -0,0 +1,631 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache 

[VOTE] Release Apache Tomcat 6.0.46

[Violeta Georgieva]

The proposed Apache Tomcat 6.0.46 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.46/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1099/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_46/

The proposed 6.0.46 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 6.0.46 Stable

Regards,
Violeta

svn commit: r1763768 - in /tomcat/tc6.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Fri Oct  7 14:22:27 2016
New Revision: 1763768

URL: http://svn.apache.org/viewvc?rev=1763768&view=rev
Log:
Increment version for next release

Modified:
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1763768&r1=1763767&r2=1763768&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Fri Oct  7 14:22:27 2016
@@ -25,10 +25,10 @@
 # - Version Control Flags -
 version.major=6
 version.minor=0
-version.build=46
+version.build=47
 version.patch=0
 version.suffix=-dev
-version=6.0.46
+version=6.0.47
 
 # - Build control flags -
 execute.test.bio=true

Modified: tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default?rev=1763768&r1=1763767&r2=1763768&view=diff
==
--- tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default Fri Oct  7 14:22:27 
2016
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=6.0.46
+maven.asf.release.deploy.version=6.0.47
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1763768&r1=1763767&r2=1763768&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Oct  7 14:22:27 2016
@@ -44,6 +44,8 @@
 
+
+
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 60152] Allow exceptions from Connector.start() to be caught and handled in code that embeds Tomcat

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=60152

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #8 from Mark Thomas  ---
Fixed in 9.0.x for 9.0.12 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763769 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ test/org/apache/catalina/connector/ webapps/docs/ webapps/docs/config/

[markt]

Author: markt
Date: Fri Oct  7 14:39:47 2016
New Revision: 1763769

URL: http://svn.apache.org/viewvc?rev=1763769&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60152
Provide an option for Connector Lifecycle exceptions to be re-thrown rather 
than logged. This is controlled by the new throwOnFailure  attribute of the 
Connector.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/test/org/apache/catalina/connector/TestConnector.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/ajp.xml
tomcat/trunk/webapps/docs/config/http.xml
tomcat/trunk/webapps/docs/config/systemprops.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1763769&r1=1763768&r2=1763769&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Fri Oct  7 
14:39:47 2016
@@ -106,6 +106,9 @@ public class Connector extends Lifecycle
 URIEncoding = "UTF-8";
 URIEncodingLower = URIEncoding.toLowerCase(Locale.ENGLISH);
 }
+
+// Default for Connector depends on this system property
+
setThrowOnFailure(Boolean.getBoolean("org.apache.catalina.startup.EXIT_ON_INIT_FAILURE"));
 }
 
 

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1763769&r1=1763768&r2=1763769&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Fri Oct  
7 14:39:47 2016
@@ -190,10 +190,6 @@ standardHostValue.customStatusFailed=Cus
 standardServer.accept.timeout=The socket listening for the shutdown command 
experienced an unexpected timeout [{0}] milliseconds after the call to 
accept(). Is this an instance of bug 56684?
 standardServer.shutdownViaPort=A valid shutdown command was received via the 
shutdown port. Stopping the Server instance.
 standardServer.storeConfig.notAvailable=No StoreConfig implementation was 
registered as an MBean named [{0}] so no configuration could be saved. A 
suitable MBean is normally registered via the StoreConfigLifecyleListener.
-standardService.connector.destroyFailed=Failed to destroy connector [{0}]
-standardService.connector.initFailed=Failed to initialize connector [{0}]
-standardService.connector.startFailed=Failed to start connector [{0}]
-standardService.connector.stopFailed=Failed to stop connector [{0}]
 standardService.engine.startFailed=Failed to start associated Engine
 standardService.engine.stopFailed=Failed to stop associated Engine
 standardService.mapperListener.startFailed=Failed to start associated 
MapperListener

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1763769&r1=1763768&r2=1763769&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Fri 
Oct  7 14:39:47 2016
@@ -127,9 +127,6 @@ standardHost.noContext = No se ha config
 standardHost.notContext = El Hijo de una M\u00E1quina debe de ser un Contexto
 standardHost.nullName = Es necesario poner el nombre de M\u00E1quina
 standardServer.shutdownViaPort = Se ha recibido un comando de apagado a 
trav\u00E9s del puerto de apagado. Parando la instancia del Servidor.
-standardService.connector.initFailed = No pude inicializar el conector [{0}]
-standardService.connector.startFailed = No pude arrancar el conector [{0}]
-standardService.connector.stopFailed = No pude parar el conector [{0}]
 standardService.start.name = Arrancando servicio {0}
 standardService.stop.name = Parando servicio {0}
 standardWrapper.allocate = Error reservando espacio para una instancia de 
servlet

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1763769&r1=1763768&r2=1763769&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apac

Re: [VOTE] Release Apache Tomcat 8.0.38

[Violeta Georgieva]

Hi,

2016-10-07 0:18 GMT+03:00 Mark Thomas :
>
> The proposed Apache Tomcat 8.0.38 release is now available for voting.
>
> The main changes since 8.0.37 are:
>
> - Refactoring the non-container thread Async complete()/dispatch()
>   handling to remove the possibility of deadlock
>
> - 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
>
> - Improved UTF-8 handling for the RewriteValve
>
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.38/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1098/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
>
> The proposed 8.0.38 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.0.38

+1 my tests passed

Regards,
Violeta

>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

Re: [VOTE] Release Apache Tomcat 8.5.6

[Mark Thomas]

On 07/10/2016 14:50, Martin Grigorov wrote:
> On Thu, Oct 6, 2016 at 10:33 PM, Mark Thomas  wrote:
> 
>> The proposed Apache Tomcat 8.5.6 release is now available for voting.
>>
>> The major changes compared to the 8.5.5 release are:
>>
>> - Refactoring the non-container thread Async complete()/dispatch()
>>   handling to remove the possibility of deadlock
>>
>> - 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
>>
>> - Improved UTF-8 handling for the RewriteValve
>>
>>
>> It can be obtained from:
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.6/
>> The Maven staging repo is:
>> https://repository.apache.org/content/repositories/orgapachetomcat-1097/
>> The svn tag is:
>> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
>>
>> The proposed 8.5.6 release is:
>> [ ] Broken - do not release
>> [ ] Alpha  - go ahead and release as 8.5.6
>> [ ] Beta   - go ahead and release as 8.5.6
>> [ X ] Stable - go ahead and release as 8.5.6
>>
> 
> The only thing that bothers me a bit is that I have a lot of those during
> start:
> 
> 07-Oct-2016 15:27:58.342 WARNING [RMI TCP Connection(4)-127.0.0.1]
> org.apache.catalina.webresources.Cache.getResource Unable to add the
> resource at [/WEB-INF/lib/lucene-memory-5.5.2.jar] to the cache because
> there was insufficient free space available after evicting expired cache
> entries - consider increasing the maximum size of the cache

I suspect that this is the cause:

https://bz.apache.org/bugzilla/show_bug.cgi?id=60146

We might need to tweak the caching algorithm and/or config.

> I believe there is an entry for each library of my applications and for
> (all ?!) .properties and .xml files in the classpath.
> 
> If this is normal then the message could be improved to say which cache I
> need to touch.

The message could be improved regardless.

Mark


> 
> The only thing I've changed in the default configuration was to enable the
> HTTP2 connector:
> 
> 07-Oct-2016 15:13:07.634 INFO [main]
> org.apache.catalina.core.AprLifecycleListener.lifecycleEvent Loaded APR
> based Apache Tomcat Native library 1.2.10 using APR version 1.5.2.
> 07-Oct-2016 15:13:07.634 INFO [main]
> org.apache.catalina.core.AprLifecycleListener.lifecycleEvent APR
> capabilities: IPv6 [true], sendfile [true], accept filters [false], random
> [true].
> 07-Oct-2016 15:13:07.634 INFO [main]
> org.apache.catalina.core.AprLifecycleListener.lifecycleEvent APR/OpenSSL
> configuration: useAprConnector [false], useOpenSSL [true]
> 07-Oct-2016 15:13:07.637 INFO [main]
> org.apache.catalina.core.AprLifecycleListener.initializeSSL OpenSSL
> successfully initialized (OpenSSL 1.0.2e 3 Dec 2015)
> 07-Oct-2016 15:13:07.756 INFO [main]
> org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
> ["http-nio-8080"]
> 07-Oct-2016 15:13:07.769 INFO [main]
> org.apache.tomcat.util.net.NioSelectorPool.getSharedSelector Using a shared
> selector for servlet write/read
> 07-Oct-2016 15:13:07.773 INFO [main]
> org.apache.coyote.http11.AbstractHttp11Protocol.configureUpgradeProtocol
> The ["https-openssl-apr-8443"] connector has been configured to support
> negotiation to [h2] via ALPN
> 07-Oct-2016 15:13:07.773 INFO [main]
> org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
> ["https-openssl-apr-8443"]
> 
> maxThreads="150" SSLEnabled="true" >
>  />
> 
>   certificateFile="conf/cert.pem"
>  certificateKeyPassword="tomcat"
>  type="RSA" />
> 
> 
> 
> 
> 
> 
>>
>> -
>> 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

svn commit: r1763786 - /tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties

[remm]

Author: remm
Date: Fri Oct  7 15:31:41 2016
New Revision: 1763786

URL: http://svn.apache.org/viewvc?rev=1763786&view=rev
Log:
Update command line parameter.

Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=1763786&r1=1763785&r2=1763786&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Fri 
Oct  7 15:31:41 2016
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-webappClassLoader.addExports=When running on Java 9 you need to add 
"-XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED" to the JVM command line 
arguments to enable RMI Target memory leak detection. Alternatively, you can 
suppress this warning by disabling RMI Target memory leak detection.
+webappClassLoader.addExports=When running on Java 9 you need to add 
"--add-exports java.rmi/sun.rmi.transport=ALL-UNNAMED" to the JVM command line 
arguments to enable RMI Target memory leak detection. Alternatively, you can 
suppress this warning by disabling RMI Target memory leak detection.
 webappClassLoader.addPermisionNoCanonicalFile=Unable to obtain a canonical 
file path from the URL [{0}]
 webappClassLoader.addPermisionNoProtocol=The protocol [{0}] in the URL [{1}] 
is not supported so no read permission was granted for resources located at 
this URL
 webappClassLoader.illegalJarPath=Illegal JAR entry detected with name {0}



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763787 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/loader/LocalStrings.properties

[remm]

Author: remm
Date: Fri Oct  7 15:33:43 2016
New Revision: 1763787

URL: http://svn.apache.org/viewvc?rev=1763787&view=rev
Log:
Update command line parameter

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  7 15:33:43 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
 
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763635,1763718
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,17

svn commit: r1763788 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/loader/LocalStrings.properties

[remm]

Author: remm
Date: Fri Oct  7 15:34:45 2016
New Revision: 1763788

URL: http://svn.apache.org/viewvc?rev=1763788&view=rev
Log:
Update command line parameter

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  7 15:34:45 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,16930

svn commit: r1763790 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties

[remm]

Author: remm
Date: Fri Oct  7 15:38:17 2016
New Revision: 1763790

URL: http://svn.apache.org/viewvc?rev=1763790&view=rev
Log:
Update command line parameter

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=1763790&r1=1763789&r2=1763790&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties 
Fri Oct  7 15:38:17 2016
@@ -34,7 +34,7 @@ virtualWebappLoader.token.glob.dir=Listi
 virtualWebappLoader.token.notDirectory=Path is skipped, because it does not 
exist or is not a directory: [{0}]
 virtualWebappLoader.token.notExists=Path is skipped, because it does not 
exist: [{0}]
 virtualWebappLoader.token.notFile=Path is skipped, because it does not exist 
or is not a file: [{0}]
-webappClassLoader.addExports=When running on Java 9 you need to add 
"-XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED" to the JVM command line 
arguments to enable RMI Target memory leak detection. Alternatively, you can 
suppress this warning by disabling RMI Target memory leak detection.
+webappClassLoader.addExports=When running on Java 9 you need to add 
"--add-exports java.rmi/sun.rmi.transport=ALL-UNNAMED" to the JVM command line 
arguments to enable RMI Target memory leak detection. Alternatively, you can 
suppress this warning by disabling RMI Target memory leak detection.
 webappClassLoader.illegalJarPath=Illegal JAR entry detected with name {0}
 webappClassLoader.jdbcRemoveFailed=JDBC driver de-registration failed for web 
application [{0}]
 webappClassLoader.jdbcRemoveStreamError=Exception closing input stream during 
JDBC driver de-registration for web application [{0}]



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763791 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties

[remm]

Author: remm
Date: Fri Oct  7 15:39:57 2016
New Revision: 1763791

URL: http://svn.apache.org/viewvc?rev=1763791&view=rev
Log:
Update command line parameter

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=1763791&r1=1763790&r2=1763791&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties 
Fri Oct  7 15:39:57 2016
@@ -34,7 +34,7 @@ virtualWebappLoader.token.glob.dir=Listi
 virtualWebappLoader.token.notDirectory=Path is skipped, because it does not 
exist or is not a directory: [{0}]
 virtualWebappLoader.token.notExists=Path is skipped, because it does not 
exist: [{0}]
 virtualWebappLoader.token.notFile=Path is skipped, because it does not exist 
or is not a file: [{0}]
-webappClassLoader.addExports=When running on Java 9 you need to add 
"-XaddExports:java.rmi/sun.rmi.transport=ALL-UNNAMED" to the JVM command line 
arguments to enable RMI Target memory leak detection. Alternatively, you can 
suppress this warning by disabling RMI Target memory leak detection.
+webappClassLoader.addExports=When running on Java 9 you need to add 
"--add-exports java.rmi/sun.rmi.transport=ALL-UNNAMED" to the JVM command line 
arguments to enable RMI Target memory leak detection. Alternatively, you can 
suppress this warning by disabling RMI Target memory leak detection.
 webappClassLoader.illegalJarPath=Illegal JAR entry detected with name {0}
 webappClassLoader.jdbcRemoveFailed=JDBC driver de-registration failed for web 
application [{0}]
 webappClassLoader.jdbcRemoveStreamError=Exception closing input stream during 
JDBC driver de-registration for web application [{0}]



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763792 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Fri Oct  7 15:49:07 2016
New Revision: 1763792

URL: http://svn.apache.org/viewvc?rev=1763792&view=rev
Log:
Fix typo.

Merge r1763634 from /tomcat/trunk

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  7 15:49:07 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
 
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763635,1763718,1763786
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1

svn commit: r1763793 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml

[fschumacher]

Author: fschumacher
Date: Fri Oct  7 15:51:15 2016
New Revision: 1763793

URL: http://svn.apache.org/viewvc?rev=1763793&view=rev
Log:
Fix typo.

Merge r1763792 from /tomcat/tc8.5.x/trunk (merged r1763634 from /tomcat/trunk)

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  7 15:51:15 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-

buildbot success in on tomcat-8-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/802

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1763788
Blamelist: remm

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763798 - in /tomcat/trunk/java/org/apache/catalina/webresources: Cache.java LocalStrings.properties

[markt]

Author: markt
Date: Fri Oct  7 16:30:06 2016
New Revision: 1763798

URL: http://svn.apache.org/viewvc?rev=1763798&view=rev
Log:
Include Context name when cache addition fails.

Modified:
tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/catalina/webresources/Cache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/Cache.java?rev=1763798&r1=1763797&r2=1763798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/Cache.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/Cache.java Fri Oct  7 
16:30:06 2016
@@ -97,15 +97,13 @@ public class Cache {
 // efficiency (younger entries may be evicted before older
 // ones) for speed since this is on the critical path for
 // request processing
-long targetSize =
-maxSize * (100 - TARGET_FREE_PERCENT_GET) / 100;
-long newSize = evict(
-targetSize, resourceCache.values().iterator());
+long targetSize = maxSize * (100 - 
TARGET_FREE_PERCENT_GET) / 100;
+long newSize = evict(targetSize, 
resourceCache.values().iterator());
 if (newSize > maxSize) {
 // Unable to create sufficient space for this resource
 // Remove it from the cache
 removeCacheEntry(path);
-log.warn(sm.getString("cache.addFail", path));
+log.warn(sm.getString("cache.addFail", path, 
root.getContext().getName()));
 }
 }
 } else {
@@ -157,10 +155,8 @@ public class Cache {
 // efficiency (younger entries may be evicted before older
 // ones) for speed since this is on the critical path for
 // request processing
-long targetSize =
-maxSize * (100 - TARGET_FREE_PERCENT_GET) / 100;
-long newSize = evict(
-targetSize, resourceCache.values().iterator());
+long targetSize = maxSize * (100 - 
TARGET_FREE_PERCENT_GET) / 100;
+long newSize = evict(targetSize, 
resourceCache.values().iterator());
 if (newSize > maxSize) {
 // Unable to create sufficient space for this resource
 // Remove it from the cache

Modified: 
tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties?rev=1763798&r1=1763797&r2=1763798&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/LocalStrings.properties 
Fri Oct  7 16:30:06 2016
@@ -20,7 +20,7 @@ abstractResource.getContentTooLarge=Unab
 
 abstractResourceSet.checkPath=The requested path [{0}] is not valid. It must 
begin with "/".
 
-cache.addFail=Unable to add the resource at [{0}] to the cache because there 
was insufficient free space available after evicting expired cache entries - 
consider increasing the maximum size of the cache
+cache.addFail=Unable to add the resource at [{0}] to the cache for web 
application [{1}] because there was insufficient free space available after 
evicting expired cache entries - consider increasing the maximum size of the 
cache
 cache.backgroundEvictFail=The background cache eviction process was unable to 
free [{0}] percent of the cache for Context [{1}] - consider increasing the 
maximum size of the cache. After eviction approximately [{2}] KB of data 
remained in the cache.
 cache.objectMaxSizeTooBig=The value of [{0}]kB for objectMaxSize is larger 
than the limit of maxSize/20 so has been reduced to [{1}]kB
 cache.objectMaxSizeTooBigBytes=The value specified for the maximum object size 
to cache [{0}]kB is greater than Integer.MAX_VALUE bytes which is the maximum 
size that can be cached. The limit will be set to Integer.MAX_VALUE bytes.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763799 - /tomcat/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Oct  7 16:31:49 2016
New Revision: 1763799

URL: http://svn.apache.org/viewvc?rev=1763799&view=rev
Log:
Update

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763799&r1=1763798&r2=1763799&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct  7 16:31:49 2016
@@ -60,6 +60,10 @@
 to be re-thrown rather than logged. This is controlled by the new
 throwOnFailure attribute of the Connector. (markt)
   
+  
+Include the Context name in the log message when an item cannot be
+added to the cache. (markt)
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763800 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/webresources/Cache.java java/org/apache/catalina/webresources/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Oct  7 16:35:24 2016
New Revision: 1763800

URL: http://svn.apache.org/viewvc?rev=1763800&view=rev
Log:
Include Context name when cache addition fails.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/Cache.java

tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  7 16:35:24 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
 
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-17

svn commit: r1763801 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/webresources/Cache.java java/org/apache/catalina/webresources/LocalStrings.properties webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Oct  7 16:36:23 2016
New Revision: 1763801

URL: http://svn.apache.org/viewvc?rev=1763801&view=rev
Log:
Include Context name when cache addition fails.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/Cache.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  7 16:36:23 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,16896

Re: [VOTE] Release Apache Tomcat 8.5.6

[Mark Thomas]

On 07/10/2016 15:51, Mark Thomas wrote:
> On 07/10/2016 14:50, Martin Grigorov wrote:
>> On Thu, Oct 6, 2016 at 10:33 PM, Mark Thomas  wrote:
>>
>>> The proposed Apache Tomcat 8.5.6 release is now available for voting.
>>>
>>> The major changes compared to the 8.5.5 release are:
>>>
>>> - Refactoring the non-container thread Async complete()/dispatch()
>>>   handling to remove the possibility of deadlock
>>>
>>> - 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
>>>
>>> - Improved UTF-8 handling for the RewriteValve
>>>
>>>
>>> It can be obtained from:
>>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.6/
>>> The Maven staging repo is:
>>> https://repository.apache.org/content/repositories/orgapachetomcat-1097/
>>> The svn tag is:
>>> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
>>>
>>> The proposed 8.5.6 release is:
>>> [ ] Broken - do not release
>>> [ ] Alpha  - go ahead and release as 8.5.6
>>> [ ] Beta   - go ahead and release as 8.5.6
>>> [ X ] Stable - go ahead and release as 8.5.6
>>>
>>
>> The only thing that bothers me a bit is that I have a lot of those during
>> start:
>>
>> 07-Oct-2016 15:27:58.342 WARNING [RMI TCP Connection(4)-127.0.0.1]
>> org.apache.catalina.webresources.Cache.getResource Unable to add the
>> resource at [/WEB-INF/lib/lucene-memory-5.5.2.jar] to the cache because
>> there was insufficient free space available after evicting expired cache
>> entries - consider increasing the maximum size of the cache
> 
> I suspect that this is the cause:
> 
> https://bz.apache.org/bugzilla/show_bug.cgi?id=60146
> 
> We might need to tweak the caching algorithm and/or config.

I haven't been able to reproduce this with a simple test. Can you do
some debugging and see what code path is triggering the loading of the
JAR files this way.

>> I believe there is an entry for each library of my applications and for
>> (all ?!) .properties and .xml files in the classpath.
>>
>> If this is normal then the message could be improved to say which cache I
>> need to touch.
> 
> The message could be improved regardless.

Done.

Mark


> 
> Mark
> 
> 
>>
>> The only thing I've changed in the default configuration was to enable the
>> HTTP2 connector:
>>
>> 07-Oct-2016 15:13:07.634 INFO [main]
>> org.apache.catalina.core.AprLifecycleListener.lifecycleEvent Loaded APR
>> based Apache Tomcat Native library 1.2.10 using APR version 1.5.2.
>> 07-Oct-2016 15:13:07.634 INFO [main]
>> org.apache.catalina.core.AprLifecycleListener.lifecycleEvent APR
>> capabilities: IPv6 [true], sendfile [true], accept filters [false], random
>> [true].
>> 07-Oct-2016 15:13:07.634 INFO [main]
>> org.apache.catalina.core.AprLifecycleListener.lifecycleEvent APR/OpenSSL
>> configuration: useAprConnector [false], useOpenSSL [true]
>> 07-Oct-2016 15:13:07.637 INFO [main]
>> org.apache.catalina.core.AprLifecycleListener.initializeSSL OpenSSL
>> successfully initialized (OpenSSL 1.0.2e 3 Dec 2015)
>> 07-Oct-2016 15:13:07.756 INFO [main]
>> org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
>> ["http-nio-8080"]
>> 07-Oct-2016 15:13:07.769 INFO [main]
>> org.apache.tomcat.util.net.NioSelectorPool.getSharedSelector Using a shared
>> selector for servlet write/read
>> 07-Oct-2016 15:13:07.773 INFO [main]
>> org.apache.coyote.http11.AbstractHttp11Protocol.configureUpgradeProtocol
>> The ["https-openssl-apr-8443"] connector has been configured to support
>> negotiation to [h2] via ALPN
>> 07-Oct-2016 15:13:07.773 INFO [main]
>> org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
>> ["https-openssl-apr-8443"]
>>
>> >maxThreads="150" SSLEnabled="true" >
>> > />
>> 
>> >  certificateFile="conf/cert.pem"
>>  certificateKeyPassword="tomcat"
>>  type="RSA" />
>> 
>> 
>>
>>
>>
>>
>>>
>>> -
>>> 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
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 8.5.6

[Felix Schumacher]

Am 06.10.2016 um 22:33 schrieb Mark Thomas:

The proposed Apache Tomcat 8.5.6 release is now available for voting.

The major changes compared to the 8.5.5 release are:

- Refactoring the non-container thread Async complete()/dispatch()
   handling to remove the possibility of deadlock

- 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

- Improved UTF-8 handling for the RewriteValve


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.6/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1097/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_6/

The proposed 8.5.6 release is:
[ ] Broken - do not release
[ ] Alpha  - go ahead and release as 8.5.6
[ ] Beta   - go ahead and release as 8.5.6
[x] Stable - go ahead and release as 8.5.6

Regards,
 Felix


-
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

Re: [VOTE] Release Apache Tomcat 8.0.38

[Felix Schumacher]

Am 06.10.2016 um 23:18 schrieb Mark Thomas:

The proposed Apache Tomcat 8.0.38 release is now available for voting.

The main changes since 8.0.37 are:

- Refactoring the non-container thread Async complete()/dispatch()
   handling to remove the possibility of deadlock

- 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

- Improved UTF-8 handling for the RewriteValve


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.38/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1098/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_38/

The proposed 8.0.38 release is:
[ ] Broken - do not release
[x] Stable - go ahead and release as 8.0.38

Regards,
 Felix


-
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

Re: [VOTE] Release Apache Tomcat 9.0.0.M11

[Felix Schumacher]

Am 06.10.2016 um 21:51 schrieb Mark Thomas:

The proposed Apache Tomcat 9.0.0.M11 release is now available for voting.

This is a milestone release for the 9.0.x branch. It should be
noted that, as a milestone release:
- Servlet 4.0 is not finalised
- The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0

The major changes compared to the 9.0.0.M10 release are:

- Refactoring the non-container thread Async complete()/dispatch()
   handling to remove the possibility of deadlock

- 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

- Improved UTF-8 handling for the RewriteValve

Along with lots of other bug fixes and improvements

For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M11/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1096/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M11/

The proposed 9.0.0.M11 release is:
[ ] Broken - do not release
[x] Alpha - go ahead and release as 9.0.0.M11

Regards,
 Felix


-
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

svn commit: r1763810 - in /tomcat/trunk: ./ res/ide-support/eclipse/ res/ide-support/netbeans/ res/maven/ webapps/docs/

[markt]

Author: markt
Date: Fri Oct  7 19:02:00 2016
New Revision: 1763810

URL: http://svn.apache.org/viewvc?rev=1763810&view=rev
Log:
Update to ECJ 4.6.1

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
tomcat/trunk/res/ide-support/netbeans/project.xml
tomcat/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/trunk/res/maven/tomcat-jasper.pom
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1763810&r1=1763809&r2=1763810&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Fri Oct  7 19:02:00 2016
@@ -109,8 +109,8 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j
 
 # - Eclipse JDT, version 4.5.1 or later -#
 # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
-jdt.version=4.5.1
-jdt.release=R-4.5.1-201509040015
+jdt.version=4.6.1
+jdt.release=R-4.6.1-201609071200
 jdt.home=${base.path}/ecj-${jdt.version}
 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
 # The download will be moved to the archive area eventually. We are taking 
care of that in advance.

Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1763810&r1=1763809&r2=1763810&view=diff
==
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Fri Oct  7 19:02:00 
2016
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 

Modified: tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties?rev=1763810&r1=1763809&r2=1763810&view=diff
==
--- tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties (original)
+++ tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties Fri Oct  7 
19:02:00 2016
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.5.1/ecj-4.5.1.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.1/ecj-4.6.1.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 

Modified: tomcat/trunk/res/ide-support/netbeans/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/netbeans/project.xml?rev=1763810&r1=1763809&r2=1763810&view=diff
==
--- tomcat/trunk/res/ide-support/netbeans/project.xml (original)
+++ tomcat/trunk/res/ide-support/netbeans/project.xml Fri Oct  7 19:02:00 2016
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.5.1/ecj-4.5.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.6.1/ecj-4.6.1.jar:${ant.includes}/
 1.7
 
 

Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1763810&r1=1763809&r2=1763810&view=diff
==
--- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Fri Oct  7 19:02:00 2016
@@ -45,7 +45,7 @@
 
   org.eclipse.jdt.core.compiler
   ecj
-  4.5.1
+  4.6.1
 
   
 

Modified: tomcat/trunk/res/maven/tomcat-jasper.pom
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1763810&r1=1763809&r2=1763810&view=diff
==
--- tomcat/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper.pom Fri Oct  7 19:02:00 2016
@@ -57,7 +57,7 @@
 
   org.eclipse.jdt.core.compiler
 

svn commit: r1763811 - in /tomcat/tc8.0.x/trunk/res: ide-support/eclipse/eclipse.classpath ide-support/netbeans/nb-tomcat-build.properties ide-support/netbeans/project.xml maven/tomcat-embed-jasper.po

[markt]

Author: markt
Date: Fri Oct  7 19:05:36 2016
New Revision: 1763811

URL: http://svn.apache.org/viewvc?rev=1763811&view=rev
Log:
Additional ECJ 4.5 -> 4.5.1 updates

Modified:
tomcat/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml
tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom

Modified: tomcat/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1763811&r1=1763810&r2=1763811&view=diff
==
--- tomcat/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath Fri Oct  7 
19:05:36 2016
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 

Modified: 
tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties?rev=1763811&r1=1763810&r2=1763811&view=diff
==
--- tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties 
(original)
+++ tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties 
Fri Oct  7 19:05:36 2016
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.5/ecj-4.5.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.5.1/ecj-4.5.1.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 

Modified: tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml?rev=1763811&r1=1763810&r2=1763811&view=diff
==
--- tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml (original)
+++ tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml Fri Oct  7 
19:05:36 2016
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.5/ecj-4.5.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.5.1/ecj-4.5.1.jar:${ant.includes}/
 1.7
 
 

Modified: tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom?rev=1763811&r1=1763810&r2=1763811&view=diff
==
--- tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom Fri Oct  7 19:05:36 
2016
@@ -45,7 +45,7 @@
 
   org.eclipse.jdt.core.compiler
   ecj
-  4.5
+  4.5.1
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763813 - in /tomcat/trunk/java/org/apache: catalina/connector/InputBuffer.java tomcat/util/buf/B2CConverter.java

[violetagg]

Author: violetagg
Date: Fri Oct  7 19:13:30 2016
New Revision: 1763813

URL: http://svn.apache.org/viewvc?rev=1763813&view=rev
Log:
o.a.catalina.connector.InputBuffer is now using ByteBuffer/CharBuffer instead 
of ByteChunk/CharChunk.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1763813&r1=1763812&r2=1763813&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Fri Oct  7 
19:13:30 2016
@@ -18,7 +18,9 @@ package org.apache.catalina.connector;
 
 import java.io.IOException;
 import java.io.Reader;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
@@ -75,14 +77,13 @@ public class InputBuffer extends Reader
 /**
  * The byte buffer.
  */
-private final ByteChunk bb;
-private ByteBuffer tempRead;
+private ByteBuffer bb;
 
 
 /**
- * The chunk buffer.
+ * The char buffer.
  */
-private CharChunk cb;
+private CharBuffer cb;
 
 
 /**
@@ -122,6 +123,12 @@ public class InputBuffer extends Reader
 
 
 /**
+ * Char buffer limit.
+ */
+private int readLimit;
+
+
+/**
  * Buffer size.
  */
 private final int size;
@@ -148,16 +155,11 @@ public class InputBuffer extends Reader
 public InputBuffer(int size) {
 
 this.size = size;
-tempRead = ByteBuffer.allocate(size);
-tempRead.flip();
-bb = new ByteChunk(size);
-bb.setLimit(size);
-bb.setByteInputChannel(this);
-cb = new CharChunk(size);
-cb.setLimit(size);
-cb.setOptimizedWrite(false);
-cb.setCharInputChannel(this);
-cb.setCharOutputChannel(this);
+bb = ByteBuffer.allocate(size);
+clear(bb);
+cb = CharBuffer.allocate(size);
+clear(cb);
+readLimit = size;
 
 }
 
@@ -185,17 +187,15 @@ public class InputBuffer extends Reader
 state = INITIAL_STATE;
 
 // If usage of mark made the buffer too big, reallocate it
-if (cb.getChars().length > size) {
-cb = new CharChunk(size);
-cb.setLimit(size);
-cb.setOptimizedWrite(false);
-cb.setCharInputChannel(this);
-cb.setCharOutputChannel(this);
+if (cb.capacity() > size) {
+cb = CharBuffer.allocate(size);
+clear(cb);
 } else {
-cb.recycle();
+clear(cb);
 }
+readLimit = size;
 markPos = -1;
-bb.recycle();
+clear(bb);
 closed = false;
 
 if (conv != null) {
@@ -222,9 +222,9 @@ public class InputBuffer extends Reader
 public int available() {
 int available = 0;
 if (state == BYTE_STATE) {
-available = bb.getLength();
+available = bb.remaining();
 } else if (state == CHAR_STATE) {
-available = cb.getLength();
+available = cb.remaining();
 }
 if (available == 0) {
 coyoteRequest.action(ActionCode.AVAILABLE,
@@ -259,9 +259,9 @@ public class InputBuffer extends Reader
 public boolean isFinished() {
 int available = 0;
 if (state == BYTE_STATE) {
-available = bb.getLength();
+available = bb.remaining();
 } else if (state == CHAR_STATE) {
-available = cb.getLength();
+available = cb.remaining();
 }
 if (available > 0) {
 return false;
@@ -319,9 +319,7 @@ public class InputBuffer extends Reader
 }
 
 int result = coyoteRequest.doRead(this);
-bb.setBytes(tempRead.array(), tempRead.arrayOffset() + 
tempRead.position(),
-tempRead.remaining());
-tempRead.position(0).limit(0);
+
 return result;
 }
 
@@ -331,7 +329,10 @@ public class InputBuffer extends Reader
 throw new IOException(sm.getString("inputBuffer.streamClosed"));
 }
 
-return bb.substract();
+if (checkByteBufferEof()) {
+return -1;
+}
+return bb.get() & 0xFF;
 }
 
 
@@ -340,7 +341,12 @@ public class InputBuffer extends Reader
 throw new IOException(sm.getString("inputBuffer.streamClosed"));
 }
 
-return bb.substract(b, off, len);
+if (checkByteBufferEof()) {
+return -1;
+}
+int n = Math.min(len, bb.remaining());
+bb.get(b, off, n);
+return n;
 }
 
 
@

svn commit: r1763815 - /tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

[violetagg]

Author: violetagg
Date: Fri Oct  7 19:16:17 2016
New Revision: 1763815

URL: http://svn.apache.org/viewvc?rev=1763815&view=rev
Log:
Remove unnecessary declaration. o.a.catalina.connector.InputBuffer does not use 
ByteChunk/CharChunk anymore.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1763815&r1=1763814&r2=1763815&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Fri Oct  7 
19:16:17 2016
@@ -36,7 +36,6 @@ import org.apache.coyote.ContainerThread
 import org.apache.coyote.Request;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.collections.SynchronizedStack;
 import org.apache.tomcat.util.net.ApplicationBufferHandler;
 import org.apache.tomcat.util.res.StringManager;
@@ -50,8 +49,7 @@ import org.apache.tomcat.util.res.String
  * @author Remy Maucherat
  */
 public class InputBuffer extends Reader
-implements ByteChunk.ByteInputChannel, CharChunk.CharInputChannel,
-   CharChunk.CharOutputChannel, ApplicationBufferHandler {
+implements ByteChunk.ByteInputChannel, ApplicationBufferHandler {
 
 /**
  * The string manager for this package.
@@ -388,7 +386,6 @@ public class InputBuffer extends Reader
  * been read before, they are ignored. If a mark was set, then the
  * mark is lost.
  */
-@Override
 public void realWriteChars(char c[], int off, int len) throws IOException {
 markPos = -1;
 clear(cb);
@@ -400,7 +397,6 @@ public class InputBuffer extends Reader
 }
 
 
-@Override
 public int realReadChars() throws IOException {
 checkConverter();
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1781

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1763815
Blamelist: violetagg

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763817 - in /tomcat/trunk/java/org/apache/coyote/http2: AbstractStream.java Http2UpgradeHandler.java Stream.java

[markt]

Author: markt
Date: Fri Oct  7 19:46:33 2016
New Revision: 1763817

URL: http://svn.apache.org/viewvc?rev=1763817&view=rev
Log:
Remove unused code

Modified:
tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java?rev=1763817&r1=1763816&r2=1763817&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java Fri Oct  7 
19:46:33 2016
@@ -149,6 +149,4 @@ abstract class AbstractStream {
 protected abstract String getConnectionId();
 
 protected abstract int getWeight();
-
-protected abstract void doNotifyAll();
 }

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1763817&r1=1763816&r2=1763817&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Oct  
7 19:46:33 2016
@@ -821,13 +821,6 @@ public class Http2UpgradeHandler extends
 }
 
 
-
-@Override
-protected synchronized void doNotifyAll() {
-this.notifyAll();
-}
-
-
 private int allocate(AbstractStream stream, int allocation) {
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("upgradeHandler.allocate.debug", 
getConnectionId(),

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1763817&r1=1763816&r2=1763817&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Oct  7 19:46:33 
2016
@@ -188,20 +188,6 @@ public class Stream extends AbstractStre
 
 
 @Override
-protected synchronized void doNotifyAll() {
-if (coyoteResponse.getWriteListener() == null) {
-// Blocking IO so thread will be waiting. Release it.
-// Use notifyAll() to be safe (should be unnecessary)
-this.notifyAll();
-} else {
-if (outputBuffer.isRegisteredForWrite()) {
-coyoteResponse.action(ActionCode.DISPATCH_WRITE, null);
-}
-}
-}
-
-
-@Override
 public void emitHeader(String name, String value, boolean neverIndex) {
 if (log.isDebugEnabled()) {
 log.debug(sm.getString("stream.header.debug", getConnectionId(), 
getIdentifier(),



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763819 - /tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

[violetagg]

Author: violetagg
Date: Fri Oct  7 19:51:42 2016
New Revision: 1763819

URL: http://svn.apache.org/viewvc?rev=1763819&view=rev
Log:
Fix javadoc

Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1763819&r1=1763818&r2=1763819&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Fri Oct  7 
19:51:42 2016
@@ -385,6 +385,11 @@ public class InputBuffer extends Reader
  * be removed from the buffer for "writing". Since the chars have already
  * been read before, they are ignored. If a mark was set, then the
  * mark is lost.
+ *
+ * @param c characters that will be written
+ * @param off offset in the characters array
+ * @param len length that will be written
+ * @throws IOException If an I/O occurs while writing the characters
  */
 public void realWriteChars(char c[], int off, int len) throws IOException {
 markPos = -1;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763823 - in /tomcat/trunk: java/org/apache/coyote/http2/ByteUtil.java test/org/apache/coyote/http2/Http2TestBase.java test/org/apache/coyote/http2/TestHttp2Section_6_9.java

[markt]

Author: markt
Date: Fri Oct  7 20:03:39 2016
New Revision: 1763823

URL: http://svn.apache.org/viewvc?rev=1763823&view=rev
Log:
Reduce visibility as recommended by UCdetector
Move utility method only used by tests to test code

Modified:
tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java
tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_6_9.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java?rev=1763823&r1=1763822&r2=1763823&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ByteUtil.java Fri Oct  7 20:03:39 
2016
@@ -19,25 +19,25 @@ package org.apache.coyote.http2;
 /**
  * Utility class for extracting values from byte arrays.
  */
-public class ByteUtil {
+class ByteUtil {
 
 private ByteUtil() {
 // Hide default constructor
 }
 
 
-public static boolean isBit7Set(byte input) {
+static boolean isBit7Set(byte input) {
 return (input & 0x80) > 0;
 }
 
 
-public static int get31Bits(byte[] input, int firstByte) {
+static int get31Bits(byte[] input, int firstByte) {
 return ((input[firstByte] & 0x7F) << 24) + ((input[firstByte + 1] & 
0xFF) << 16) +
 ((input[firstByte + 2] & 0xFF) << 8) + (input[firstByte + 3] & 
0xFF);
 }
 
 
-public static void set31Bits(byte[] output, int firstByte, int value) {
+static void set31Bits(byte[] output, int firstByte, int value) {
 output[firstByte] = (byte) ((value & 0x7F00) >> 24);
 output[firstByte + 1] = (byte) ((value & 0xFF) >> 16);
 output[firstByte + 2] = (byte) ((value & 0xFF00) >> 8);
@@ -45,47 +45,42 @@ public class ByteUtil {
 }
 
 
-public static int getOneByte(byte[] input, int pos) {
+static int getOneByte(byte[] input, int pos) {
 return (input[pos] & 0xFF);
 }
 
 
-public static int getTwoBytes(byte[] input, int firstByte) {
+static int getTwoBytes(byte[] input, int firstByte) {
 return ((input[firstByte] & 0xFF) << 8) +  (input[firstByte + 1] & 
0xFF);
 }
 
 
-public static int getThreeBytes(byte[] input, int firstByte) {
+static int getThreeBytes(byte[] input, int firstByte) {
 return ((input[firstByte] & 0xFF) << 16) + ((input[firstByte + 1] & 
0xFF) << 8) +
 (input[firstByte + 2] & 0xFF);
 }
 
 
-public static void setOneBytes(byte[] output, int firstByte, int value) {
-output[firstByte] = (byte) (value & 0xFF);
-}
-
-
-public static void setTwoBytes(byte[] output, int firstByte, int value) {
+static void setTwoBytes(byte[] output, int firstByte, int value) {
 output[firstByte] = (byte) ((value & 0xFF00) >> 8);
 output[firstByte + 1] = (byte) (value & 0xFF);
 }
 
 
-public static void setThreeBytes(byte[] output, int firstByte, int value) {
+static void setThreeBytes(byte[] output, int firstByte, int value) {
 output[firstByte] = (byte) ((value & 0xFF) >> 16);
 output[firstByte + 1] = (byte) ((value & 0xFF00) >> 8);
 output[firstByte + 2] = (byte) (value & 0xFF);
 }
 
 
-public static long getFourBytes(byte[] input, int firstByte) {
+static long getFourBytes(byte[] input, int firstByte) {
 return ((long)(input[firstByte] & 0xFF) << 24) + ((input[firstByte + 
1] & 0xFF) << 16) +
 ((input[firstByte + 2] & 0xFF) << 8) + (input[firstByte + 3] & 
0xFF);
 }
 
 
-public static void setFourBytes(byte[] output, int firstByte, long value) {
+static void setFourBytes(byte[] output, int firstByte, long value) {
 output[firstByte] = (byte) ((value & 0xFF00) >> 24);
 output[firstByte + 1] = (byte) ((value & 0xFF) >> 16);
 output[firstByte + 2] = (byte) ((value & 0xFF00) >> 8);

Modified: tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1763823&r1=1763822&r2=1763823&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Fri Oct  7 
20:03:39 2016
@@ -582,7 +582,7 @@ public abstract class Http2TestBase exte
 pingHeader[3] = FrameType.PING.getIdByte();
 // Flags
 if (ack) {
-ByteUtil.setOneBytes(pingHeader, 4, 0x01);
+setOneBytes(pingHeader, 4, 0x01);
 }
 // Stream
 ByteUtil.set31Bits(pingHeader, 5, streamId);
@@ -659,7 +659,7 @@ public abstract class Http2TestBase exte
 
 // Payload
 ByteUtil.set31Bits(priori

buildbot success in on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1783

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1763819
Blamelist: violetagg

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763825 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java

[markt]

Author: markt
Date: Fri Oct  7 20:05:11 2016
New Revision: 1763825

URL: http://svn.apache.org/viewvc?rev=1763825&view=rev
Log:
Remove unused code identified by UCdetector

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1763825&r1=1763824&r2=1763825&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Oct  7 20:05:11 
2016
@@ -311,21 +311,6 @@ public class Stream extends AbstractStre
 }
 
 
-/**
- * Marks the stream as reset. This method will not change the stream state
- * if:
- * 
- * The stream is already reset
- * The stream is already closed
- *
- * @throws IllegalStateException If the stream is in a state that does not
- * permit resets
- */
-void sendReset() {
-state.sendReset();
-}
-
-
 void sentPushPromise() {
 state.sentPushPromise();
 }
@@ -441,7 +426,6 @@ public class Stream extends AbstractStre
 private volatile long written = 0;
 private volatile boolean closed = false;
 private volatile boolean endOfStreamSent = false;
-private volatile boolean writeInterest = false;
 
 /* The write methods are synchronized to ensure that only one thread at
  * a time is able to access the buffer. Without this protection, a
@@ -524,16 +508,6 @@ public class Stream extends AbstractStre
 if (getWindowSize() > 0 && handler.getWindowSize() > 0) {
 return true;
 } else {
-writeInterest = true;
-return false;
-}
-}
-
-synchronized boolean isRegisteredForWrite() {
-if (writeInterest) {
-writeInterest = false;
-return true;
-} else {
 return false;
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test-apr has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 29 mins 7 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.5-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20161007.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20161007/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161007-native-src.tar.gz
 -Dtest.reports=output/logs-APR -Dtomc
 
at-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161007-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20161007/lib 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/bui

svn commit: r1763831 - /tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

[violetagg]

Author: violetagg
Date: Fri Oct  7 20:28:49 2016
New Revision: 1763831

URL: http://svn.apache.org/viewvc?rev=1763831&view=rev
Log:
Remove unused code. Reduce visibility.

Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1763831&r1=1763830&r2=1763831&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Fri Oct  7 
20:28:49 2016
@@ -380,23 +380,6 @@ public class InputBuffer extends Reader
 // - Chars Handling Methods
 
 
-/**
- * Since the converter will use append, it is possible to get chars to
- * be removed from the buffer for "writing". Since the chars have already
- * been read before, they are ignored. If a mark was set, then the
- * mark is lost.
- *
- * @param c characters that will be written
- * @param off offset in the characters array
- * @param len length that will be written
- * @throws IOException If an I/O occurs while writing the characters
- */
-public void realWriteChars(char c[], int off, int len) throws IOException {
-markPos = -1;
-clear(cb);
-}
-
-
 public void setEncoding(String s) {
 enc = s;
 }
@@ -639,7 +622,7 @@ public class InputBuffer extends Reader
 }
 
 
-public boolean checkByteBufferEof() throws IOException {
+private boolean checkByteBufferEof() throws IOException {
 if (bb.remaining() == 0) {
 int n = realReadBytes();
 if (n < 0) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1763833 - in /tomcat/trunk/java/org/apache/coyote/http2: AbstractStream.java ConnectionException.java HpackException.java Http2Exception.java Stream.java StreamException.java

[markt]

Author: markt
Date: Fri Oct  7 20:32:49 2016
New Revision: 1763833

URL: http://svn.apache.org/viewvc?rev=1763833&view=rev
Log:
UCdetector
- reduce visibility
- add final
- remove unused code

Modified:
tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java
tomcat/trunk/java/org/apache/coyote/http2/HpackException.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Exception.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/coyote/http2/StreamException.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java?rev=1763833&r1=1763832&r2=1763833&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/AbstractStream.java Fri Oct  7 
20:32:49 2016
@@ -37,17 +37,17 @@ abstract class AbstractStream {
 private final Set childStreams = new HashSet<>();
 private long windowSize = 
ConnectionSettingsBase.DEFAULT_INITIAL_WINDOW_SIZE;
 
-public Integer getIdentifier() {
+final Integer getIdentifier() {
 return identifier;
 }
 
 
-public AbstractStream(Integer identifier) {
+AbstractStream(Integer identifier) {
 this.identifier = identifier;
 }
 
 
-void detachFromParent() {
+final void detachFromParent() {
 if (parentStream != null) {
 parentStream.getChildStreams().remove(this);
 parentStream = null;
@@ -55,18 +55,13 @@ abstract class AbstractStream {
 }
 
 
-void addChild(AbstractStream child) {
-child.setParent(this);
+final void addChild(AbstractStream child) {
+child.setParentStream(this);
 childStreams.add(child);
 }
 
 
-private void setParent(AbstractStream parent) {
-this.parentStream = parent;
-}
-
-
-boolean isDescendant(AbstractStream stream) {
+final boolean isDescendant(AbstractStream stream) {
 if (childStreams.contains(stream)) {
 return true;
 }
@@ -79,38 +74,38 @@ abstract class AbstractStream {
 }
 
 
-AbstractStream getParentStream() {
+final AbstractStream getParentStream() {
 return parentStream;
 }
 
 
-void setParentStream(AbstractStream parentStream) {
+final void setParentStream(AbstractStream parentStream) {
 this.parentStream = parentStream;
 }
 
 
-Set getChildStreams() {
+final Set getChildStreams() {
 return childStreams;
 }
 
 
-protected synchronized void setWindowSize(long windowSize) {
+final synchronized void setWindowSize(long windowSize) {
 this.windowSize = windowSize;
 }
 
 
-protected synchronized long getWindowSize() {
+final synchronized long getWindowSize() {
 return windowSize;
 }
 
 
 /**
  * Increment window size.
- * @param increment The amount of the incrementation
+ * @param increment The amount by which the window size should be increased
  * @throws Http2Exception If the window size is now higher than
  *  the maximum allowed
  */
-protected synchronized void incrementWindowSize(int increment) throws 
Http2Exception {
+synchronized void incrementWindowSize(int increment) throws Http2Exception 
{
 // No need for overflow protection here.
 // Increment can't be more than Integer.MAX_VALUE and once windowSize
 // goes beyond 2^31-1 an error is triggered.
@@ -134,7 +129,7 @@ abstract class AbstractStream {
 }
 
 
-protected synchronized void decrementWindowSize(int decrement) {
+final synchronized void decrementWindowSize(int decrement) {
 // No need for overflow protection here. Decrement can never be larger
 // the Integer.MAX_VALUE and once windowSize goes negative no further
 // decrements are permitted
@@ -146,7 +141,7 @@ abstract class AbstractStream {
 }
 
 
-protected abstract String getConnectionId();
+abstract String getConnectionId();
 
-protected abstract int getWeight();
+abstract int getWeight();
 }

Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java?rev=1763833&r1=1763832&r2=1763833&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionException.java Fri Oct  
7 20:32:49 2016
@@ -19,11 +19,11 @@ package org.apache.coyote.http2;
 /**
  * Thrown when an HTTP/2 connection error occurs.
  */
-public class ConnectionException extends Http2Exception {
+class ConnectionExcept

Re: [VOTE] Release Apache Tomcat 8.5.6

[Martin Grigorov]

Hi Mark,

On Fri, Oct 7, 2016 at 6:39 PM, Mark Thomas  wrote:

> On 07/10/2016 15:51, Mark Thomas wrote:
> > On 07/10/2016 14:50, Martin Grigorov wrote:
> >> On Thu, Oct 6, 2016 at 10:33 PM, Mark Thomas  wrote:
> >>
> >>> The proposed Apache Tomcat 8.5.6 release is now available for voting.
> >>>
> >>> The major changes compared to the 8.5.5 release are:
> >>>
> >>> - Refactoring the non-container thread Async complete()/dispatch()
> >>>   handling to remove the possibility of deadlock
> >>>
> >>> - 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
> >>>
> >>> - Improved UTF-8 handling for the RewriteValve
> >>>
> >>>
> >>> It can be obtained from:
> >>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.6/
> >>> The Maven staging repo is:
> >>> https://repository.apache.org/content/repositories/
> orgapachetomcat-1097/
> >>> The svn tag is:
> >>> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
> >>>
> >>> The proposed 8.5.6 release is:
> >>> [ ] Broken - do not release
> >>> [ ] Alpha  - go ahead and release as 8.5.6
> >>> [ ] Beta   - go ahead and release as 8.5.6
> >>> [ X ] Stable - go ahead and release as 8.5.6
> >>>
> >>
> >> The only thing that bothers me a bit is that I have a lot of those
> during
> >> start:
> >>
> >> 07-Oct-2016 15:27:58.342 WARNING [RMI TCP Connection(4)-127.0.0.1]
> >> org.apache.catalina.webresources.Cache.getResource Unable to add the
> >> resource at [/WEB-INF/lib/lucene-memory-5.5.2.jar] to the cache because
> >> there was insufficient free space available after evicting expired cache
> >> entries - consider increasing the maximum size of the cache
> >
> > I suspect that this is the cause:
> >
> > https://bz.apache.org/bugzilla/show_bug.cgi?id=60146
> >
> > We might need to tweak the caching algorithm and/or config.
>
> I haven't been able to reproduce this with a simple test. Can you do
> some debugging and see what code path is triggering the loading of the
> JAR files this way.
>

Here is the stacktrace: http://imgur.com/a/ioRY4
I use the sources of the voted 8.5.6, not the latest 8.5.x.


>
> >> I believe there is an entry for each library of my applications and for
> >> (all ?!) .properties and .xml files in the classpath.
> >>
> >> If this is normal then the message could be improved to say which cache
> I
> >> need to touch.
> >
> > The message could be improved regardless.
>
> Done.
>

It is still not clear to me.
Where I can change the maxSize of this cache ?
https://tomcat.apache.org/tomcat-8.5-doc/index.html doesn't mention
"cache". It is not searchable in the content of the linked pages. Also
Google doesn't give me good results - it finds the javadoc of this class
but this doesn't tell me as a user what should I do.
Is it a good idea to add more details in the log message like "...increase
the max size at $CATALINA_BASE/conf/some.xml > Host > Cache" ?


>
> Mark
>
>
> >
> > Mark
> >
> >
> >>
> >> The only thing I've changed in the default configuration was to enable
> the
> >> HTTP2 connector:
> >>
> >> 07-Oct-2016 15:13:07.634 INFO [main]
> >> org.apache.catalina.core.AprLifecycleListener.lifecycleEvent Loaded APR
> >> based Apache Tomcat Native library 1.2.10 using APR version 1.5.2.
> >> 07-Oct-2016 15:13:07.634 INFO [main]
> >> org.apache.catalina.core.AprLifecycleListener.lifecycleEvent APR
> >> capabilities: IPv6 [true], sendfile [true], accept filters [false],
> random
> >> [true].
> >> 07-Oct-2016 15:13:07.634 INFO [main]
> >> org.apache.catalina.core.AprLifecycleListener.lifecycleEvent
> APR/OpenSSL
> >> configuration: useAprConnector [false], useOpenSSL [true]
> >> 07-Oct-2016 15:13:07.637 INFO [main]
> >> org.apache.catalina.core.AprLifecycleListener.initializeSSL OpenSSL
> >> successfully initialized (OpenSSL 1.0.2e 3 Dec 2015)
> >> 07-Oct-2016 15:13:07.756 INFO [main]
> >> org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
> >> ["http-nio-8080"]
> >> 07-Oct-2016 15:13:07.769 INFO [main]
> >> org.apache.tomcat.util.net.NioSelectorPool.getSharedSelector Using a
> shared
> >> selector for servlet write/read
> >> 07-Oct-2016 15:13:07.773 INFO [main]
> >> org.apache.coyote.http11.AbstractHttp11Protocol.
> configureUpgradeProtocol
> >> The ["https-openssl-apr-8443"] connector has been configured to support
> >> negotiation to [h2] via ALPN
> >> 07-Oct-2016 15:13:07.773 INFO [main]
> >> org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
> >> ["https-openssl-apr-8443"]
> >>
> >>  >>maxThreads="150" SSLEnabled="true" >
> >>  >> />
> >> 
> >>  >>  certificateFile="conf/cert.pem"
> >>  certificateKeyPassword="tomcat"
> >>  type="RSA" />
> >> 
> >> 
> >>
> >>
> >>
> >>
> >>>
> >>> -
> >>> To unsubscribe, e-mai

Re: [VOTE] Release Apache Tomcat Native 1.2.10

[Huxing Zhang]

Hi, 

Although it is a bit late, the tc native 1.2.10 example fails with openssl 
1.0.2j, following is the output:

Buildfile: /home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/build.xml

clean:
   [delete] Deleting directory 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist

env:
 [echo] java.home = /opt/taobao/jdk1.8.0_65/jre
 [echo] user.home = /home/admin
 [echo] tc.library.path = 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/native/.libs
 [echo]

prepare:
[mkdir] Created dir: 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist

compile:
[mkdir] Created dir: 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/classes
[mkdir] Created dir: 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/classes/java
[mkdir] Created dir: 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/src
[mkdir] Created dir: 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/src/java
 [copy] Copying 37 files to 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/src/java
[javac] /home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/build.xml:220: 
warning: 'includeantruntime' was not set, defaulting to 
build.sysclasspath=last; set to false for repeatable builds
[javac] Compiling 36 source files to 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/classes/java
 [copy] Copying 1 file to 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/classes/java

jar:
  [jar] Building jar: 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/tomcat-native-1.2.10.jar

env:
 [echo] java.home = /opt/taobao/jdk1.8.0_65/jre
 [echo] user.home = /home/admin
 [echo] tc.library.path = 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/native/.libs
 [echo]

prepare:

compile:
[javac] /home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/build.xml:220: 
warning: 'includeantruntime' was not set, defaulting to 
build.sysclasspath=last; set to false for repeatable builds

compile-examples:
[mkdir] Created dir: 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/classes/examples
[mkdir] Created dir: 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/src/examples
 [copy] Copying 6 files to 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/src/examples
[javac] /home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/build.xml:346: 
warning: 'includeantruntime' was not set, defaulting to 
build.sysclasspath=last; set to false for repeatable builds
[javac] Compiling 3 source files to 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/classes/examples
 [copy] Copying 3 files to 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/dist/classes/examples

run-echo:
 [echo] Running Tomcat Native Echo example ...
 [java] Exception in thread "main" java.lang.UnsatisfiedLinkError: 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/native/.libs/libtcnative-1.so.0.2.10:
 
/home/admin/tomcat/tcnative/tomcat-native-1.2.10-src/native/.libs/libtcnative-1.so.0.2.10:
 undefined symbol: get_rfc3526_prime_8192
 [java] at java.lang.ClassLoader$NativeLibrary.load(Native Method)
 [java] at java.lang.ClassLoader.loadLibrary0(ClassLoader.java:1938)
 [java] at java.lang.ClassLoader.loadLibrary(ClassLoader.java:1854)
 [java] at java.lang.Runtime.loadLibrary0(Runtime.java:870)
 [java] at java.lang.System.loadLibrary(System.java:1122)
 [java] at org.apache.tomcat.jni.Library.(Unknown Source)
 [java] at org.apache.tomcat.jni.Library.initialize(Unknown Source)
 [java] at org.apache.tomcat.jni.Echo.main(Unknown Source)
 [java] Java Result: 1

BUILD SUCCESSFUL
Total time: 3 seconds

On the other hand, tc-native + openssl 1.1.0 works fine.

Any ideas?

--
From:Mark Thomas 
Time:2016 Sep 27 (Tue) 00:18
To:dev@tomcat.apache.org 
Subject:[VOTE] Release Apache Tomcat Native 1.2.10


Version 1.2.10 includes the following change:

- Update minimum recommended OpenSSL version to 1.0.2j
- Windows binaries built with OpenSSL 1.0.2j

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.10 is
 [ ] Stable, go ahead and release
 [ ] Broken because of ...

Thanks,

Mark


[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.10/
[2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_10

-
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