svn commit: r1714122 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

[markt]

Author: markt
Date: Thu Nov 12 21:27:32 2015
New Revision: 1714122

URL: http://svn.apache.org/viewvc?rev=1714122=rev
Log:
Fix indent

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1714122=1714121=1714122=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Nov 
12 21:27:32 2015
@@ -964,24 +964,24 @@ public class DeltaManager extends Cluste
 @Override
 public ClusterMessage requestCompleted(String sessionId) {
  return requestCompleted(sessionId, false);
- }
+}
 
- /**
-  * When the request has been completed, the replication valve will notify
-  * the manager, and the manager will decide whether any replication is
-  * needed or not. If there is a need for replication, the manager will
-  * create a session message and that will be replicated. The cluster
-  * determines where it gets sent.
-  *
-  * Session expiration also calls this method, but with expires == true.
-  *
-  * @param sessionId -
-  *the sessionId that just completed.
-  * @param expires -
-  *whether this method has been called during session 
expiration
-  * @return a SessionMessage to be sent,
-  */
- public ClusterMessage requestCompleted(String sessionId, boolean expires) 
{
+/**
+ * When the request has been completed, the replication valve will notify
+ * the manager, and the manager will decide whether any replication is
+ * needed or not. If there is a need for replication, the manager will
+ * create a session message and that will be replicated. The cluster
+ * determines where it gets sent.
+ *
+ * Session expiration also calls this method, but with expires == true.
+ *
+ * @param sessionId -
+ *the sessionId that just completed.
+ * @param expires -
+ *whether this method has been called during session expiration
+ * @return a SessionMessage to be sent,
+ */
+public ClusterMessage requestCompleted(String sessionId, boolean expires) {
 DeltaSession session = null;
 SessionMessage msg = null;
 try {



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

svn commit: r1714128 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Nov 12 21:52:45 2015
New Revision: 1714128

URL: http://svn.apache.org/viewvc?rev=1714128=rev
Log:
First 9.0.x release will be 9.0.0.M1

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

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1714128=1714127=1714128=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Nov 12 21:52:45 2015
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=-dev
+version.suffix=.M1-dev
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1714128=1714127=1714128=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Thu Nov 12 21:52:45 2015
@@ -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=9.0.0
+maven.asf.release.deploy.version=9.0.0.M1
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1714128=1714127=1714128=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 12 21:52:45 2015
@@ -48,7 +48,7 @@
   Note: Until the first 9.0.x release, the only entries that should appear in
 the changelog are those are relate only to 9.0.x.
  -->
-
+
   
 
   



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

svn commit: r1714130 - in /tomcat/tags/TOMCAT_9_0_0_M1: ./ build.properties.default

[markt]

Author: markt
Date: Thu Nov 12 22:03:14 2015
New Revision: 1714130

URL: http://svn.apache.org/viewvc?rev=1714130=rev
Log:
Tag 9.0.0.M1

Added:
tomcat/tags/TOMCAT_9_0_0_M1/
  - copied from r1714128, tomcat/trunk/
Modified:
tomcat/tags/TOMCAT_9_0_0_M1/build.properties.default

Modified: tomcat/tags/TOMCAT_9_0_0_M1/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M1/build.properties.default?rev=1714130=1714128=1714130=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M1/build.properties.default (original)
+++ tomcat/tags/TOMCAT_9_0_0_M1/build.properties.default Thu Nov 12 22:03:14 
2015
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M1-dev
+version.suffix=.M1
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed



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

svn commit: r1714123 - in /tomcat/trunk/java/org/apache: catalina/connector/Request.java catalina/ha/session/DeltaManager.java tomcat/util/net/Nio2Endpoint.java tomcat/util/net/openssl/OpenSSLKeyManag

[markt]

Author: markt
Date: Thu Nov 12 21:29:46 2015
New Revision: 1714123

URL: http://svn.apache.org/viewvc?rev=1714123=rev
Log:
Fix some IDE warnings

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1714123=1714122=1714123=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Nov 12 
21:29:46 2015
@@ -1856,7 +1856,7 @@ public class Request implements HttpServ
 try {
 // Do not go through the instance manager for internal Tomcat 
classes since they don't need injection
 if 
(InternalHttpUpgradeHandler.class.isAssignableFrom(httpUpgradeHandlerClass)) {
-handler = (T) httpUpgradeHandlerClass.newInstance();
+handler = httpUpgradeHandlerClass.newInstance();
 } else {
 instanceManager = getContext().getInstanceManager();
 handler = (T) 
instanceManager.newInstance(httpUpgradeHandlerClass);

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1714123=1714122=1714123=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Nov 
12 21:29:46 2015
@@ -981,6 +981,7 @@ public class DeltaManager extends Cluste
  *whether this method has been called during session expiration
  * @return a SessionMessage to be sent,
  */
+@SuppressWarnings("null") // session can't be null when it is used
 public ClusterMessage requestCompleted(String sessionId, boolean expires) {
 DeltaSession session = null;
 SessionMessage msg = null;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1714123=1714122=1714123=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Nov 12 
21:29:46 2015
@@ -1165,9 +1165,7 @@ public class Nio2Endpoint extends Abstra
 } catch (InterruptedException e) {
 throw new IOException(e);
 } catch (TimeoutException e) {
-if (integer != null) {
-integer.cancel(true);
-}
+integer.cancel(true);
 throw new SocketTimeoutException();
 }
 } else {
@@ -1244,9 +1242,7 @@ public class Nio2Endpoint extends Abstra
 } catch (InterruptedException e) {
 throw new IOException(e);
 } catch (TimeoutException e) {
-if (integer != null) {
-integer.cancel(true);
-}
+integer.cancel(true);
 throw new SocketTimeoutException();
 }
 }

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java?rev=1714123=1714122=1714123=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLKeyManager.java 
Thu Nov 12 21:29:46 2015
@@ -20,12 +20,8 @@ import java.io.File;
 
 import javax.net.ssl.KeyManager;
 
-import org.apache.tomcat.util.res.StringManager;
-
 public class OpenSSLKeyManager implements KeyManager{
 
-private static final StringManager sm = 
StringManager.getManager(OpenSSLKeyManager.class);
-
 private File certificateChain;
 public File getCertificateChain() { return certificateChain; }
 public void setCertificateChain(File certificateChain) { 
this.certificateChain = certificateChain; }
@@ -44,5 +40,4 @@ public class OpenSSLKeyManager implement
 this.certificateChain = new File(certChainFile);
 this.privateKey = new File(keyFile);
 }
-
 }



-
To unsubscribe, 

svn commit: r1713972 - /tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ClasspathURLStreamHandler.java

[violetagg]

Author: violetagg
Date: Thu Nov 12 08:15:25 2015
New Revision: 1713972

URL: http://svn.apache.org/viewvc?rev=1713972=rev
Log:
Fixed checkstyle - Disallowed import

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ClasspathURLStreamHandler.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ClasspathURLStreamHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ClasspathURLStreamHandler.java?rev=1713972=1713971=1713972=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ClasspathURLStreamHandler.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/ClasspathURLStreamHandler.java
 Thu Nov 12 08:15:25 2015
@@ -22,7 +22,7 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
-import org.apache.tomcat.util.res.StringManager;
+import org.apache.naming.StringManager;
 
 public class ClasspathURLStreamHandler extends URLStreamHandler {
 



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

svn commit: r1714000 - in /tomcat/tc7.0.x/trunk: ./ conf/web.xml java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Nov 12 10:04:40 2015
New Revision: 1714000

URL: http://svn.apache.org/viewvc?rev=1714000=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57741
Enable the debug servlet to use the standard error page mechanism

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/conf/web.xml
tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/cgi-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 10:04:40 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 

Re: svn commit: r1713618 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ test/org/apache/catalina/cor

[Mark Thomas]

On 11/11/2015 20:15, Christopher Schultz wrote:
> Mark,
> 
> On 11/10/15 6:55 AM, ma...@apache.org wrote:
>> Author: markt
>> Date: Tue Nov 10 11:55:45 2015
>> New Revision: 1713618
>>
>> URL: http://svn.apache.org/viewvc?rev=1713618=rev
>> Log:
>> Add a new Context option, enabled by default, that enables an additional 
>> check that a client provided session ID is in use in at least one other web 
>> application before allowing it to be used as the ID for a new session in the 
>> current web application.
>>
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/Context.java
>> tomcat/trunk/java/org/apache/catalina/connector/Request.java
>> tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
>> tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
>> tomcat/trunk/test/org/apache/catalina/core/TesterContext.java
>>
>> Modified: tomcat/trunk/java/org/apache/catalina/Context.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1713618=1713617=1713618=diff
>> ==
>> --- tomcat/trunk/java/org/apache/catalina/Context.java (original)
>> +++ tomcat/trunk/java/org/apache/catalina/Context.java Tue Nov 10 11:55:45 
>> 2015
>> @@ -1680,4 +1680,32 @@ public interface Context extends Contain
>>   * for this Context.
>>   */
>>  public CookieProcessor getCookieProcessor();
>> +
>> +/**
>> + * When a client provides the ID for a new session, should that ID be
>> + * validated? The only use case for using a client provided session ID 
>> is to
>> + * have a common session ID across multiple web applications. Therefore,
>> + * any client provided session ID should already exist in another web
>> + * application. If this check is enabled, the client provided session ID
>> + * will only be used if the session ID exists in at least one other web
>> + * application for the current host. Note that the following additional
>> + * tests are always applied, irrespective of this setting:
>> + * 
>> + * The session ID is provided by a cookie
>> + * The session cookie has a path of {@code /}
>> + * 
>> + *
>> + * @param validateClientProvidedNewSessionId
>> + *  {@code true} if validation should be applied
>> + */
>> +public void setValidateClientProvidedNewSessionId(boolean 
>> validateClientProvidedNewSessionId);
>> +
>> +/**
>> + * Will client provided session IDs be validated (see {@link
>> + * #setValidateClientProvidedNewSessionId(boolean)}) before use?
>> + *
>> + * @return {@code true} if validation will be applied. Otherwise, {@code
>> + * false}
>> + */
>> +public boolean getValidateClientProvidedNewSessionId();
>>  }
>>
>> Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1713618=1713617=1713618=diff
>> ==
>> --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
>> +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Nov 10 
>> 11:55:45 2015
>> @@ -65,6 +65,7 @@ import javax.servlet.http.HttpUpgradeHan
>>  import javax.servlet.http.Part;
>>  import javax.servlet.http.PushBuilder;
>>  
>> +import org.apache.catalina.Container;
>>  import org.apache.catalina.Context;
>>  import org.apache.catalina.Globals;
>>  import org.apache.catalina.Host;
>> @@ -2827,16 +2828,49 @@ public class Request implements HttpServ
>>  sm.getString("coyoteRequest.sessionCreateCommitted"));
>>  }
>>  
>> -// Attempt to reuse session id if one was submitted in a cookie
>> -// Do not reuse the session id if it is from a URL, to prevent 
>> possible
>> -// phishing attacks
>> -// Use the SSL session ID if one is present.
>> -if (("/".equals(context.getSessionCookiePath())
>> -&& isRequestedSessionIdFromCookie()) || requestedSessionSSL 
>> ) {
>> -session = manager.createSession(getRequestedSessionId());
>> +// Re-use session IDs provided by the client in very limited
>> +// circumstances.
>> +String sessionId = getRequestedSessionId();
>> +if (requestedSessionSSL) {
>> +// If the session ID has been obtained from the SSL handshake 
>> then
>> +// use it.
>> +} else if (("/".equals(context.getSessionCookiePath())
>> +&& isRequestedSessionIdFromCookie())) {
>> +/* This is the common(ish) use case: using the same session ID 
>> with
>> + * multiple web applications on the same host. Typically this is
>> + * used by Portlet implementations. It only works if sessions 
>> are
>> + * tracked via cookies. The 

svn commit: r1713984 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/session/ java/org/apache/catalina/startup/ java/org/apache/catalina/util/ java/org/apache/jasper/ java/org/apache/jasper/se

[violetagg]

Author: violetagg
Date: Thu Nov 12 09:14:45 2015
New Revision: 1713984

URL: http://svn.apache.org/viewvc?rev=1713984=rev
Log:
Merged revision 1713931 from tomcat/trunk:
FindBugs fixes

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/tc8.0.x/trunk/res/findbugs/filter-false-positives.xml
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 09:14:45 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,1
 

svn commit: r1713992 - /tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java

[markt]

Author: markt
Date: Thu Nov 12 09:36:33 2015
New Revision: 1713992

URL: http://svn.apache.org/viewvc?rev=1713992=rev
Log:
Checkstyle issues
Add missing license header
Fix up imports

Modified:
tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java

Modified: tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java?rev=1713992=1713991=1713992=diff
==
--- tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java (original)
+++ tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java Thu Nov 12 
09:36:33 2015
@@ -1,25 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.catalina.realm;
 
+import java.lang.reflect.Field;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.core.TesterContext;
 import org.apache.naming.NameParserImpl;
 import org.apache.tomcat.util.security.MD5Encoder;
 import org.easymock.EasyMock;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.*;
-import java.lang.reflect.Field;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.Principal;
-
-import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
 
 public class TestJNDIRealm {
 
@@ -52,7 +71,7 @@ public class TestJNDIRealm {
 realm.authenticate(USER, expectedResponse, NONCE, null, null, 
null, REALM, HA2);
 
 // THEN
-assertThat(principal, is(nullValue()));
+Assert.assertNull(principal);
 }
 
 @Test
@@ -68,8 +87,8 @@ public class TestJNDIRealm {
 realm.authenticate(USER, expectedResponse, NONCE, null, null, 
null, REALM, HA2);
 
 // THEN
-assertThat(principal, is(instanceOf(GenericPrincipal.class)));
-assertThat( ((GenericPrincipal)principal).getPassword(), 
equalTo(PASSWORD));
+Assert.assertTrue(principal instanceof GenericPrincipal);
+Assert.assertEquals(PASSWORD, 
((GenericPrincipal)principal).getPassword());
 }
 
 @Test
@@ -86,8 +105,8 @@ public class TestJNDIRealm {
 realm.authenticate(USER, expectedResponse, NONCE, null, null, 
null, REALM, HA2);
 
 // THEN
-assertThat(principal, is(instanceOf(GenericPrincipal.class)));
-assertThat( ((GenericPrincipal)principal).getPassword(), 
equalTo(ha1()));
+Assert.assertTrue(principal instanceof GenericPrincipal);
+Assert.assertEquals(ha1(), 
((GenericPrincipal)principal).getPassword());
 }
 
 
@@ -117,13 +136,14 @@ public class TestJNDIRealm {
 private NamingEnumeration mockSearchResults(String password)
 throws NamingException {
 @SuppressWarnings("unchecked")
-NamingEnumeration searchResults = 
createNiceMock(NamingEnumeration.class);
-expect(Boolean.valueOf(searchResults.hasMore()))
+NamingEnumeration searchResults =
+EasyMock.createNiceMock(NamingEnumeration.class);
+EasyMock.expect(Boolean.valueOf(searchResults.hasMore()))
 .andReturn(Boolean.TRUE)
 .andReturn(Boolean.FALSE)
 .andReturn(Boolean.TRUE)
 .andReturn(Boolean.FALSE);
-expect(searchResults.next())
+EasyMock.expect(searchResults.next())
 .andReturn(new SearchResult("ANY RESULT", "",
 new 

svn commit: r1713976 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/config/context.xml

[markt]

Author: markt
Date: Thu Nov 12 08:45:18 2015
New Revision: 1713976

URL: http://svn.apache.org/viewvc?rev=1713976=rev
Log:
Document validateClientProvidedNewSessionId

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 08:45:18 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 

svn commit: r1713977 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/context.xml

[markt]

Author: markt
Date: Thu Nov 12 08:45:45 2015
New Revision: 1713977

URL: http://svn.apache.org/viewvc?rev=1713977=rev
Log:
Document validateClientProvidedNewSessionId

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 08:45:45 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613,1713621,1713872
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 

svn commit: r1713997 - in /tomcat/trunk: conf/web.xml webapps/docs/cgi-howto.xml

[markt]

Author: markt
Date: Thu Nov 12 09:51:47 2015
New Revision: 1713997

URL: http://svn.apache.org/viewvc?rev=1713997=rev
Log:
Make clear that that the CGI debug page is not considered secure

Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/webapps/docs/cgi-howto.xml

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1713997=1713996=1713997=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Thu Nov 12 09:51:47 2015
@@ -340,7 +340,12 @@
   
   
   
-  
+  
+  
+  
+  
+  
+  
   
   
   

Modified: tomcat/trunk/webapps/docs/cgi-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cgi-howto.xml?rev=1713997=1713996=1713997=diff
==
--- tomcat/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cgi-howto.xml Thu Nov 12 09:51:47 2015
@@ -101,8 +101,9 @@ by this servlet. Useful values range fro
 means maximum logging. Values of 10 or more mean maximum logging plus debug 
info
 added to the HTTP response. If an error occurs and debug is 10 or more the
 standard error page mechanism will be disabled and a response body with debug
-information will be produced. Note that any value of 10 or more has the same
-effect as a value of 10. Default is 0.
+information will be produced. The debug page is not considered secure and 
should
+not be enabled for production systems. Note that any value of 10 or more has 
the
+same effect as a value of 10. Default is 0.
 executable - The of the executable to be used to
 run the script. You may explicitly set this parameter to be an empty string
 if your script is itself executable (e.g. an exe file). Default is



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

[Bug 58605] New: Provide value for request.getProtocol() for HTTP/2 connections

[bugzilla]

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

Bug ID: 58605
   Summary: Provide value for request.getProtocol() for HTTP/2
connections
   Product: Tomcat 9
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com

Testing current Tomcat trunk (Updated to revision 1713973)
+ Tomcat Native 1.2.2
Using Java 8u66 (32-bit) on Windows 7, Firefox 42.0

Steps to reproduce:
Configure Tomcat:
1. Install Tomcat Native 1.2.2: copy tcnative-1.dll into ${catalina.home}/bin

2. Install certificates for HTTPS connector.
I am using certificates included in Tomcat test suite:
Copy the following files from source directory test\org\apache\tomcat\util\net\
 into ${catalina.home}/conf:

localhost-cert.pem
localhost-key.pem

3. Configure a HTTPS connector with HTTP/2 support,








(It is the same as commented sample in server.xml, but certificateKeyFile and
certificateFile were updated to match file names, s/-rsa-/-/ )

4. Start Tomcat
catalina.bat start

Use browser (Firefox) to access examples:
https://localhost:8443/examples/servlets/servlet/RequestInfoExample


Observed behaviour:
---
1. Access log (logs/localhost_access_log.2015-11-12.txt) contains:

127.0.0.1 - - [12/Nov/2015:12:03:10 +0300] "GET
/examples/servlets/servlet/RequestInfoExample null" 200 730

2. RequestInfoExample servlet prints the following line:

Protocol: null 

Expected behaviour:

1. Do not print "null" in access log.
2. Provide a non-null value for request.getProtocol()


Notes:
---
1) A HTTP 0.9 request [1] results in empty string for request.getProtocol(), so
it is distinct from this "null".

It is good that they are different. I was concerned that a HTTP/2 request
cannot be distinguished from HTTP 0.9 one.

(Actually, I think we can drop support for HTTP 0.9 if it impedes us in any
way).

Steps to reproduce:
Connect with telnet to port 8080 and type the following line:
GET /examples/servlets/servlet/RequestInfoExample

The following line is written into access log:
127.0.0.1 - - [12/Nov/2015:12:16:59 +0300] "GET
/examples/servlets/servlet/RequestInfoExample " 200 726

[1] https://wiki.apache.org/tomcat/Specifications#HTTP


2) I expect that the value for request.getProtocol() will be defined by Servlet
4.0 specification. The format of access log is up for us to define.


3) A web application may test for support of HTTP/1.1 features by asking for
request.getProtocol().

It that is a concern, one can use fake "HTTP/1.1" as the value for
request.getProtocol().

On a longer perspective it is better to provide a different string for HTTP/2
and update the application to recognize it. There has to be a way for an
application to test for availability of HTTP/2 features.


4) For a reference:
HTTP/2 specification RFC7540 itself defines no way to transmit a version string
both in requests and responses.

ch.8.1.2.3.  Request Pseudo-Header Fields:

> HTTP/2 does not define a way to carry the version identifier that is
> included in the HTTP/1.1 request line.

ch.8.1.2.4.  Response Pseudo-Header Fields:

> HTTP/2 does not define a way to carry the version or reason phrase
> that is included in an HTTP/1.1 status line.


Protocol is identified by "h2", "h2c" strings when protocol is negotiated.
(ch.3.1. HTTP/2 Version Identification)


In HTTP/1.1 specification RFC7230
ch 2.6. Protocol Versioning says:

 HTTP-version  = HTTP-name "/" DIGIT "." DIGIT
 HTTP-name = %x48.54.54.50 ; "HTTP", case-sensitive

So "HTTP/2.0" is better than "HTTP/2", but "HTTP/2" is how the protocol names
itself in the title of RFC7540.


5) It may be a good idea to follow Apache HTTPD here.

In Apache HTTPD support for HTTP/2 was introduced a month ago in HTTPD 2.4.17
with an experimental mod_http2 module.

(Warning: It is known that mod_http2 1.0.0 included with 2.4.17 may crash the
server when processing certain requests, 
http://markmail.org/message/oadvmtwui23h6w32
"[users@httpd] Crash in http/2" thread from 20 Oct 2015
)

Changelog for an updated "2.4.18-dev" build at Apache Lounge including
mod_http2 1.0.3 [2] mentions:

> *) 'HTTP/2.0' is written in log files when requests are served via mod_http2. 

[2] http://www.apachelounge.com/viewtopic.php?t=6842

I have not tested whether that is actually "HTTP/2.0" yet. Looking at source
code changes, it looks that the related change in httpd trunk is r1708319. If I
am reading that correctly, I think it prints "HTTP/2", not "HTTP/2.0".


As such, we can make the value configurable between none, "HTTP/1.1",
"HTTP/2.0", "HTTP/2". Personally, I prefer "HTTP/2.0".

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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

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

Buildbot URL: http://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] 1713997
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

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

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

Buildbot URL: http://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] 1713975
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: r1713994 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/realm/JNDIRealm.java test/org/apache/catalina/realm/TestJNDIRealm.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Nov 12 09:40:46 2015
New Revision: 1713994

URL: http://svn.apache.org/viewvc?rev=1713994=rev
Log:
Add support for DIGEST authentication to the JNDIRealm
Based on a patch by Alexis Hassler

Added:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java
  - copied, changed from r1713987, 
tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 09:40:46 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 

svn commit: r1713995 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/JNDIRealm.java test/org/apache/catalina/realm/TestJNDIRealm.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Nov 12 09:41:45 2015
New Revision: 1713995

URL: http://svn.apache.org/viewvc?rev=1713995=rev
Log:
Add support for DIGEST authentication to the JNDIRealm
Based on a patch by Alexis Hassler

Added:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java
  - copied unchanged from r1713994, 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 09:41:45 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702
 
748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 

Re: Time for 9.0.0.RC1

[Mark Thomas]

On 11/11/2015 20:31, Christopher Schultz wrote:
> Mark,
> 
> On 11/11/15 10:39 AM, Mark Thomas wrote:
>> All,
>>
>> I think we have reached the point where it makes sense to roll a
>> 9.0.0.RC1 release. To summarise:
>>
>> - Tomcat Native is available with ALPN, SNI and OpenSSL BIO
>> - HTTP/2 is implemented
>> - Servlet API is up to date with latest 4.0. draft (plus some tweaks
>>   of my own)
>> - No movement on WebSocket, EL or JSP.
>>
>> I need to fix all the unit test failures r1713869 appears to have
>> triggered but, assuming that is fairly quick, I plan on tagging
>> 9.0.0.RC1 some time tomorrow.
> 
> What's the wild-guess for when servlet 4.0 will be final? It seems odd
> to me to release 9.0.0 (I know this is an RC, but eventually...) that
> adheres to a spec when the spec itself isn't final.

First half of 2017 was the last date I saw.

> Because of the way we do version-numbering (9.0.0 - 9.0.x are all beta,
> then declared stable at some point), I think it can be confusing to
> users who download "Tomcat 9.0.x" that implements "Servlet 4.0" and find
> that the product is actually a beta for an incomplete spec.

The announcements, download page, which version etc. will all make it
clear that this a work in progress.

To make it clearer, I'll label the version M1 (milestone 1) rather than RC1.

> I definitely think that we need to have 9.0-branch releases *prior* to a
> final spec -- just to get something out there in the wild that people
> can use to test... I just want to make sure that users understand that
> the version numbers mean. An "RC" can reasonably be considered
> alpha/beta/whatever but there has been a lot of confusion in early e.g.
> 8.0.x where folks had problems didn't realize it wasn't considered
> stable, yet.

Hopefully the milestone label will help with that.

Mark


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

svn commit: r1713974 - in /tomcat/trunk/java: javax/servlet/http/PushBuilder.java org/apache/catalina/Context.java

[markt]

Author: markt
Date: Thu Nov 12 08:37:11 2015
New Revision: 1713974

URL: http://svn.apache.org/viewvc?rev=1713974=rev
Log:
Javadoc

Modified:
tomcat/trunk/java/javax/servlet/http/PushBuilder.java
tomcat/trunk/java/org/apache/catalina/Context.java

Modified: tomcat/trunk/java/javax/servlet/http/PushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/PushBuilder.java?rev=1713974=1713973=1713974=diff
==
--- tomcat/trunk/java/javax/servlet/http/PushBuilder.java (original)
+++ tomcat/trunk/java/javax/servlet/http/PushBuilder.java Thu Nov 12 08:37:11 
2015
@@ -29,8 +29,8 @@ import java.util.Set;
  * Conditional, range, expectation, authorization and referer headers will
  * be removed.
  * Cookies added to the associated response will be added to the push
- * request unless maxAge <= 0 in which case any request cookie with the 
same
- * name will be removed.
+ * request unless maxAge = 0 in which case any request cookie with the
+ * same name will be removed.
  * The referer header will be set to
  * {@link HttpServletRequest#getRequestURL()} plus, if present, the query
  * string from {@link HttpServletRequest#getQueryString()}.

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1713974=1713973=1713974=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Nov 12 08:37:11 2015
@@ -395,8 +395,9 @@ public interface Context extends Contain
 
 
 /**
- * Return the document root for this Context.  This can be an absolute
- * pathname, a relative pathname, or a URL.
+ * Obtain the document root for this Context.
+ *
+ * @return An absolute pathname, a relative pathname, or a URL.
  */
 public String getDocBase();
 
@@ -411,13 +412,18 @@ public interface Context extends Contain
 
 
 /**
- * Return the URL encoded context path, using UTF-8.
+ * Return the URL encoded context path
+ *
+ * @return The URL encoded (with UTF-8) context path
  */
 public String getEncodedPath();
 
 
 /**
- * Return the boolean on the annotations parsing.
+ * Determine if annotations parsing is currently disabled
+ *
+ * @return {@code true} if annotation parsing is disabled for this web
+ * application
  */
 public boolean getIgnoreAnnotations();
 



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

svn commit: r1713987 - in /tomcat/trunk: java/org/apache/catalina/realm/JNDIRealm.java test/org/apache/catalina/realm/TestJNDIRealm.java

[markt]

Author: markt
Date: Thu Nov 12 09:24:10 2015
New Revision: 1713987

URL: http://svn.apache.org/viewvc?rev=1713987=rev
Log:
Add support for DIGEST authentication to the JNDIRealm
Based on a patch by Alexis Hassler
This closes #24

Added:
tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java   (with 
props)
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1713987=1713986=1713987=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Thu Nov 12 
09:24:10 2015
@@ -2178,8 +2178,23 @@ public class JNDIRealm extends RealmBase
  */
 @Override
 protected String getPassword(String username) {
+String userPassword = getUserPassword();
+if (userPassword == null || userPassword.isEmpty()) {
+return null;
+}
 
-return (null);
+try {
+User user = getUser(open(), username, null);
+ if (user == null) {
+// User should be found...
+return null;
+} else {
+// ... and have a password
+return user.getPassword();
+}
+} catch (NamingException e) {
+return null;
+}
 
 }
 

Added: tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java?rev=1713987=auto
==
--- tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java (added)
+++ tomcat/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java Thu Nov 12 
09:24:10 2015
@@ -0,0 +1,153 @@
+package org.apache.catalina.realm;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.core.TesterContext;
+import org.apache.naming.NameParserImpl;
+import org.apache.tomcat.util.security.MD5Encoder;
+import org.easymock.EasyMock;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.*;
+import java.lang.reflect.Field;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
+
+import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
+
+public class TestJNDIRealm {
+
+private static final String ALGORITHM = "MD5";
+
+private static final String USER = "test-user";
+private static final String PASSWORD = "test-password";
+private static final String REALM = "test-realm";
+
+private static final String NONCE = "test-nonce";
+private static final String HA2 = "test-md5a2";
+public static final String USER_PASSWORD_ATTR = "test-pwd";
+
+private static MessageDigest md5Helper;
+
+@BeforeClass
+public static void setupClass() throws Exception {
+md5Helper = MessageDigest.getInstance(ALGORITHM);
+}
+
+@Test
+public void testAuthenticateWithoutUserPassword() throws Exception {
+// GIVEN
+JNDIRealm realm = buildRealm(PASSWORD);
+
+// WHEN
+String expectedResponse =
+MD5Encoder.encode(md5Helper.digest((ha1() + ":" + NONCE + ":" 
+ HA2).getBytes()));
+Principal principal =
+realm.authenticate(USER, expectedResponse, NONCE, null, null, 
null, REALM, HA2);
+
+// THEN
+assertThat(principal, is(nullValue()));
+}
+
+@Test
+public void testAuthenticateWithUserPassword() throws Exception {
+// GIVEN
+JNDIRealm realm = buildRealm(PASSWORD);
+realm.setUserPassword(USER_PASSWORD_ATTR);
+
+// WHEN
+String expectedResponse =
+MD5Encoder.encode(md5Helper.digest((ha1() + ":" + NONCE + ":" 
+ HA2).getBytes()));
+Principal principal =
+realm.authenticate(USER, expectedResponse, NONCE, null, null, 
null, REALM, HA2);
+
+// THEN
+assertThat(principal, is(instanceOf(GenericPrincipal.class)));
+assertThat( ((GenericPrincipal)principal).getPassword(), 
equalTo(PASSWORD));
+}
+
+@Test
+public void testAuthenticateWithUserPasswordAndCredentialHandler() throws 
Exception {
+// GIVEN
+JNDIRealm realm = buildRealm(ha1());
+realm.setCredentialHandler(buildCredentialHandler());
+realm.setUserPassword(USER_PASSWORD_ATTR);
+
+// WHEN
+String expectedResponse =
+MD5Encoder.encode(md5Helper.digest((ha1() + ":" + NONCE + ":" 
+ HA2).getBytes()));
+

[GitHub] tomcat pull request: Support of Digest authentication in the JNDIR...

[markt-asf]

Github user markt-asf closed the pull request at:

https://github.com/apache/tomcat/pull/24


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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

svn commit: r1713990 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/ java/org/apache/coyote/http11/ java/org/apache/coyote/http11/filters/ java/org/apache/tomcat/util/digester/ java/o

[violetagg]

Author: violetagg
Date: Thu Nov 12 09:33:08 2015
New Revision: 1713990

URL: http://svn.apache.org/viewvc?rev=1713990=rev
Log:
Merged revision 1713362 from tomcat/trunk:
Fix Findbugs warnings. Remove code that will never execute because the 
condition it depends on can never be met.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java

tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 09:33:08 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 

svn commit: r1713998 - in /tomcat/tc8.0.x/trunk: ./ conf/web.xml webapps/docs/cgi-howto.xml webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Nov 12 09:53:58 2015
New Revision: 1713998

URL: http://svn.apache.org/viewvc?rev=1713998=rev
Log:
Make clear that that the CGI debug page is not considered secure

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/conf/web.xml
tomcat/tc8.0.x/trunk/webapps/docs/cgi-howto.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 09:53:58 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 

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

[markt]

Author: markt
Date: Fri Nov 13 00:04:10 2015
New Revision: 1714144

URL: http://svn.apache.org/viewvc?rev=1714144=rev
Log:
Whoops. Forgot a rather obvious one.

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=1714144=1714143=1714144=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 13 00:04:10 2015
@@ -114,6 +114,9 @@
 The 1.2.x branch includes ALPN and SNI support which are required for
 HTTP/2. (markt)
   
+  
+Add support for HTTP/2 including server push. (markt)
+  
 
   
   



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

[VOTE] Release Apache Tomcat 9.0.0.M1

[Mark Thomas]

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

This is the first 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 8.0.x branch are:
- Requires Java 8
- BIO, Comet and Windows Itanium support have been removed
- Support for TLS virtual hosting, ALPN, HTTP/2 and OpenSSL with
  NIO/NIO2 has been added
- Lots of internal refactoring to support the above changes

For full details, see the changelog:
http://svn.us.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.M1/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1054/
The svn tag is:
http://svn.apache.org/repos/asf/tomcattags/TOMCAT_9_0_0_M1/

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

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

svn commit: r11165 [2/2] - in /dev/tomcat/tomcat-9: ./ v9.0.0.M1/ v9.0.0.M1/bin/ v9.0.0.M1/bin/embed/ v9.0.0.M1/bin/extras/ v9.0.0.M1/src/

[markt]

Added: dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.asc
==
--- dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.asc 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.asc Thu 
Nov 12 22:28:35 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJWRQ1/AAoJEBDAHFovYFnn9wwQAKwmTTaCrkN8jyr2zzcxno4C
+tzdcmw1sPv48wyWq+zh9fRlcRrE25yWlf42bQePKcDXImgiBz0VQ9YvVLHFyW9GD
+WCoHusN5dsLTZ4qe9VXSDyy01efq9+qnQM9rr3xONHlsCcSpeqfD72G61GFtzZus
+Idr0UAzubiWJM+VvHp4wLqibG1W3cGYtxdlOvAtkUARqpZxZXNhuR+xo8MBPnXyX
+aT0od92F4tzi+uaVxZTciO8OLY5W3OhvSC3owMhdOMLGr62FADuzkzuf6haIGV2a
+6gouyJ2ObV8+Ev5ogjpg4DcfO2FO6F+aacjeJDSq+2RJDE6xy2SAbuiwaUcRlVjm
+/UT2MMpioK/DGDmMgHQ4QEtt3dR8UlQVxP6F7qvbp5FaJfJaK7KGTm3oLlYucBSF
+ajX3qNiwuMGhSEQcR0GgrtShKCQ6j+WXgz4BIWBpvWXGzvC4Hr7+KIHlxyfECCvj
+6KTmqUKT791GMNj/sHhompAGuScjjoVvaN+ZHeOEzdE2T7qUew//K7sE9CB95L9x
+X9vMESBwk3jcDgl1eu7JHkatpJ1nOszXMncPUAn+UuQ4gHanY2SdsrWlwi3laH+J
+zREyupa5yqAhScTSBXexo4kQphKbNWDyZjTznfpR3+RKXcj4Zw/PDAvJgbTp00e6
+DdrL8VVhvqFeuvWnKiUU
+=KABW
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.md5
==
--- dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.md5 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.md5 Thu 
Nov 12 22:28:35 2015
@@ -0,0 +1 @@
+46f11b2e96040fbcb0a663e544ff8eec *tomcat-juli-adapters.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.sha1
==
--- dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.sha1 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.sha1 Thu 
Nov 12 22:28:35 2015
@@ -0,0 +1 @@
+13438aa7d677236e2b036bb57511755114b3da5e *tomcat-juli-adapters.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.asc
==
--- dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.asc (added)
+++ dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.asc Thu Nov 12 
22:28:35 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJWRQ1+AAoJEBDAHFovYFnnzZsQAM10cHS+kaE3CFgOh18rPOpq
+p9XI8zLuTc3pyQj70z6lAug2gDydQwWiFi8BAJkt90mvbcohb20g30zwet2IDDOi
+Fw4nYSDcyXiu4Sk8sN76EQto5XFWRZsQDq9I2888DIOBSw2BeFyaxcVEVd0E4YNe
+ccTHNoMd7qKWynMdwOB328KNyqPjLY3H/fQex1E+i7QOLOO5o8xsQtYY6DaJj9pF
+kzLHIQJ/Ezr6NtOi6IJEqrkd88XEz8RalJxnGgVrhnzKRthibBnzOovllfDJHCCd
+OidbxfCAUgSvFsYIapB0VMjyXhqlIc/T2hewLDnO2WdxcGFPav2DD+TM72BtpBKk
+oFfXjZRa0g3V4qOMeLA+Duly43Q/Zvs1DsrtanQkhxMCEs2xfODN+0rBqO7kb2MH
+v0FAnEL/Rie+7McVXVnVwO2HCGL3djvNtPWcOwZYovLTSUfMXwLMpw8XVlK6oz4j
+OUb2sJXw7Ug7+IJprctQklutfIg5KRAszwuQNlLR+CtBI+QGoqVI6t0U4ZrO2XId
++MiqH3SZEIlOIsFt/7z3oICE+uFjEVEPodp4PW6tUYffO4VsGCTIBv5UPyPSkJ0X
+IATQwpsk+wySW4AD2Aj+372qDFtDjpdRmYCE6WlaS000Wxlk8ucqV85LJ7ZywIaJ
+7rGLlhHf+COkg60sA6dt
+=EXys
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.md5
==
--- dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.md5 (added)
+++ dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.md5 Thu Nov 12 
22:28:35 2015
@@ -0,0 +1 @@
+85ae0786927e901e42cce64f89b9b676 *tomcat-juli.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.sha1
==
--- dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.sha1 (added)
+++ dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.sha1 Thu Nov 12 
22:28:35 2015
@@ -0,0 +1 @@
+138dfb2ba5eba6d6c54e5b42cf8a8e406dff7b62 *tomcat-juli.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M1/src/apache-tomcat-9.0.0.M1-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-9/v9.0.0.M1/src/apache-tomcat-9.0.0.M1-src.tar.gz
--
svn:mime-type = application/x-gzip

Added: dev/tomcat/tomcat-9/v9.0.0.M1/src/apache-tomcat-9.0.0.M1-src.tar.gz.asc
==
--- 

svn commit: r11165 [1/2] - in /dev/tomcat/tomcat-9: ./ v9.0.0.M1/ v9.0.0.M1/bin/ v9.0.0.M1/bin/embed/ v9.0.0.M1/bin/extras/ v9.0.0.M1/src/

[markt]

Author: markt
Date: Thu Nov 12 22:28:35 2015
New Revision: 11165

Log:
Upload 9.0.0.M1 for voting

Added:
dev/tomcat/tomcat-9/
dev/tomcat/tomcat-9/v9.0.0.M1/
dev/tomcat/tomcat-9/v9.0.0.M1/KEYS   (with props)
dev/tomcat/tomcat-9/v9.0.0.M1/README.html   (with props)
dev/tomcat/tomcat-9/v9.0.0.M1/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.0.M1/bin/
dev/tomcat/tomcat-9/v9.0.0.M1/bin/README.html   (with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-deployer.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-deployer.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-deployer.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-deployer.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-deployer.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-deployer.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-fulldocs.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-fulldocs.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-windows-x64.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-windows-x64.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-windows-x64.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-windows-x86.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-windows-x86.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1-windows-x86.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.exe   (with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.exe.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.exe.md5
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.exe.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.zip   (with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M1/bin/apache-tomcat-9.0.0.M1.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/embed/
dev/tomcat/tomcat-9/v9.0.0.M1/bin/embed/apache-tomcat-9.0.0.M1-embed.tar.gz 
  (with props)

dev/tomcat/tomcat-9/v9.0.0.M1/bin/embed/apache-tomcat-9.0.0.M1-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M1/bin/embed/apache-tomcat-9.0.0.M1-embed.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M1/bin/embed/apache-tomcat-9.0.0.M1-embed.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/embed/apache-tomcat-9.0.0.M1-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/embed/apache-tomcat-9.0.0.M1-embed.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/embed/apache-tomcat-9.0.0.M1-embed.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M1/bin/embed/apache-tomcat-9.0.0.M1-embed.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli-adapters.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M1/bin/extras/tomcat-juli.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M1/src/

svn commit: r1714005 - in /tomcat/tc7.0.x/trunk: ./ conf/web.xml

[markt]

Author: markt
Date: Thu Nov 12 10:27:37 2015
New Revision: 1714005

URL: http://svn.apache.org/viewvc?rev=1714005=rev
Log: (empty)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/conf/web.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 10:27:37 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 

Re: Time for 9.0.0.RC1

[Martin Grigorov]

Hi,

On Thu, Nov 12, 2015 at 11:22 AM, Rémy Maucherat  wrote:

> 2015-11-12 9:26 GMT+01:00 Mark Thomas :
>
> > The announcements, download page, which version etc. will all make it
> > clear that this a work in progress.
> >
> > To make it clearer, I'll label the version M1 (milestone 1) rather than
> > RC1.
> >
> > This naming is new in Tomcat. It could be just M, with 9.0.0.M, then
> 9.0.1.M, etc. Or 9.0.0.Alpha. Or 9.0.0.M1 as you said, then 9.0.0.M2 until
> it gets to 9.0.0.Alpha/Beta/etc once the relevant specifications are out.
> Either way, it's 1+ years of alphas ahead.
>

I think the best for Tomcat would be: M1, M2, ..., 9.0.0, 9.0.1, ...
No need of alpha/beta/rc.
The current approach with releasing X.0.0 as non-stable works quite well!
More people start to test/use it earlier and report problems.


>
> Rémy
>

svn commit: r1714010 - /tomcat/tc7.0.x/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java

[markt]

Author: markt
Date: Thu Nov 12 10:39:40 2015
New Revision: 1714010

URL: http://svn.apache.org/viewvc?rev=1714010=rev
Log:
Correct back-port of unit test. Tomcat 7.0.x does not use CredentialHandler.

Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java

Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java?rev=1714010=1714009=1714010=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java 
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/realm/TestJNDIRealm.java Thu 
Nov 12 10:39:40 2015
@@ -18,7 +18,6 @@ package org.apache.catalina.realm;
 
 import java.lang.reflect.Field;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.security.Principal;
 
 import javax.naming.NamingEnumeration;
@@ -62,7 +61,7 @@ public class TestJNDIRealm {
 @Test
 public void testAuthenticateWithoutUserPassword() throws Exception {
 // GIVEN
-JNDIRealm realm = buildRealm(PASSWORD);
+JNDIRealm realm = buildRealm(PASSWORD, null);
 
 // WHEN
 String expectedResponse =
@@ -77,7 +76,7 @@ public class TestJNDIRealm {
 @Test
 public void testAuthenticateWithUserPassword() throws Exception {
 // GIVEN
-JNDIRealm realm = buildRealm(PASSWORD);
+JNDIRealm realm = buildRealm(PASSWORD, null);
 realm.setUserPassword(USER_PASSWORD_ATTR);
 
 // WHEN
@@ -92,10 +91,9 @@ public class TestJNDIRealm {
 }
 
 @Test
-public void testAuthenticateWithUserPasswordAndCredentialHandler() throws 
Exception {
+public void testAuthenticateWithUserPasswordAndDigest() throws Exception {
 // GIVEN
-JNDIRealm realm = buildRealm(ha1());
-realm.setCredentialHandler(buildCredentialHandler());
+JNDIRealm realm = buildRealm(ha1(), "MD5");
 realm.setUserPassword(USER_PASSWORD_ATTR);
 
 // WHEN
@@ -110,12 +108,13 @@ public class TestJNDIRealm {
 }
 
 
-private JNDIRealm buildRealm(String password) throws 
javax.naming.NamingException,
+private JNDIRealm buildRealm(String password, String digest) throws 
javax.naming.NamingException,
 NoSuchFieldException, IllegalAccessException, LifecycleException {
 Context context = new TesterContext();
 JNDIRealm realm = new JNDIRealm();
 realm.setContainer(context);
 realm.setUserSearch("");
+realm.setDigest(digest);
 
 Field field = JNDIRealm.class.getDeclaredField("context");
 field.setAccessible(true);
@@ -126,13 +125,6 @@ public class TestJNDIRealm {
 return realm;
 }
 
-private MessageDigestCredentialHandler buildCredentialHandler()
-throws NoSuchAlgorithmException {
-MessageDigestCredentialHandler credentialHandler = new 
MessageDigestCredentialHandler();
-credentialHandler.setAlgorithm(ALGORITHM);
-return credentialHandler;
-}
-
 private NamingEnumeration mockSearchResults(String password)
 throws NamingException {
 @SuppressWarnings("unchecked")



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

svn commit: r1714014 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/security-howto.xml

[markt]

Author: markt
Date: Thu Nov 12 10:50:42 2015
New Revision: 1714014

URL: http://svn.apache.org/viewvc?rev=1714014=rev
Log:
Add note abour CGI debug page

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/security-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 10:50:42 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

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

Buildbot URL: http://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] 1714012
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

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

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

Buildbot URL: http://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] 1714029
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: r1714035 - /tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java

[markt]

Author: markt
Date: Thu Nov 12 12:59:44 2015
New Revision: 1714035

URL: http://svn.apache.org/viewvc?rev=1714035=rev
Log:
Continue is 100, not 101.

Modified:
tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java

Modified: tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java?rev=1714035=1714034=1714035=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java Thu Nov 
12 12:59:44 2015
@@ -54,7 +54,7 @@ public class TestHttp2Section_8_1 extend
 parser.readFrame(true);
 
 Assert.assertEquals("3-HeadersStart\n" +
-"3-Header-[:status]-[101]\n" +
+"3-Header-[:status]-[100]\n" +
 "3-Header-[date]-["+ DEFAULT_DATE + "]\n" +
 "3-HeadersEnd\n",
 output.getTrace());



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

buildbot failure in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

Buildbot URL: http://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] 1714000
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: r1714006 - in /tomcat/tc6.0.x/trunk: ./ conf/web.xml java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Nov 12 10:29:27 2015
New Revision: 1714006

URL: http://svn.apache.org/viewvc?rev=1714006=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57741
Enable the debug servlet to use the standard error page mechanism

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/conf/web.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 10:29:27 2015
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk: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,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
-/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,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655
-/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,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 

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

[markt]

Author: markt
Date: Thu Nov 12 12:32:39 2015
New Revision: 1714029

URL: http://svn.apache.org/viewvc?rev=1714029=rev
Log:
ACK response is 100, not 101.

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=1714029=1714028=1714029=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Thu Nov 12 12:32:39 
2015
@@ -42,7 +42,7 @@ public class Stream extends AbstractStre
 private static final Response ACK_RESPONSE = new Response();
 
 static {
-ACK_RESPONSE.setStatus(101);
+ACK_RESPONSE.setStatus(100);
 }
 
 private volatile int weight = Constants.DEFAULT_WEIGHT;
@@ -85,6 +85,7 @@ public class Stream extends AbstractStre
 this.coyoteRequest.setSendfile(false);
 this.coyoteResponse.setOutputBuffer(outputBuffer);
 this.coyoteRequest.setResponse(coyoteResponse);
+this.coyoteRequest.protocol().setString("HTTP/2.0");
 }
 
 



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

svn commit: r1714004 - in /tomcat/tc8.0.x/trunk: ./ conf/web.xml

[markt]

Author: markt
Date: Thu Nov 12 10:25:51 2015
New Revision: 1714004

URL: http://svn.apache.org/viewvc?rev=1714004=rev
Log:
Correct r1689920 which updated debug for the Default Servlet rather than the 
CGi sevrlet.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/conf/web.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 10:25:51 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 

svn commit: r1714013 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/security-howto.xml

[markt]

Author: markt
Date: Thu Nov 12 10:49:36 2015
New Revision: 1714013

URL: http://svn.apache.org/viewvc?rev=1714013=rev
Log:
Add note abour CGI debug page

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 10:49:36 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 

svn commit: r1714012 - /tomcat/trunk/webapps/docs/security-howto.xml

[markt]

Author: markt
Date: Thu Nov 12 10:48:45 2015
New Revision: 1714012

URL: http://svn.apache.org/viewvc?rev=1714012=rev
Log:
Add info on CGI debug page

Modified:
tomcat/trunk/webapps/docs/security-howto.xml

Modified: tomcat/trunk/webapps/docs/security-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1714012=1714011=1714012=diff
==
--- tomcat/trunk/webapps/docs/security-howto.xml (original)
+++ tomcat/trunk/webapps/docs/security-howto.xml Thu Nov 12 10:48:45 2015
@@ -469,6 +469,10 @@
 script will still report the version number.
 
 
+The CGI Servlet is disabled by default. If enabled, the debug
+initialisation parameter should not be set to 10 or higher on 
a
+production system because the debug page is not secure.
+ 
 FailedRequestFilter
 can be configured and used to reject requests that had errors during
 request parameter parsing. Without the filter the default behaviour is



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

svn commit: r1714019 - /tomcat/trunk/webapps/docs/security-howto.xml

[markt]

Author: markt
Date: Thu Nov 12 11:16:11 2015
New Revision: 1714019

URL: http://svn.apache.org/viewvc?rev=1714019=rev
Log:
whitespace

Modified:
tomcat/trunk/webapps/docs/security-howto.xml

Modified: tomcat/trunk/webapps/docs/security-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1714019=1714018=1714019=diff
==
--- tomcat/trunk/webapps/docs/security-howto.xml (original)
+++ tomcat/trunk/webapps/docs/security-howto.xml Thu Nov 12 11:16:11 2015
@@ -472,7 +472,7 @@
 The CGI Servlet is disabled by default. If enabled, the debug
 initialisation parameter should not be set to 10 or higher on 
a
 production system because the debug page is not secure.
- 
+
 FailedRequestFilter
 can be configured and used to reject requests that had errors during
 request parameter parsing. Without the filter the default behaviour is



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

[Bug 58605] Provide value for request.getProtocol() for HTTP/2 connections

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED
 OS||All

--- Comment #1 from Mark Thomas  ---
HTTP/2.0 is what Firefox reports when you use FireBug with h2. That works for
me. I've also fixed an issue with h2c where the initial upgrade request never
appeared in the access logs.

-- 
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: r1714036 - /tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java

[markt]

Author: markt
Date: Thu Nov 12 13:00:22 2015
New Revision: 1714036

URL: http://svn.apache.org/viewvc?rev=1714036=rev
Log:
Fix a TODO since tests are now failing because of it.

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

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=1714036=1714035=1714036=diff
==
--- tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http2/Http2TestBase.java Thu Nov 12 
13:00:22 2015
@@ -450,11 +450,11 @@ public abstract class Http2TestBase exte
 if (!responseHeaders[0].startsWith("HTTP/1.1 101")) {
 return false;
 }
-// TODO: There may be other headers.
-if (!responseHeaders[1].equals("Connection: Upgrade")) {
+
+if (!validateHeader(responseHeaders, "Connection: Upgrade")) {
 return false;
 }
-if (!responseHeaders[2].startsWith("Upgrade: h2c")) {
+if (!validateHeader(responseHeaders, "Upgrade: h2c")) {
 return false;
 }
 
@@ -462,6 +462,18 @@ public abstract class Http2TestBase exte
 }
 
 
+private boolean validateHeader(String[] responseHeaders, String header) {
+boolean found = false;
+for (String responseHeader : responseHeaders) {
+if (responseHeader.equalsIgnoreCase(header)) {
+found = true;
+break;
+}
+}
+return found;
+}
+
+
 String[] readHttpResponseHeaders() throws IOException {
 // Only used by test code so safe to keep this just a little larger 
than
 // we are expecting.



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

svn commit: r1714002 - /tomcat/trunk/conf/web.xml

[markt]

Author: markt
Date: Thu Nov 12 10:23:50 2015
New Revision: 1714002

URL: http://svn.apache.org/viewvc?rev=1714002=rev
Log:
Correct r1689687 which updated debug for the Default Servlet rather than the 
CGi sevrlet.

Modified:
tomcat/trunk/conf/web.xml

Modified: tomcat/trunk/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1714002=1714001=1714002=diff
==
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Thu Nov 12 10:23:50 2015
@@ -42,16 +42,8 @@
   
   
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
   
   
   
@@ -340,10 +332,19 @@
   
   
   
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   



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

Re: Time for 9.0.0.RC1

[Rémy Maucherat]

2015-11-12 9:26 GMT+01:00 Mark Thomas :

> The announcements, download page, which version etc. will all make it
> clear that this a work in progress.
>
> To make it clearer, I'll label the version M1 (milestone 1) rather than
> RC1.
>
> This naming is new in Tomcat. It could be just M, with 9.0.0.M, then
9.0.1.M, etc. Or 9.0.0.Alpha. Or 9.0.0.M1 as you said, then 9.0.0.M2 until
it gets to 9.0.0.Alpha/Beta/etc once the relevant specifications are out.
Either way, it's 1+ years of alphas ahead.

Rémy

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

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

Buildbot URL: http://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] 1714019
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: r1714031 - in /tomcat/trunk/java/org/apache/coyote: http11/Http11Processor.java http2/Http2UpgradeHandler.java

[markt]

Author: markt
Date: Thu Nov 12 12:49:33 2015
New Revision: 1714031

URL: http://svn.apache.org/viewvc?rev=1714031=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58605
Provide a value for request.getProtocol()
Ensure access log reports HTTP/1.1 upgrade and initial HTTP/2.0 request 
separately.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1714031=1714030=1714031=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Nov 12 
12:49:33 2015
@@ -1032,6 +1032,11 @@ public class Http11Processor extends Abs
 if (upgradeProtocol.accept(request)) {
 // TODO Figure out how to handle request bodies at this
 // point.
+
response.setStatus(HttpServletResponse.SC_SWITCHING_PROTOCOLS);
+response.setHeader("Connection", "Upgrade");
+response.setHeader("Upgrade", requestedProtocol);
+action(ActionCode.CLOSE,  null);
+getAdapter().log(request, response, 0);
 
 InternalHttpUpgradeHandler upgradeHandler =
 upgradeProtocol.getInternalUpgradeHandler(

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=1714031=1714030=1714031=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Thu Nov 
12 12:49:33 2015
@@ -95,8 +95,6 @@ public class Http2UpgradeHandler extends
 private static final byte[] GOAWAY = { 0x07, 0x00, 0x00, 0x00, 0x00, 0x00 
};
 
 private static final String HTTP2_SETTINGS_HEADER = "HTTP2-Settings";
-private static final byte[] HTTP2_UPGRADE_ACK = ("HTTP/1.1 101 Switching 
Protocols\r\n" +
-"Connection: Upgrade\r\nUpgrade: 
h2c\r\n\r\n").getBytes(StandardCharsets.ISO_8859_1);
 
 private static final HeaderSink HEADER_SINK = new HeaderSink();
 
@@ -192,10 +190,6 @@ public class Http2UpgradeHandler extends
 // The initial HTTP/1.1 request is available as Stream 1.
 
 try {
-// Acknowledge the upgrade request
-socketWrapper.write(true, HTTP2_UPGRADE_ACK, 0, 
HTTP2_UPGRADE_ACK.length);
-socketWrapper.flush(true);
-
 // Process the initial settings frame
 stream = getStream(1, true);
 String base64Settings = 
stream.getCoyoteRequest().getHeader(HTTP2_SETTINGS_HEADER);
@@ -209,7 +203,7 @@ public class Http2UpgradeHandler extends
 long value = ByteUtil.getFourBytes(settings, (i * 6) + 2);
 remoteSettings.set(Setting.valueOf(id), value);
 }
-} catch (Http2Exception | IOException ioe) {
+} catch (Http2Exception e) {
 throw new ProtocolException(
 sm.getString("upgradeHandler.upgrade.fail", 
connectionId));
 }



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

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) 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-tc7.0.x-test-bio 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-tc7.0.x-test-bio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 9 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151113-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151113-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151113.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/pub
 lic/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=true -Dexecute.test.nio=false 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20151113.jar
 -Dtest.temp=output/test-tmp-BIO 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) 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-tc7.0.x-test-nio 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-tc7.0.x-test-nio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 6 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151113-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151113-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151113.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtest.excludePerformance=true -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/pub
 lic/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20151113.jar
 -Dtest.temp=output/test-tmp-NIO 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) 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-tc7.0.x-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-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-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 tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 8 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151113-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151113-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20151113/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151113.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtest.exclu
 dePerformance=true -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio=false 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20151113.jar
 -Dtest.temp=output/test-tmp-APR 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 

svn commit: r1714059 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Nov 12 14:52:23 2015
New Revision: 1714059

URL: http://svn.apache.org/viewvc?rev=1714059=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58603
Need to override getRequestURl so the values set by the filter are used.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 14:52:23 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1
 
666569,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
 

svn commit: r1714044 - in /tomcat/tc8.0.x/trunk: ./ res/findbugs/filter-false-positives.xml

[violetagg]

Author: violetagg
Date: Thu Nov 12 13:29:03 2015
New Revision: 1714044

URL: http://svn.apache.org/viewvc?rev=1714044=rev
Log:
Merged revision 1687551 from tomcat/trunk:
More findbugs false positives

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/res/findbugs/filter-false-positives.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 13:29:03 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1
 
666569,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
 

buildbot failure in ASF Buildbot on tomcat-8-trunk

[buildbot]

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

Buildbot URL: http://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] 1714038
Blamelist: violetagg

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: r1714038 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java

[violetagg]

Author: violetagg
Date: Thu Nov 12 13:11:27 2015
New Revision: 1714038

URL: http://svn.apache.org/viewvc?rev=1714038=rev
Log:
Merged revision 1659184 from tomcat/trunk:
Fix FindBugs warnings re possible Logger configuration loss

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 13:11:27 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1666579,1
 
37,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
 

svn commit: r1714039 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/realm/GenericPrincipal.java

[violetagg]

Author: violetagg
Date: Thu Nov 12 13:19:43 2015
New Revision: 1714039

URL: http://svn.apache.org/viewvc?rev=1714039=rev
Log:
Merged revision 1659174 from tomcat/trunk:
Make it obvious these fields are not included in serialization.
Strictly not necessary because of custom serialization/deserialization code but 
it makes it clearer and silences a FindBugs warning.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 13:19:43 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1666569,1
 
666579,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,168574
 

svn commit: r1714053 - in /tomcat/tc7.0.x/trunk: build.properties.default build.xml res/ide-support/eclipse/eclipse.classpath

[markt]

Author: markt
Date: Thu Nov 12 14:26:44 2015
New Revision: 1714053

URL: http://svn.apache.org/viewvc?rev=1714053=rev
Log:
Add EasyMock to 7.0.x for the unit tests

Modified:
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1714053=1714052=1714053=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Thu Nov 12 14:26:44 2015
@@ -197,6 +197,24 @@ hamcrest.home=${base.path}/hamcrest-${ha
 hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
 
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
 
+# - EasyMock, version 3.2 or later -
+easymock.version=3.2
+easymock.home=${base.path}/easymock-${easymock.version}
+easymock.loc=${base-sf.loc}/easymock/easymock-${easymock.version}.zip
+easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
+
+# - cglib, used by EasyMock, version 2.2 or later -
+cglib.version=2.2.3
+cglib.home=${base.path}/cglib-${cglib.version}
+cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
+cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
+
+# - objenesis, used by EasyMock, version 1.2 or later -
+objenesis.version=1.2
+objenesis.home=${base.path}/objenesis-${objenesis.version}
+objenesis.loc=https://objenesis.googlecode.com/files/objenesis-${objenesis.version}-bin.zip
+objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
+
 # - Checkstyle, version 6.0 or later -
 checkstyle.version=6.1.1
 checkstyle.home=${base.path}/checkstyle-${checkstyle.version}

Modified: tomcat/tc7.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1714053=1714052=1714053=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Thu Nov 12 14:26:44 2015
@@ -202,6 +202,9 @@
 
 
 
+
+
+
 
 
   
@@ -2713,6 +2716,24 @@ Apache Tomcat ${version} native binaries
   
 
 
+
+  
+  
+  
+
+
+
+  
+  
+  
+
+
+
+  
+  
+  
+
+
   
 
   http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1714053=1714052=1714053=diff
==
--- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath Thu Nov 12 
14:26:44 2015
@@ -26,5 +26,6 @@
 
 
 
+
 
 



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

svn commit: r1714054 - /tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

[markt]

Author: markt
Date: Thu Nov 12 14:33:46 2015
New Revision: 1714054

URL: http://svn.apache.org/viewvc?rev=1714054=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58603
Need to override getRequestURl so the values set by the filter are used.

Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1714054=1714053=1714054=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Thu Nov 
12 14:33:46 2015
@@ -625,6 +625,27 @@ public class RemoteIpFilter extends Gene
 }
 
 @Override
+public StringBuffer getRequestURL() {
+StringBuffer url = new StringBuffer();
+String scheme = getScheme();
+int port = getServerPort();
+if (port < 0) {
+port = 80; // Work around java.net.URL bug
+}
+url.append(scheme);
+url.append("://");
+url.append(getServerName());
+if ((scheme.equals("http") && (port != 80))
+|| (scheme.equals("https") && (port != 443))) {
+url.append(':');
+url.append(port);
+}
+url.append(getRequestURI());
+
+return url;
+}
+
+@Override
 public PushBuilder getPushBuilder() {
 return new ApplicationPushBuilder(this);
 }



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

[Bug 58603] RemoteIpFilter does not adjust getRequestURL()

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Thanks for the report. This has been fixed in trunk, 8.0.x (for 8.0.29 onwards)
and 7.0.x (for 7.0.66 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: r1714060 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/RemoteIpFilter.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Nov 12 14:53:24 2015
New Revision: 1714060

URL: http://svn.apache.org/viewvc?rev=1714060=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58603
Need to override getRequestURl so the values set by the filter are used.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 12 14:53:24 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712899,1712903,1712906,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 

[GUMP@vmgump]: Project tomcat-tc8.0.x-validate (in module tomcat-8.0.x) 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-tc8.0.x-validate 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-tc8.0.x-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 min 20 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 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/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/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20151113.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja
 
r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20151113.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20151113.jar:/srv/gump/packages/guava/guava-18.0.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-8.0.x/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-8.0.x/output/build/temp

compile-prepare:

download-validate:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-6.13-SNAPSHOT.jar

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle
[checkstyle] Running Checkstyle 6.13-SNAPSHOT on 2978 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-8.0.x/webapps/docs/security-howto.xml:479: 
error: Line matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-8.0.x/build.xml:546: Got 1 errors and 0 
warnings.

Total time: 1 minute 20 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 2015111310, vmgump.apache.org:vmgump:2015111310
Gump E-mail Identifier (unique within run) #2.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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

buildbot success in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

Buildbot URL: http://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] 1714053
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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

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

Buildbot URL: http://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] 1714054
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

buildbot success in ASF Buildbot on tomcat-8-trunk

[buildbot]

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

Buildbot URL: http://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] 1714044
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