Re: Supporting multiple certificates
On 25/05/2015 15:18, Rainer Jung wrote: >> Mark has been doing a whole lot of work recently to both unify the TLS >> configuration across all connectors (OpenSSL and JSSE) as well as >> support SNI. Since it's all changing, this would be a good time to >> either add some new configuration attributes (-0 for me) or to change >> the format of the "certificate" (or whatever) value to support multiple >> values. I'm +1 for something like comma-separated multi-valued, like >> this: >> >>> certificateFile="/path/to/rsa.pem, , /path/to/ec.pem" >> >> Note the double-comma, indicating that there is no DSA certificate in >> this example. > > Actually only the first certificate has a special meaning. AFAIK the one > with the RSA key has to come first, DSA (very rarely used) and EC(DSA) > (should become more popular) can come after without any special ordering > and without any problem if one or both are missing. New server key types > can turn up in the future and then the number could grow. Presumably this doesn't just affect the certificate. It also affects the key and the certificate chain. Allowing all of these to be multi-valued is going to create configuration complexity - particularly since order is going to have to be maintained across multiple attributes. In future we may also need to know the type of certificate. I'm leaning towards a nested element under SSLHostConfig. Does Java support this sort of thing? I need to check but I suspect not. >>> Furthermore if we want to support all three (RSA, DSA, EC) at the same >>> time, it would require the use of a new tcnative version, because it has >>> a fixed array length of 2 for the certificates. >> >> Do you mean a new major version of tcnative? Presumably, we'd need a new >> version to wire those certificates all the way down to OpenSSL... or >> does tcnative /currently/ have the capability to offer /two/ different >> types, just not /three/? >> >> In any case, it makes sense to me to start improving tcnative with an >> eye towards supporting these use cases in the future, even if we aren't >> ready at the Tomcat level. > > tcnative already supports up to two certificates if the Java API > provides an index when handing over the certificate. Tomcat always sets > the index to 0. > > So if we are goint to improve Tomcat to handle multiple certificates, > tcnative must be able to handle the incoming indexes. The biggest > allowed index currently is 1. Short term mitigation would be to simply > allow max 2 (0, 1, 2) in tcnative, but actually it would be better to > allocate them dynamically. That would simply be a new minor version of > tcnative, because the API stays compatible. > > Then we would require that new tcnative version in all Tomcat versions, > handing over more than one certificate. If we wouldn't require it, a new > Tomcat could pass an index > 1 to an old tcnative version that leads in > overwriting parts of memory. I'd have no issue with bumping the minimum required version. As an aside, we probably should rethink our versioning scheme for tc-native (more along the lines of semantic versioning). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681697 - in /tomcat/trunk/java/org/apache/catalina/tribes: group/ group/interceptors/ io/ membership/ tipis/ transport/bio/ transport/bio/util/ transport/nio/ util/
Author: markt
Date: Tue May 26 07:46:17 2015
New Revision: 1681697
URL: http://svn.apache.org/r1681697
Log:
Auto-boxing warnings
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
tomcat/trunk/java/org/apache/catalina/tribes/util/UUIDGenerator.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Tue May 26 07:46:17 2015
@@ -142,7 +142,8 @@ public class ChannelCoordinator extends
if (svc == 0 ) return;//nothing to start
if (svc == (svc & startLevel)) {
-throw new
ChannelException(sm.getString("channelCoordinator.alreadyStarted", svc));
+throw new
ChannelException(sm.getString("channelCoordinator.alreadyStarted",
+Integer.toString(svc)));
}
//must start the receiver first so that we can coordinate the port
it
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Tue May 26 07:46:17 2015
@@ -66,7 +66,7 @@ public class MessageDispatchInterceptor
return;
} else {
throw new
ChannelException(sm.getString("messageDispatchInterceptor.queue.full",
-maxQueueSize, getCurrentSize()));
+Long.toString(maxQueueSize),
Long.toString(getCurrentSize(;
}//end if
}//end if
//add to queue
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java Tue May 26
07:46:17 2015
@@ -62,7 +62,8 @@ public class BufferPool {
if (instance == null) {
BufferPoolAPI pool = new BufferPool15Impl();
pool.setMaxSize(DEFAULT_POOL_SIZE);
- log.info(sm.getString("bufferPool.created",
DEFAULT_POOL_SIZE, pool.getClass().getName()));
+ log.info(sm.getString("bufferPool.created",
+ Integer.toString(DEFAULT_POOL_SIZE),
pool.getClass().getName()));
instance = new BufferPool(pool);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1681697&r1=1681696&r2=1681697&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Tue May 26
07:46:17 2015
@@ -114,7 +114,8 @@ public class XByteBuffer {
public void trim(int length) {
if ( (bufSize - length) < 0 )
-
svn commit: r1681699 - /tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
Author: markt
Date: Tue May 26 07:51:05 2015
New Revision: 1681699
URL: http://svn.apache.org/r1681699
Log:
Javadoc
Modified:
tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=1681699&r1=1681698&r2=1681699&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Tue May 26
07:51:05 2015
@@ -150,6 +150,9 @@ public class StringManager {
*
* @param key The key for the required message
* @param args The values to insert into the message
+ *
+ * @return The request string formatted with the provided arguments or the
+ * key if the key was not found.
*/
public String getString(final String key, final Object... args) {
String value = getString(key);
@@ -164,7 +167,9 @@ public class StringManager {
/**
- * Identify the Locale this StringManager is associated with
+ * Identify the Locale this StringManager is associated with.
+ *
+ * @return The Locale associated with the StringManager
*/
public Locale getLocale() {
return locale;
@@ -186,6 +191,8 @@ public class StringManager {
* StringManager will be created and returned.
*
* @param clazz The class for which to retrieve the StringManager
+ *
+ * @return The instance associated with the package of the provide class
*/
public static final StringManager getManager(Class clazz) {
return getManager(clazz.getPackage().getName());
@@ -198,6 +205,9 @@ public class StringManager {
* StringManager will be created and returned.
*
* @param packageName The package name
+ *
+ * @return The instance associated with the given package and the default
+ * Locale
*/
public static final StringManager getManager(String packageName) {
return getManager(packageName, Locale.getDefault());
@@ -211,6 +221,8 @@ public class StringManager {
*
* @param packageName The package name
* @param locale The Locale
+ *
+ * @return The instance associated with the given package and Locale
*/
public static final synchronized StringManager getManager(
String packageName, Locale locale) {
@@ -252,7 +264,9 @@ public class StringManager {
* Retrieve the StringManager for a list of Locales. The first
StringManager
* found will be returned.
*
- * @param requestedLocales the list of Locales
+ * @param packageName The package for which the StringManager was
+ * requested
+ * @param requestedLocales The list of Locales
*
* @return the found StringManager or the default StringManager
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681700 - /tomcat/trunk/java/org/apache/tomcat/util/scan/Jar.java
Author: markt
Date: Tue May 26 07:53:35 2015
New Revision: 1681700
URL: http://svn.apache.org/r1681700
Log:
Javadoc
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/Jar.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/Jar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/Jar.java?rev=1681700&r1=1681699&r2=1681700&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/scan/Jar.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/Jar.java Tue May 26 07:53:35
2015
@@ -32,7 +32,7 @@ import java.net.URL;
public interface Jar extends AutoCloseable {
/**
- * Obtain the URL for accessing the JAR file.
+ * @return The URL for accessing the JAR file.
*/
URL getJarFileURL();
@@ -42,6 +42,9 @@ public interface Jar extends AutoCloseab
* @param name Entry to look for
* @return true if the specified entry exists else
* false
+ *
+ * @throws IOException if an I/O error occurs while processing the JAR file
+ * entries
*/
boolean entryExists(String name) throws IOException;
@@ -53,6 +56,8 @@ public interface Jar extends AutoCloseab
* @param name Entry to obtain an {@link InputStream} for
* @return An {@link InputStream} for the specified entry or null if
* the entry does not exist
+ *
+ * @throws IOException if an I/O error occurs while processing the JAR file
*/
InputStream getInputStream(String name) throws IOException;
@@ -64,6 +69,8 @@ public interface Jar extends AutoCloseab
* @return The time (in the same format as
* {@link System#currentTimeMillis()} that the resource was last
* modified. Returns -1 if the entry does not exist
+ *
+ * @throws IOException if an I/O error occurs while processing the JAR file
*/
long getLastModified(String name) throws IOException;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681701 - /tomcat/trunk/webapps/docs/ssl-howto.xml
Author: rjung Date: Tue May 26 07:54:47 2015 New Revision: 1681701 URL: http://svn.apache.org/r1681701 Log: Add info about compatibility of old Java clients with new DH param choices by tcnative (1.1.34 and above). Modified: tomcat/trunk/webapps/docs/ssl-howto.xml Modified: tomcat/trunk/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/ssl-howto.xml?rev=1681701&r1=1681700&r2=1681701&view=diff == --- tomcat/trunk/webapps/docs/ssl-howto.xml (original) +++ tomcat/trunk/webapps/docs/ssl-howto.xml Tue May 26 07:54:47 2015 @@ -485,6 +485,24 @@ SSL communications, and what to do about sensitive! +My Java-based client aborts handshakes with exceptions such as +"java.lang.RuntimeException: Could not generate DH keypair" and +"java.security.InvalidAlgorithmParameterException: Prime size must be multiple +of 64, and can only range from 512 to 1024 (inclusive)" + +If you are using the APR/native connector, starting with version 1.1.34 +it will determine the strength of ephemeral DH keys from the key size of +your RSA certificate. For example a 2048 bit RSA key will result in +using a 2048 bit primefor the DH keys. Unfortunately Java 6 only supports +768 bit and Java 7 only supports 1024 bit. So if your certificate has a +stronger key, old Java clients might produce such handshake failures. +As a mitigation you can either try to force them to use another cipher by +configuring an appropriate SSLCipherSuite and activate +SSLHonorCipherOrder, or embed weak DH params in your +certificate file. The latter approach is not recommended because it weakens +the SSL security (logjam attack). + + If you are still having problems, a good source of information is the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681702 - /tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
Author: markt
Date: Tue May 26 07:55:03 2015
New Revision: 1681702
URL: http://svn.apache.org/r1681702
Log:
Javadoc
Modified:
tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java?rev=1681702&r1=1681701&r2=1681702&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java Tue May
26 07:55:03 2015
@@ -39,6 +39,8 @@ public class SystemLogHandler extends Pr
/**
* Construct the handler to capture the output of the given steam.
+ *
+ * @param wrapped The stream to capture
*/
public SystemLogHandler(PrintStream wrapped) {
super(wrapped);
@@ -94,7 +96,9 @@ public class SystemLogHandler extends Pr
/**
- * Stop capturing thread's output and return captured data as a String.
+ * Stop capturing thread's output.
+ *
+ * @return The captured data
*/
public static String stopCapture() {
Stack stack = logs.get();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681703 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/config/http.xml webapps/docs/ssl-howto.xml
Author: rjung Date: Tue May 26 07:56:38 2015 New Revision: 1681703 URL: http://svn.apache.org/r1681703 Log: Merge docs about new DH and EC ephemeral key handling in tcnative 1.1.34. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml tomcat/tc8.0.x/trunk/webapps/docs/ssl-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 26 07:56:38 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,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,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,1657609,1657682,1657 907,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,137,149,1 666757,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 +/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,16
svn commit: r1681706 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
Author: markt
Date: Tue May 26 07:57:37 2015
New Revision: 1681706
URL: http://svn.apache.org/r1681706
Log:
Javadoc
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java?rev=1681706&r1=1681705&r2=1681706&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java Tue May 26
07:57:37 2015
@@ -116,6 +116,9 @@ public interface SSLSupport {
/**
* @return the protocol String indicating how the SSL socket was created
* e.g. TLSv1 or TLSv1.2 etc.
+ *
+ * @throws IOException If an error occurs trying to obtain the protocol
+ * information from the socket
*/
public String getProtocol() throws IOException;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681705 - /tomcat/trunk/webapps/docs/ssl-howto.xml
Author: rjung Date: Tue May 26 07:57:29 2015 New Revision: 1681705 URL: http://svn.apache.org/r1681705 Log: Remove version info. TC trunk will need a newer revision in any case. Modified: tomcat/trunk/webapps/docs/ssl-howto.xml Modified: tomcat/trunk/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/ssl-howto.xml?rev=1681705&r1=1681704&r2=1681705&view=diff == --- tomcat/trunk/webapps/docs/ssl-howto.xml (original) +++ tomcat/trunk/webapps/docs/ssl-howto.xml Tue May 26 07:57:29 2015 @@ -490,7 +490,7 @@ SSL communications, and what to do about "java.security.InvalidAlgorithmParameterException: Prime size must be multiple of 64, and can only range from 512 to 1024 (inclusive)" -If you are using the APR/native connector, starting with version 1.1.34 +If you are using the APR/native connector, it will determine the strength of ephemeral DH keys from the key size of your RSA certificate. For example a 2048 bit RSA key will result in using a 2048 bit primefor the DH keys. Unfortunately Java 6 only supports - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Looking for a good doc place
Am 25.05.2015 um 15:44 schrieb Rémy Maucherat: 2015-05-24 15:34 GMT+02:00 Rainer Jung : I need to add some info to the tcnative docs concerning using a native SSL connector and I'm quite uncertain where to add it. It will roughly be: Starting with version 1.1.34 of the APR/native connector, the strength of ephemeral keys for DH ciphers are by default chosen depending on the key size used for the certificate. A 2048 bit certificate will result in using a 2048 bit prime for DH. Unfortunately Java 6 only supports 768 bit and Java 7 only support 1024. So if your certificate has a stronger key, the new behavior will lead to handshake failures with old Java clients. In that case you can either try to force them to use another cipher by configuring an appropriate SSLCipherSuite and activating SSLHonorCipherOrder, or add weak DH params to your certificate file. The latter is not recommended because it weakens the SSL security. Any ideas where to put this? http://tomcat.apache.org/tomcat-8.0-doc/ssl-howto.html or http://tomcat.apache.org/tomcat-8.0-doc/config/http.html probably, right ? Ideally it should be elsewhere but I doubt anyone would ever find it. Thanks, I liked best the Howto, because it already contains a list of known problems. I hope people will find it searching for the client side error message. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1261 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] 1681706 Blamelist: markt,rjung BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 40 mins 32 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 -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150526-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150526.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150526-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150526/bi n/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output
Re: Strange 1000 seconds timeout in AprEndpoint
On 25/05/2015 06:26, Rainer Jung wrote:
> When testing tcnative I observed a strange 1000 seconds timeout. The
> occurrence of the timeout was likely due to using an old OpenSSL version
> (0.9.8m) in combination with the unit tests that want a newer one, but I
> found the long duration of 1000 seconds strange.
>
> It happens in TestSsl.testSimpleSsl lines 66 and again in line 86 (TC8):
>
> 25-May-2015 00:30:27.121 SEVERE [main]
> org.apache.coyote.AbstractProtocol.init Failed to initialize end point
> associated with ProtocolHandler ["http-apr-127.0.0.1-auto-1-40424"]
> java.lang.Exception: Unable to create SSLContext. Check that SSLEngine
> is enabled in the AprLifecycleListener, the AprLifecycleListener has
> initialised correctly and that a valid SSLProtocol has been specified
> at
> org.apache.tomcat.util.net.AprEndpoint.bind(AprEndpoint.java:538)
> at
> org.apache.tomcat.util.net.AbstractEndpoint.init(AbstractEndpoint.java:737)
>
>
> As a consequence the handshakes hangs:
>
>
> Testcase: testSimpleSsl took 1,006.091 sec
> Caused an ERROR
> Read timed out
> java.net.SocketTimeoutException: Read timed out
> at java.net.SocketInputStream.socketRead0(Native Method)
> ...
> at
> sun.net.www.protocol.https.HttpsClient.afterConnect(HttpsClient.java:559)
> ...
> org.apache.tomcat.util.net.TestSsl.testSimpleSsl(TestSsl.java:67)
>
>
> I did a little svn archaelogy and I think the problem goes back to
> revision r1433976 in AprEndpoint where the following code block
>
>
> -// Check timeouts (much less frequently than polling)
> -if (maintainTime > 100L && running) {
> -maintainTime = 0;
> -if (socketProperties.getSoTimeout() > 0) {
> -doTimeout(connectionPollset);
> -}
> -}
>
>
> changed into
>
>
> +// Process socket timeouts
> +if (getSoTimeout() > 0 && maintain++ > 1000 &&
> running) {
> +// This works and uses only one timeout
> mechanism for everything, but the
> +// non event poller might be a bit faster by
> using the old maintain.
> +maintain = 0;
> +maintain();
> }
>
> The commit contains many more changes, but I think the problem can be
> localized in this block. In APR maintainTime is in microseconds (it is
> incremented with pollTime which is in microseconds), so 100L is one
> second. The new block counts maintain and I think that is incremented
> once per second, so we switch from a 100 microsecond = 1 second
> condition to a 1000 second condition.
>
> I'm not sure whether it is better to simply check for maintain++ > 1 (or
>>= 1) or switch back to summing up pollTime.Needs more investigation.
Looking at it now. I think there are some simplifications that can be
made but I need to look into the more closely.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 5 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 39 mins 17 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 -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150526-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20150526/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150526.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150526-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150526/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/out
Reg: Bug 56438
Hi Mark, Can you review the patches that i submitted? Thanks, Pravallika
svn commit: r1681729 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Author: markt
Date: Tue May 26 09:50:33 2015
New Revision: 1681729
URL: http://svn.apache.org/r1681729
Log:
Fix 1000 second timeout observed by rjung in unit tests.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1681729&r1=1681728&r2=1681729&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue May 26
09:50:33 2015
@@ -1302,7 +1302,8 @@ public class AprEndpoint extends Abstrac
/**
- * Last run of maintain. Maintain will run usually every 5s.
+ * Last run of maintain. Maintain will run approximately once every one
+ * second (may be slightly longer between runs).
*/
private long lastMaintain = System.currentTimeMillis();
@@ -1600,7 +1601,6 @@ public class AprEndpoint extends Abstrac
@Override
public void run() {
-int maintain = 0;
SocketList localAddList = new SocketList(getMaxConnections());
SocketList localCloseList = new SocketList(getMaxConnections());
@@ -1618,7 +1618,6 @@ public class AprEndpoint extends Abstrac
// Check timeouts if the poller is empty.
while (pollerRunning && connectionCount.get() < 1 &&
addList.size() < 1 && closeList.size() < 1) {
-// Reset maintain time.
try {
if (getSoTimeout() > 0 && pollerRunning) {
maintain();
@@ -1888,24 +1887,21 @@ public class AprEndpoint extends Abstrac
}
}
-
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+getLog().warn(sm.getString("endpoint.poll.error"), t);
+}
+try {
// Process socket timeouts
-if (getSoTimeout() > 0 && maintain++ > 1000 &&
pollerRunning) {
+if (getSoTimeout() > 0 && pollerRunning) {
// This works and uses only one timeout mechanism for
everything, but the
// non event poller might be a bit faster by using the
old maintain.
-maintain = 0;
maintain();
}
-
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
-if (maintain == 0) {
-getLog().warn(sm.getString("endpoint.timeout.error"),
t);
-} else {
-getLog().warn(sm.getString("endpoint.poll.error"), t);
-}
+getLog().warn(sm.getString("endpoint.timeout.error"), t);
}
-
}
synchronized (this) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681730 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Author: markt Date: Tue May 26 09:53:55 2015 New Revision: 1681730 URL: http://svn.apache.org/r1681730 Log: Fix 1000 second timeout observed by rjung in unit tests. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 26 09:53:55 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,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,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,1657609,1657682,1657 907,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,137,149,1 666757,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,1681701 +/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
svn commit: r1681733 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Author: markt Date: Tue May 26 09:56:20 2015 New Revision: 1681733 URL: http://svn.apache.org/r1681733 Log: Fix 1000 second timeout observed by rjung in unit tests. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 26 09:56:20 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,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 -/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 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,1353087,1353125,
buildbot failure in ASF Buildbot on tomcat-8-trunk
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/270 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] 1681703 Blamelist: rjung 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
Re: buildbot failure in ASF Buildbot on tomcat-8-trunk
Apart from the one failed test (BIO TestWebSocketFrameClient) CI logs all tests as having skipped tests, because the test run output does not contain "Skipped: 0" (checked in our build.xml). Locally executed tests print: [junit] Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.615 sec on the CI system: [junit] Tests run: 23, Failures: 0, Errors: 0, Time elapsed: 0.095 sec Is that a version inconsistency? Both should run with our configured junit 4.11, but maybe the CI system has another junit in the CLASSPATH? Regards, Rainer - 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
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/1262 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] 1681729 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: r1681742 - in /tomcat/trunk/java/org/apache: coyote/http11/ tomcat/util/net/
Author: markt
Date: Tue May 26 11:29:15 2015
New Revision: 1681742
URL: http://svn.apache.org/r1681742
Log:
Various fixes to timeout handling post the 9.0.x connector refactoring
Highlights:
- use longs for timeouts in AprEndpoint
- APR read/write registration now uses current timeout
- move last[Read|Write] to NIO since only NIO uses it
- Simplify switching between keepAlive and So timeouts for HTTP
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1681742&r1=1681741&r2=1681742&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue May
26 11:29:15 2015
@@ -102,7 +102,6 @@ public class Http11AprProtocol extends A
processor.recycle();
recycledProcessors.push(processor);
if (addToPoller && getProtocol().getEndpoint().isRunning()) {
-
socket.setReadTimeout(getProtocol().getEndpoint().getKeepAliveTimeout());
socket.registerReadInterest();
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1681742&r1=1681741&r2=1681742&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Tue May
26 11:29:15 2015
@@ -381,7 +381,7 @@ public class Http11InputBuffer implement
* @return true if data is properly fed; false if no data is available
* immediately and thread should be freed
*/
-boolean parseRequestLine(boolean useAvailableDataOnly) throws IOException {
+boolean parseRequestLine(boolean keptAlive) throws IOException {
//check state
if ( !parsingRequestLine ) return true;
@@ -394,15 +394,19 @@ public class Http11InputBuffer implement
// Read new bytes if needed
if (pos >= lastValid) {
-if (useAvailableDataOnly) {
-return false;
+if (keptAlive) {
+// Haven't read any request data yet so use the
keep-alive
+// timeout.
+
wrapper.setReadTimeout(wrapper.getEndpoint().getKeepAliveTimeout());
}
-// Do a simple read with a short timeout
if (!fill(false)) {
// A read is pending, so no longer in initial state
parsingRequestLinePhase = 1;
return false;
}
+// At least one byte of the request has been received.
+// Switch to the socket timeout.
+
wrapper.setReadTimeout(wrapper.getEndpoint().getSoTimeout());
}
// Set the start time once we start reading data (even if it is
// just skipping blank lines)
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=1681742&r1=1681741&r2=1681742&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue May 26
11:29:15 2015
@@ -1148,13 +1148,7 @@ public class Http11Processor extends Abs
// open
openSocket = true;
// Check to see if we have read any of the request line yet
-if (inputBuffer.getParsingRequestLinePhase() < 1) {
-if (keptAlive) {
-// Haven't read the request line and have previously processed
a
-// request. Must be keep-alive. Make sure poller uses
keepAlive.
-socketWrapper.setReadTimeout(endpoint.getKeepAliveTimeout());
-}
-} else {
+if (inputBuffer.getParsingRequestLinePhase() > 1) {
// Started to read request line.
if (request.getStartTime() < 0) {
request.setStartTime(System.currentTimeMillis(
svn commit: r1681743 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Tue May 26 11:37:31 2015
New Revision: 1681743
URL: http://svn.apache.org/r1681743
Log:
Remove duplicated code (this is handled in the Http11InputBuffer)
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.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=1681743&r1=1681742&r2=1681743&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue May 26
11:37:31 2015
@@ -1150,9 +1150,6 @@ public class Http11Processor extends Abs
// Check to see if we have read any of the request line yet
if (inputBuffer.getParsingRequestLinePhase() > 1) {
// Started to read request line.
-if (request.getStartTime() < 0) {
-request.setStartTime(System.currentTimeMillis());
-}
if (endpoint.isPaused()) {
// Partially processed the request so need to respond
response.setStatus(503);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Strange 1000 seconds timeout in AprEndpoint
On 26/05/2015 09:31, Mark Thomas wrote:
> On 25/05/2015 06:26, Rainer Jung wrote:
>> When testing tcnative I observed a strange 1000 seconds timeout. The
>> occurrence of the timeout was likely due to using an old OpenSSL version
>> (0.9.8m) in combination with the unit tests that want a newer one, but I
>> found the long duration of 1000 seconds strange.
>>
>> It happens in TestSsl.testSimpleSsl lines 66 and again in line 86 (TC8):
>>
>> 25-May-2015 00:30:27.121 SEVERE [main]
>> org.apache.coyote.AbstractProtocol.init Failed to initialize end point
>> associated with ProtocolHandler ["http-apr-127.0.0.1-auto-1-40424"]
>> java.lang.Exception: Unable to create SSLContext. Check that SSLEngine
>> is enabled in the AprLifecycleListener, the AprLifecycleListener has
>> initialised correctly and that a valid SSLProtocol has been specified
>> at
>> org.apache.tomcat.util.net.AprEndpoint.bind(AprEndpoint.java:538)
>> at
>> org.apache.tomcat.util.net.AbstractEndpoint.init(AbstractEndpoint.java:737)
>>
>>
>> As a consequence the handshakes hangs:
>>
>>
>> Testcase: testSimpleSsl took 1,006.091 sec
>> Caused an ERROR
>> Read timed out
>> java.net.SocketTimeoutException: Read timed out
>> at java.net.SocketInputStream.socketRead0(Native Method)
>> ...
>> at
>> sun.net.www.protocol.https.HttpsClient.afterConnect(HttpsClient.java:559)
>> ...
>> org.apache.tomcat.util.net.TestSsl.testSimpleSsl(TestSsl.java:67)
>>
>>
>> I did a little svn archaelogy and I think the problem goes back to
>> revision r1433976 in AprEndpoint where the following code block
>>
>>
>> -// Check timeouts (much less frequently than polling)
>> -if (maintainTime > 100L && running) {
>> -maintainTime = 0;
>> -if (socketProperties.getSoTimeout() > 0) {
>> -doTimeout(connectionPollset);
>> -}
>> -}
>>
>>
>> changed into
>>
>>
>> +// Process socket timeouts
>> +if (getSoTimeout() > 0 && maintain++ > 1000 &&
>> running) {
>> +// This works and uses only one timeout
>> mechanism for everything, but the
>> +// non event poller might be a bit faster by
>> using the old maintain.
>> +maintain = 0;
>> +maintain();
>> }
>>
>> The commit contains many more changes, but I think the problem can be
>> localized in this block. In APR maintainTime is in microseconds (it is
>> incremented with pollTime which is in microseconds), so 100L is one
>> second. The new block counts maintain and I think that is incremented
>> once per second, so we switch from a 100 microsecond = 1 second
>> condition to a 1000 second condition.
>>
>> I'm not sure whether it is better to simply check for maintain++ > 1 (or
>>> = 1) or switch back to summing up pollTime.Needs more investigation.
>
> Looking at it now. I think there are some simplifications that can be
> made but I need to look into the more closely.
OK. I think I am done now (but I'm waiting for the CI to confirm there
are no new timeout issues in async etc. that my local testing hasn't
spotted).
Mark
-
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
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/271 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] 1681730 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
Re: buildbot failure in ASF Buildbot on tomcat-8-trunk
2015-05-26 13:39 GMT+03:00 Rainer Jung : > Apart from the one failed test (BIO TestWebSocketFrameClient) CI logs all > tests as having skipped tests, because the test run output does not contain > "Skipped: 0" (checked in our build.xml). > > Locally executed tests print: > > [junit] Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: > 0.615 sec > > on the CI system: > > [junit] Tests run: 23, Failures: 0, Errors: 0, Time elapsed: 0.095 sec > > Is that a version inconsistency? Both should run with our configured junit > 4.11, but maybe the CI system has another junit in the CLASSPATH? It is odd. Looking at logs there. The oldest logs have "Skipped" in them. http://ci.apache.org/projects/tomcat/tomcat8/logs/ By dichotomy: http://ci.apache.org/projects/tomcat/tomcat8/logs/1667637/ - Good (19-Mar-2015 01:45) http://ci.apache.org/projects/tomcat/tomcat8/logs/1667747/ - Bad (19-Mar-2015 14:27) http://svn.apache.org/viewvc?view=revision&revision=r1667747 is "Trivial Javadoc fix (mainly to test CI system)" The oldest build available at the server is http://ci.apache.org/builders/tomcat-8-trunk/builds/172 (Mon Mar 23 08:33:14 2015) >From mail archive: [http://mail-archives.apache.org/mod_mbox/tomcat-dev/201503.mbox/%3C550AA0CB.80009%40apache.org%3E] "Buildbot slave changes" [quote, Mark wrote] I have just moved trunk, tomcat-8 and tomcat-6 (tomcat-7 was there already) buildbot builds to a new slave. There main aim is to get faster builds. A combination of a physical machine rather than an overstretched VM and not being on the same slave as the resource intensive sling builds should result is a significant speed up. I imagine I broke a bunch of stuff with the move. Apologies in advance and I'll get it fixed as quickly as I can. At the same time I fixed the issues that meant the tomcat-7 builds weren't building the Windows installer and weren't running RAT. [/quote] Tomcat trunk, Tomcat 7 builders have the same problem. (Trunk uses a different version of Cobertura, I have not backported r1663472. I mean that the local build likely has not enabled Cobertura. So it is not it.) Maybe the version of Apache Ant? E.g. Ant having junit jars in its lib directory? Or just an old version of Ant? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULT][VOTE] Release Apache Tomcat 8.0.23
The 8.0.23 is already on mirror servers. There have been no announcement yet, nor website update. I added the version number into Bugzilla. Best regards, Konstantin Kolinko 2015-05-22 12:42 GMT+03:00 Mark Thomas : > Closing the vote now so I have a chance to get the release out before > the weekend. > > The votes cast were as follows: > > Binding: > stable: markt, kfujino, remm, jfarcand, kkolinko, schultz, violetagg > > Non-binding: > stable: fschumacher > > The vote therefore passes. > > I'll start pushing the release out. > > Thanks to everyone who tested this. > > Mark > > > On 19/05/2015 19:43, Mark Thomas wrote: >> The proposed Apache Tomcat 8.0.23 release is now available for voting. >> >> The main changes since 8.0.22 are: >> - Fixed corruption issues with NIO2 and TLS >> >> - Added a workaround for SPNEGO authentication and a JRE regression >> in Java 8 update 40 onwards >> >> - Added the new HttpHeaderSecurityFilter >> >> There is a small collection of bug fixes, new features and >> performance improvements. For full details, see the changelog: >> http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml >> >> It can be obtained from: >> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.23/ >> The Maven staging repo is: >> https://repository.apache.org/content/repositories/orgapachetomcat-1045/ >> The svn tag is: >> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_23/ >> >> The proposed 8.0.23 release is: >> [ ] Broken - do not release >> [ ] Stable - go ahead and release as 8.0.23 >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
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/1263 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] 1681743 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: r1681770 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java Constants.java SSLHostConfig.java jsse/openssl/OpenSSLCipherConfigurationParser.java jsse/openssl/Protocol.jav
Author: rjung
Date: Tue May 26 14:59:04 2015
New Revision: 1681770
URL: http://svn.apache.org/r1681770
Log:
Use constants for SSL/TLS protocol names
to reduce chances of fatal consequences of
string typos.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1681770&r1=1681769&r2=1681770&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue May 26
14:59:04 2015
@@ -378,19 +378,19 @@ public class AprEndpoint extends Abstrac
value = SSL.SSL_PROTOCOL_ALL;
} else {
for (String protocol : sslHostConfig.getProtocols()) {
-if ("SSLv2Hello".equalsIgnoreCase(protocol)) {
+if
(Constants.SSL_PROTO_SSLv2Hello.equalsIgnoreCase(protocol)) {
// NO-OP. OpenSSL always supports SSLv2Hello
-} else if ("SSLv2".equalsIgnoreCase(protocol)) {
+} else if
(Constants.SSL_PROTO_SSLv2.equalsIgnoreCase(protocol)) {
value |= SSL.SSL_PROTOCOL_SSLV2;
-} else if ("SSLv3".equalsIgnoreCase(protocol)) {
+} else if
(Constants.SSL_PROTO_SSLv3.equalsIgnoreCase(protocol)) {
value |= SSL.SSL_PROTOCOL_SSLV3;
-} else if ("TLSv1".equalsIgnoreCase(protocol)) {
+} else if
(Constants.SSL_PROTO_TLSv1.equalsIgnoreCase(protocol)) {
value |= SSL.SSL_PROTOCOL_TLSV1;
-} else if ("TLSv1.1".equalsIgnoreCase(protocol)) {
+} else if
(Constants.SSL_PROTO_TLSv1_1.equalsIgnoreCase(protocol)) {
value |= SSL.SSL_PROTOCOL_TLSV1_1;
-} else if ("TLSv1.2".equalsIgnoreCase(protocol)) {
+} else if
(Constants.SSL_PROTO_TLSv1_2.equalsIgnoreCase(protocol)) {
value |= SSL.SSL_PROTOCOL_TLSV1_2;
-} else if ("all".equalsIgnoreCase(protocol)) {
+} else if
(Constants.SSL_PROTO_ALL.equalsIgnoreCase(protocol)) {
value |= SSL.SSL_PROTOCOL_ALL;
} else {
// Protocol not recognized, fail to start as it is
safer than
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Constants.java?rev=1681770&r1=1681769&r2=1681770&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Constants.java Tue May 26
14:59:04 2015
@@ -23,4 +23,16 @@ public class Constants {
* the tomcat instance installation path
*/
public static final String CATALINA_BASE_PROP = "catalina.base";
+
+/**
+ * JSSE and OpenSSL protocol names
+ */
+public static final String SSL_PROTO_ALL= "all";
+public static final String SSL_PROTO_TLS= "TLS";
+public static final String SSL_PROTO_TLSv1_2= "TLSv1.2";
+public static final String SSL_PROTO_TLSv1_1= "TLSv1.1";
+public static final String SSL_PROTO_TLSv1 = "TLSv1";
+public static final String SSL_PROTO_SSLv3 = "SSLv3";
+public static final String SSL_PROTO_SSLv2 = "SSLv2";
+public static final String SSL_PROTO_SSLv2Hello = "SSLv2Hello";
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1681770&r1=1681769&r2=1681770&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Tue May 26
14:59:04 2015
@@ -66,7 +66,7 @@ public class SSLHostConfig {
private String keyManagerAlgorithm =
KeyManagerFactory.getDefaultAlgorithm();
private int sessionCacheSize = 0;
private int sessionTimeout = 86400;
-private String sslProtocol = "TLS";
+private String sslProtocol = Constants.SSL_PROTO_TLS;
svn commit: r1681773 - /tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
Author: markt
Date: Tue May 26 15:15:44 2015
New Revision: 1681773
URL: http://svn.apache.org/r1681773
Log:
Avoid NPEs so tests fail rather than error
Modified:
tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java?rev=1681773&r1=1681772&r2=1681773&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/SimpleHttpClient.java Tue May
26 15:15:44 2015
@@ -394,52 +394,60 @@ public abstract class SimpleHttpClient {
responseBody = null;
}
+public boolean responseLineStartsWith(String expected) {
+String line = getResponseLine();
+if (line == null) {
+return false;
+}
+return line.startsWith(expected);
+}
+
public boolean isResponse100() {
-return getResponseLine().startsWith(INFO_100);
+return responseLineStartsWith(INFO_100);
}
public boolean isResponse200() {
-return getResponseLine().startsWith(OK_200);
+return responseLineStartsWith(OK_200);
}
public boolean isResponse302() {
-return getResponseLine().startsWith(REDIRECT_302);
+return responseLineStartsWith(REDIRECT_302);
}
public boolean isResponse303() {
-return getResponseLine().startsWith(REDIRECT_303);
+return responseLineStartsWith(REDIRECT_303);
}
public boolean isResponse400() {
-return getResponseLine().startsWith(FAIL_400);
+return responseLineStartsWith(FAIL_400);
}
public boolean isResponse404() {
-return getResponseLine().startsWith(FAIL_404);
+return responseLineStartsWith(FAIL_404);
}
public boolean isResponse408() {
-return getResponseLine().startsWith(TIMEOUT_408);
+return responseLineStartsWith(TIMEOUT_408);
}
public boolean isResponse413() {
-return getResponseLine().startsWith(FAIL_413);
+return responseLineStartsWith(FAIL_413);
}
public boolean isResponse417() {
-return getResponseLine().startsWith(FAIL_417);
+return responseLineStartsWith(FAIL_417);
}
public boolean isResponse50x() {
-return getResponseLine().startsWith(FAIL_50X);
+return responseLineStartsWith(FAIL_50X);
}
public boolean isResponse500() {
-return getResponseLine().startsWith(FAIL_500);
+return responseLineStartsWith(FAIL_500);
}
public boolean isResponse501() {
-return getResponseLine().startsWith(FAIL_501);
+return responseLineStartsWith(FAIL_501);
}
public Socket getSocket() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681779 - in /tomcat/trunk: java/org/apache/tomcat/util/net/LocalStrings.properties java/org/apache/tomcat/util/net/SSLHostConfig.java webapps/docs/config/http.xml
Author: rjung
Date: Tue May 26 15:37:39 2015
New Revision: 1681779
URL: http://svn.apache.org/r1681779
Log:
Supporting "+" and "-" syntax in SSL protocol
(OpenSSL) only.
This allows settings like "all-TLSv1" (or if you
prefer "all,-TLSv1"). The preferred way to add
protocols now is to use an explicit "+" prefix.
If you omit the "+" (except for the first token
in the list) you get a warning. The list is always
build starting with an empty list, even if the
first token has a "+" prefix.
This is similar to the mod_ssl behavior. It differs
in the handling of a token without "+" or "-":
mod_ssl would reset the list, we just add to the list,
both for compatibility reasons.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1681779&r1=1681778&r2=1681779&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Tue
May 26 15:37:39 2015
@@ -115,4 +115,5 @@ socket.apr.write.error=Unexpected error
socket.apr.closed=The socket [{0}] associated with this connection has been
closed.
sslHostConfig.certificateVerificationInvalid=The certificate verification
value [{0}] is not recognised
-sslHostConfig.mismatch=The property [{0}] was set on the SSLHostConfig named
[{1}] but this property is for connectors of type [{2}] by the SSLHostConfig is
being used with a connector of type [{3}]
\ No newline at end of file
+sslHostConfig.mismatch=The property [{0}] was set on the SSLHostConfig named
[{1}] but this property is for connectors of type [{2}] by the SSLHostConfig is
being used with a connector of type [{3}]
+sslHostConfig.prefix_missing=The protocol [{0}] was added to the list of
protocols on the SSLHostConfig named [{1}]. Check if a +/- prefix is missing.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1681779&r1=1681778&r2=1681779&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Tue May 26
15:37:39 2015
@@ -39,6 +39,14 @@ public class SSLHostConfig {
private static final StringManager sm =
StringManager.getManager(SSLHostConfig.class);
protected static final String DEFAULT_SSL_HOST_NAME = "_default_";
+protected static final Set SSL_PROTO_ALL = new HashSet<>();
+
+static {
+SSL_PROTO_ALL.add(Constants.SSL_PROTO_SSLv2Hello);
+SSL_PROTO_ALL.add(Constants.SSL_PROTO_TLSv1);
+SSL_PROTO_ALL.add(Constants.SSL_PROTO_TLSv1_1);
+SSL_PROTO_ALL.add(Constants.SSL_PROTO_TLSv1_2);
+}
private Type configType = null;
private Map> configuredProperties = new HashMap<>();
@@ -230,21 +238,50 @@ public class SSLHostConfig {
public void setProtocols(String input) {
-// OpenSSL and JSSE use the same names.
-String[] values = input.split(",|\\+");
-
protocols.clear();
-for (String value: values) {
+// List of protocol names, separated by ",", "+" or "-".
+// Semantics is adding ("+") or removing ("-") from left
+// to right, starting with an empty protocol set.
+// Tokens are individual protocol names or "all" for a
+// default set of suppported protocols.
+// Separator "," is only kept for compatibility and has the
+// same semantics as "+", except that it warns about a potentially
+// missing "+" or "-".
+
+// Split using a positive lookahead to keep the separator in
+// the capture so we can check which case it is.
+for (String value: input.split("(?=[-+,]")) {
String trimmed = value.trim();
-if (trimmed.length() > 0) {
-if (input.trim().equalsIgnoreCase(Constants.SSL_PROTO_ALL)) {
-protocols.add(Constants.SSL_PROTO_SSLv2Hello);
-protocols.add(Constants.SSL_PROTO_TLSv1);
-protocols.add(Constants.SSL_PROTO_TLSv1_1);
-protocols.add(Constants.SSL_PROTO_TLSv1_2);
+// Ignore token which only consists or prefix character
+if (trimmed.length() > 1) {
+if (trimmed.charAt(0) == '+') {
+trimmed = trimmed.substring(1).trim();
+if (trimmed.equalsIgnoreCase(Constants.SSL_PROTO_ALL)) {
+protocols.a
TC trunk: protocol in SSLHostConfig only for OpenSSL?
I'm a bit confused: is "protocol" in SSLHostConfig only for OpenSSL, or also for JSSE? There's also sslProtocol, which seems to be for JSSE but the docs looked like protocol were for both. Or is it work in progress? Thanks for any hints. Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: TC trunk: protocol in SSLHostConfig only for OpenSSL?
2015-05-26 17:40 GMT+02:00 Rainer Jung : > I'm a bit confused: is "protocol" in SSLHostConfig only for OpenSSL, or > also for JSSE? There's also sslProtocol, which seems to be for JSSE but the > docs looked like protocol were for both. Or is it work in progress? > No, "protocols" is used for both types. "sslProtocol" is JSSE only since it would be the JCE provider name (as in javax.net.ssl.SSLContext.getInstance(sslProtocol)). Since I think this is mostly unusable, configuration doesn't look very useful (it should be "TLS"). Rémy
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1265 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] 1681779 Blamelist: markt,rjung BUILD FAILED: exception svn upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681793 - /tomcat/trunk/webapps/docs/config/http.xml
Author: rjung Date: Tue May 26 16:52:58 2015 New Revision: 1681793 URL: http://svn.apache.org/r1681793 Log: Remove erroneous addition introduced in r1681779. Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1681793&r1=1681792&r2=1681793&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Tue May 26 16:52:58 2015 @@ -1218,7 +1218,6 @@ - OpenSSL only, for JSSE use sslProtocol. The names of the protocols to support when communicating with clients. This should be a list of any combination of the following: @@ -1256,7 +1255,7 @@ - JSSE only, for OpenSSL use protocols. + JSSE only. The the SSL protocol(s) to use (a single value may enable multiple protocols - see the JVM documentation for details). If not specified, the default is TLS. The permitted values may be obtained from the - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681794 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
Author: markt
Date: Tue May 26 17:20:12 2015
New Revision: 1681794
URL: http://svn.apache.org/r1681794
Log:
Fix NIO2 test failures.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1681794&r1=1681793&r2=1681794&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Tue May
26 17:20:12 2015
@@ -22,7 +22,6 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.util.net.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
-import org.apache.tomcat.util.net.Nio2Endpoint.Nio2SocketWrapper;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -109,9 +108,8 @@ public class Http11Nio2Protocol extends
if (socket.isAsync()) {
((Nio2Endpoint)
getProtocol().getEndpoint()).removeTimeout(socket);
}
-if (addToPoller) {
-((Nio2SocketWrapper) socket).awaitBytes();
-}
+// No need to add to poller. read() will have already been called
+// with an appropriate completion handler.
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: TC trunk: protocol in SSLHostConfig only for OpenSSL?
On 26/05/2015 17:02, Rémy Maucherat wrote: > 2015-05-26 17:40 GMT+02:00 Rainer Jung : > >> I'm a bit confused: is "protocol" in SSLHostConfig only for OpenSSL, or >> also for JSSE? There's also sslProtocol, which seems to be for JSSE but the >> docs looked like protocol were for both. Or is it work in progress? >> > > No, "protocols" is used for both types. +1. > "sslProtocol" is JSSE only since it would be the JCE provider name (as in > javax.net.ssl.SSLContext.getInstance(sslProtocol)). Since I think this is > mostly unusable, configuration doesn't look very useful (it should be > "TLS"). I agree and I was tempted to remove it in the recent refactoring but I kept it on the grounds we have gone in the direction of exposing as many of the configuration options as possible. It wouldn't take much to convince me to remove this if that is what folks here would prefer. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULT][VOTE] Release Apache Tomcat 8.0.23
On 26/05/2015 13:29, Konstantin Kolinko wrote: > The 8.0.23 is already on mirror servers. > There have been no announcement yet, nor website update. I know. It is on the (rather long) TODO list for today. I should get to it shortly. > I added the version number into Bugzilla. Thanks. Mark > > Best regards, > Konstantin Kolinko > > 2015-05-22 12:42 GMT+03:00 Mark Thomas : >> Closing the vote now so I have a chance to get the release out before >> the weekend. >> >> The votes cast were as follows: >> >> Binding: >> stable: markt, kfujino, remm, jfarcand, kkolinko, schultz, violetagg >> >> Non-binding: >> stable: fschumacher >> >> The vote therefore passes. >> >> I'll start pushing the release out. >> >> Thanks to everyone who tested this. >> >> Mark >> >> >> On 19/05/2015 19:43, Mark Thomas wrote: >>> The proposed Apache Tomcat 8.0.23 release is now available for voting. >>> >>> The main changes since 8.0.22 are: >>> - Fixed corruption issues with NIO2 and TLS >>> >>> - Added a workaround for SPNEGO authentication and a JRE regression >>> in Java 8 update 40 onwards >>> >>> - Added the new HttpHeaderSecurityFilter >>> >>> There is a small collection of bug fixes, new features and >>> performance improvements. For full details, see the changelog: >>> http://svn.us.apache.org/repos/asf/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml >>> >>> It can be obtained from: >>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.23/ >>> The Maven staging repo is: >>> https://repository.apache.org/content/repositories/orgapachetomcat-1045/ >>> The svn tag is: >>> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_23/ >>> >>> The proposed 8.0.23 release is: >>> [ ] Broken - do not release >>> [ ] Stable - go ahead and release as 8.0.23 >>> >>> - >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >>> For additional commands, e-mail: dev-h...@tomcat.apache.org >>> >> >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1681794 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
2015-05-26 19:20 GMT+02:00 : > Author: markt > Date: Tue May 26 17:20:12 2015 > New Revision: 1681794 > > URL: http://svn.apache.org/r1681794 > Log: > Fix NIO2 test failures. > > I don't understand what these failures suddenly come from, but this is likely wrong: it is possible there is no pending read. Rémy
Re: End of life for 6.0.x
On 22/05/2015 03:33, Jeanfrancois Arcand wrote: > > On 2015-05-21 5:06 PM, Rémy Maucherat wrote: >> 2015-05-14 15:14 GMT+02:00 Mark Thomas : >> >>> Option 1: Tomcat 6.0.x EOL as of 30 June 2016 >>> Option 2: Tomcat 6.0.x EOL as of 31 December 2016 >>> >> It has been around for a very long time (2007) but it is a very >> significant >> release, so option 2 is probably better. OTOH, I am not actually doing >> much >> to help, so my vote is only a personal opinion. > +1 OK. General preference for 31 December 2016 and no strong objections to that date. Unless I see any objections, I plan to go ahead and formally announce this next week. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1681794 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
On 26/05/2015 18:27, Rémy Maucherat wrote: > 2015-05-26 19:20 GMT+02:00 : > >> Author: markt >> Date: Tue May 26 17:20:12 2015 >> New Revision: 1681794 >> >> URL: http://svn.apache.org/r1681794 >> Log: >> Fix NIO2 test failures. >> > I don't understand what these failures suddenly come from, but this is > likely wrong: it is possible there is no pending read. The failures are timing related. I suspect they were always possible and just become more likely when I tweaked the code around non-blocking read of the request line. The problem was that there were two reads in progress. One from the read triggered by the non-blocking read of the request line and one from the awaitBytes() call triggered if the above non-blocking read returned zero. What are the scenarios that we do need to call awaitBytes() ? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1681794 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
2015-05-26 19:32 GMT+02:00 Mark Thomas :
> On 26/05/2015 18:27, Rémy Maucherat wrote:
> > 2015-05-26 19:20 GMT+02:00 :
> >
> >> Author: markt
> >> Date: Tue May 26 17:20:12 2015
> >> New Revision: 1681794
> >>
> >> URL: http://svn.apache.org/r1681794
> >> Log:
> >> Fix NIO2 test failures.
> >>
> > I don't understand what these failures suddenly come from, but this is
> > likely wrong: it is possible there is no pending read.
>
> The failures are timing related. I suspect they were always possible and
> just become more likely when I tweaked the code around non-blocking read
> of the request line.
>
> The problem was that there were two reads in progress. One from the read
> triggered by the non-blocking read of the request line and one from the
> awaitBytes() call triggered if the above non-blocking read returned zero.
>
> What are the scenarios that we do need to call awaitBytes() ?
>
So addToPoller needed to be true, that only happens for simple HTTP/1.1
keepalive. I don't see any guarantee there's a pending read really, so it
sounds logical to me.
As far as I am concerned, the tweaking of the request line looks wrong.
if (pos >= lastValid) {
-if (useAvailableDataOnly) {
-return false;
+if (keptAlive) {
+// Haven't read any request data yet so use the
keep-alive
+// timeout.
+
wrapper.setReadTimeout(wrapper.getEndpoint().getKeepAliveTimeout());
}
Ok to change the timeout if you like (although for NIO2 it's meaningless if
the operation is already pending), but more importantly why is the "return
false" gone ?
Rémy
Re: TC trunk: protocol in SSLHostConfig only for OpenSSL?
Am 26.05.2015 um 18:02 schrieb Rémy Maucherat: 2015-05-26 17:40 GMT+02:00 Rainer Jung : I'm a bit confused: is "protocol" in SSLHostConfig only for OpenSSL, or also for JSSE? There's also sslProtocol, which seems to be for JSSE but the docs looked like protocol were for both. Or is it work in progress? No, "protocols" is used for both types. "sslProtocol" is JSSE only since it would be the JCE provider name (as in javax.net.ssl.SSLContext.getInstance(sslProtocol)). Since I think this is mostly unusable, configuration doesn't look very useful (it should be "TLS"). OK, thanks Rémy, I corrected a wrong addition I had put into the docs. Related: JSSE by default uses "supported protocols minus everything that includes SSL". APR uses all="TLSv1+TLSv1_1+TLSv1_2+SSVl2Hello". It is a blacklist approach versus a whitelist approach (for the defaults). This will drift apart once new protocols like TLS 1.3 get introduced. I wonder whether we want to harmonize handling of default/all between OpenSSL and JSSE. If a new protocol shows up, for JSSE I assume you'd have to update the JVM only. For APR you'd have to update the OpenSSL underneath tcnative plus Tomcat. I know that new protocols show up only very rarely but I wonder whether we want to use the same approach in both JSSE and OpenSSL and whether it would be a blacklist approach like in JSSE or a whitelist approach like in APR. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: TC trunk: protocol in SSLHostConfig only for OpenSSL?
On 26/05/2015 18:59, Rainer Jung wrote: > Am 26.05.2015 um 18:02 schrieb Rémy Maucherat: >> 2015-05-26 17:40 GMT+02:00 Rainer Jung : >> >>> I'm a bit confused: is "protocol" in SSLHostConfig only for OpenSSL, or >>> also for JSSE? There's also sslProtocol, which seems to be for JSSE >>> but the >>> docs looked like protocol were for both. Or is it work in progress? >>> >> >> No, "protocols" is used for both types. >> >> "sslProtocol" is JSSE only since it would be the JCE provider name (as in >> javax.net.ssl.SSLContext.getInstance(sslProtocol)). Since I think this is >> mostly unusable, configuration doesn't look very useful (it should be >> "TLS"). > > OK, thanks Rémy, I corrected a wrong addition I had put into the docs. > > Related: JSSE by default uses "supported protocols minus everything that > includes SSL". APR uses all="TLSv1+TLSv1_1+TLSv1_2+SSVl2Hello". It is a > blacklist approach versus a whitelist approach (for the defaults). > > This will drift apart once new protocols like TLS 1.3 get introduced. I > wonder whether we want to harmonize handling of default/all between > OpenSSL and JSSE. > > If a new protocol shows up, for JSSE I assume you'd have to update the > JVM only. For APR you'd have to update the OpenSSL underneath tcnative > plus Tomcat. I know that new protocols show up only very rarely but I > wonder whether we want to use the same approach in both JSSE and OpenSSL > and whether it would be a blacklist approach like in JSSE or a whitelist > approach like in APR. I think a default of everything we know is supported less those we know are not secure. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1681794 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
On 26/05/2015 18:41, Rémy Maucherat wrote:
My understanding of your response was that you are now happy with that
change. Shout if that is not the case.
> As far as I am concerned, the tweaking of the request line looks wrong.
>
> if (pos >= lastValid) {
> -if (useAvailableDataOnly) {
> -return false;
> +if (keptAlive) {
> +// Haven't read any request data yet so use the
> keep-alive
> +// timeout.
> +
> wrapper.setReadTimeout(wrapper.getEndpoint().getKeepAliveTimeout());
> }
>
> Ok to change the timeout if you like (although for NIO2 it's meaningless if
> the operation is already pending),
The keepAliveTimeout is only changed in the case where:
- keep-alive is enabled
- there is no more data in the read buffer
- a non-blocking read is required for the first byte (or more) of the
next request
In all other cases the soTimeout is used.
> but more importantly why is the "return false" gone ?
It was a left over from the attempt to make BIO support more connections
than it had threads by not doing an immediate read on a keep-alive
connection. It was no longer required. There is another "return false"
in the correct place in the next if block.
Mark
-
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
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/1266 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] 1681793 Blamelist: rjung 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: r1681807 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
Author: remm
Date: Tue May 26 18:31:20 2015
New Revision: 1681807
URL: http://svn.apache.org/r1681807
Log:
It works better like this.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1681807&r1=1681806&r2=1681807&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Tue May 26
18:31:20 2015
@@ -251,7 +251,7 @@ public class SSLHostConfig {
// Split using a positive lookahead to keep the separator in
// the capture so we can check which case it is.
-for (String value: input.split("(?=[-+,]")) {
+for (String value: input.split("(?=[-+,])")) {
String trimmed = value.trim();
// Ignore token which only consists or prefix character
if (trimmed.length() > 1) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1681794 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
2015-05-26 20:17 GMT+02:00 Mark Thomas : > It was a left over from the attempt to make BIO support more connections > than it had threads by not doing an immediate read on a keep-alive > connection. It was no longer required. There is another "return false" > in the correct place in the next if block. > > The testsuite still fails with NIO2, so something has to be wrong :) Calling fill is not a noop, for starters. Rémy
Re: svn commit: r1681794 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
On 26/05/2015 19:33, Rémy Maucherat wrote: > 2015-05-26 20:17 GMT+02:00 Mark Thomas : > >> It was a left over from the attempt to make BIO support more connections >> than it had threads by not doing an immediate read on a keep-alive >> connection. It was no longer required. There is another "return false" >> in the correct place in the next if block. >> >> The testsuite still fails with NIO2, so something has to be wrong :) It hasn't had a chance to run with my fix yet. > Calling fill is not a noop, for starters. No it isn't. The read may complete in-line and if it doesn't it the completion handler will be called when it has completed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681810 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: markt
Date: Tue May 26 18:38:59 2015
New Revision: 1681810
URL: http://svn.apache.org/r1681810
Log:
Update for 8.0.23 release (excluding Javadoc)
Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-8.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml
Modified: tomcat/site/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1681810&r1=1681809&r2=1681810&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Tue May 26 18:38:59 2015
@@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to
# - Tomcat versions -
tomcat60=6.0.43
tomcat70=7.0.62
-tomcat80=8.0.22
+tomcat80=8.0.23
# - Download destination -
Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1681810&r1=1681809&r2=1681810&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Tue May 26 18:38:59 2015
@@ -57,8 +57,8 @@
Latest Stable 8.0.x Release
-2015-05-05
-8.0.22
+2015-05-22
+8.0.23
Modified: tomcat/site/trunk/docs/download-80.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1681810&r1=1681809&r2=1681810&view=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Tue May 26 18:38:59 2015
@@ -206,7 +206,7 @@
Quick Navigation
-[define v]8.0.22[end]
+[define v]8.0.23[end]
https://www.apache.org/dist/tomcat/tomcat-8/KEYS";>KEYS |
[v] |
Browse |
Modified: tomcat/site/trunk/docs/index.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1681810&r1=1681809&r2=1681810&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue May 26 18:38:59 2015
@@ -227,6 +227,42 @@ project logo are trademarks of the Apach
+
+2015-05-22 Tomcat 8.0.23 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 8.0.23
+of Apache Tomcat. Apache Tomcat 8.0.23 includes a numerous fixes for issues
+identified in 8.0.22 as well as a number of other enhancements and changes. The
+notable changes since 8.0.22 include:
+
+
+
+Fixed corruption issues with NIO2 and TLS
+
+Added a workaround for SPNEGO authentication and a JRE regression in Java 8
+update 40 onwards
+
+Added the new HttpHeaderSecurityFilter
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8
+changelog.
+
+
+
+
+
+Download
+
+
+
+
2015-05-14 Tomcat 7.0.62 Released
@@ -276,64 +312,6 @@ Apache Tomcat. This release includes a n
-
-
-2015-05-05 Tomcat 8.0.22 Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 8.0.22
-of Apache Tomcat. Apache Tomcat 8.0.22 includes a numerous fixes for issues
-identified in 8.0.21 as well as a number of other enhancements and changes. The
-notable changes since 8.0.21 include:
-
-
-
-Change the format of the Tomcat specific URLs for resources inside JARs
- that are in turn packed in a WAR. The ^/ sequence has been
- replaced by */ so that the resulting URLs are compliant with
- RFC 2396 and do not trigger exceptions when converted to URIs. The old
- format will continue to be accepted.
-
-Allow logging of the remote port in the access log using the format
- pattern %{remote}p.
-
-When checking last modified times as part of the automatic deployment
- process, account for the fact that File.lastModified() has a resolution
of
- one second to ensure that if a file has been modified within the last
- second, the latest version of the file is always used. Note that a
- side-effect of this change is that files with modification times in the
- future are treated as if they are unmodified.
-
-Align redeploy resource modification checking with reload modification
- checking so that now, in both cases, a change in modification time rather
- than an increase in modification time is used to determine if the
Re: svn commit: r1681794 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
2015-05-26 20:37 GMT+02:00 Mark Thomas : > On 26/05/2015 19:33, Rémy Maucherat wrote: > > 2015-05-26 20:17 GMT+02:00 Mark Thomas : > > > >> It was a left over from the attempt to make BIO support more connections > >> than it had threads by not doing an immediate read on a keep-alive > >> connection. It was no longer required. There is another "return false" > >> in the correct place in the next if block. > >> > >> The testsuite still fails with NIO2, so something has to be wrong :) > > It hasn't had a chance to run with my fix yet. > > That is correct, I thought the previous one had it already. Rémy
svn commit: r1681813 - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/
Author: markt Date: Tue May 26 18:47:46 2015 New Revision: 1681813 URL: http://svn.apache.org/r1681813 Log: Update for 8.0.23 release (Javadoc) [This commit notification would consist of 58 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 8.0.23 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.0.23. Apache Tomcat 8 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language and Java WebSocket technologies. Apache Tomcat 8.0.23 includes numerous fixes for issues identified in 8.0.22 as well as a number of other enhancements and changes. The notable changes since 8.0.22 include: - Fixed corruption issues with NIO2 and TLS - Added a workaround for SPNEGO authentication and a JRE regression in Java 8 update 40 onwards - Added the new HttpHeaderSecurityFilter Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-8.0-doc/changelog.html Downloads: http://tomcat.apache.org/download-80.cgi Migration guides from Apache Tomcat 5.5.x, 6.0.x and 7.0.x: http://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1681807 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
Am 26.05.2015 um 20:31 schrieb r...@apache.org:
Author: remm
Date: Tue May 26 18:31:20 2015
New Revision: 1681807
URL: http://svn.apache.org/r1681807
Log:
It works better like this.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1681807&r1=1681806&r2=1681807&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Tue May 26
18:31:20 2015
@@ -251,7 +251,7 @@ public class SSLHostConfig {
// Split using a positive lookahead to keep the separator in
// the capture so we can check which case it is.
-for (String value: input.split("(?=[-+,]")) {
+for (String value: input.split("(?=[-+,])")) {
String trimmed = value.trim();
// Ignore token which only consists or prefix character
if (trimmed.length() > 1) {
Thanks, I had it running in a separate test class but then a copy&paste
error crept in. Oh well...
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57701] Implement "[Redeploy]" button for a web application
https://bz.apache.org/bugzilla/show_bug.cgi?id=57701 --- Comment #3 from Mark Thomas --- I'm not convinced of the need for this feature but I don't object to it being added. Overall the patch looks good. There is the odd s/reload/redploy/ required but that looks like copy/paste errors and is easily fixed. I'm more concerned that the actual redeploy code is not correct. The issues I could see from a code inspection (I haven't tried applying the patch) are: - it assumes that the web application is deployed as a WAR - it assumes autoDeployment is enabled - it doesn't mark the web application as being serviced I'd expect to see the following: - the context marked as serviced - the context removed from the host - check() being used to redeploy it - the serviced mark removed from the host -- 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
[Tomcat Wiki] Update of "TomcatGridDiscussion" by markt
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "TomcatGridDiscussion" page has been changed by markt:
https://wiki.apache.org/tomcat/TomcatGridDiscussion?action=diff&rev1=16&rev2=17
Comment:
Comment addressed. Remove it and edit the doc slightly so it flows better.
Later versions of the Grid include "collection" management. This allows to
group subsets of services (Tomcat instances and Grid Agents), so they can be
operated as whole. Each collection can include plain services, or other
collections (recursively).
+ Below is a general overview of the software modules and their
responsibilities.
- Considering all the above, the following phases could be considered as a base
line for the road map of the Tomcat Grid.
-
- ''__markt__: I'd like to see a little more high level architecture to steer
development. For example, is there a common core of management functionality
that we then wrap with a web-based GUI and a CLI? That would allow others to
write other wrappers to plug this into other tools.''
-
- ''__vlad__: I would like to provide as much detail as you need, but I'm
afraid I still I don't quite understand exactly what you do you refer as the
architecture. Anyway, below is a general overview of the software modules and
their responsibilities.''
{{attachment:TomcatGridSoftwareModules.png}}
@@ -108, +104 @@
* Grid Agent Primitives for Other
''
+ Considering all the above, the following phases could be considered as a base
line for the road map of the Tomcat Grid.
+
== Phase 1 - Core Grid Operation ==
The first phase includes the most basic features, in order to provide a
functioning and useful first version of the Grid.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1268 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] 1681807 Blamelist: remm BUILD FAILED: exception svn upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56438] If jar scan does not find context config or TLD config, log a message
https://bz.apache.org/bugzilla/show_bug.cgi?id=56438 --- Comment #21 from Mark Thomas --- The proposed patch treats the annotation scan and the fragment scan as independent scans. Unfortunately this is not the case. The patch also ignores the scanning for @HandlesType matches. Take a look at the comment at the start of ContextConfig.webConfig(). Some things to keep in mind: - The annotation scan and the @HandleTypes scan are done at the same time. - The annotation scan can be disabled via metadata-complete - metadata-complete has no impact on @HandleTypes scan - exclusion via absolute ordering excludes a JAR from all three scans I think there are two options. 1. Log a message suggesting the JAR is skipped if it has no hits for all three scans. 2. As 1 but also log a message for JARs that have unnecessary annotation scans that they could use metadata-complete. (Your current patch pretty much does this already.) -- 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: r1681837 - in /tomcat/trunk: LICENSE NOTICE
Author: markt Date: Tue May 26 20:12:11 2015 New Revision: 1681837 URL: http://svn.apache.org/r1681837 Log: Be more specific about the Eclipse Compiler we depend on Modified: tomcat/trunk/LICENSE tomcat/trunk/NOTICE Modified: tomcat/trunk/LICENSE URL: http://svn.apache.org/viewvc/tomcat/trunk/LICENSE?rev=1681837&r1=1681836&r2=1681837&view=diff == --- tomcat/trunk/LICENSE (original) +++ tomcat/trunk/LICENSE Tue May 26 20:12:11 2015 @@ -210,7 +210,7 @@ and license terms. Your use of these sub conditions of the following licenses. -For the ecj-x.x.x.jar component: +For the Eclipse JDT Core Batch Compiler (ecj-x.x.x.jar) component: Eclipse Public License - v 1.0 Modified: tomcat/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/trunk/NOTICE?rev=1681837&r1=1681836&r2=1681837&view=diff == --- tomcat/trunk/NOTICE (original) +++ tomcat/trunk/NOTICE Tue May 26 20:12:11 2015 @@ -10,10 +10,10 @@ open source software. The original soft related information is available at http://nsis.sourceforge.net. -Java compilation software for JSP pages is provided by Eclipse, -which is open source software. The original software and -related information is available at -http://www.eclipse.org. +Java compilation software for JSP pages is provided by the Eclipse +JDT Core Batch Compiler component, which is open source software. +The original software and related information is available at +http://www.eclipse.org/jdt/core/. The original XML Schemas for Java EE Deployment Descriptors: - javaee_5.xsd - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681838 - /tomcat/trunk/res/INSTALLLICENSE
Author: markt Date: Tue May 26 20:14:25 2015 New Revision: 1681838 URL: http://svn.apache.org/r1681838 Log: Align the text with r1681837 Modified: tomcat/trunk/res/INSTALLLICENSE Modified: tomcat/trunk/res/INSTALLLICENSE URL: http://svn.apache.org/viewvc/tomcat/trunk/res/INSTALLLICENSE?rev=1681838&r1=1681837&r2=1681838&view=diff == --- tomcat/trunk/res/INSTALLLICENSE (original) +++ tomcat/trunk/res/INSTALLLICENSE Tue May 26 20:14:25 2015 @@ -210,7 +210,7 @@ and license terms. Your use of these sub conditions of the following licenses. -For the Eclipse JDT Java compiler: +For the Eclipse JDT Core Batch Compiler (ecj-x.x.x.jar) component: Eclipse Public License - v 1.0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681840 - in /tomcat/tc8.0.x/trunk: ./ LICENSE NOTICE res/INSTALLLICENSE
Author: markt Date: Tue May 26 20:15:49 2015 New Revision: 1681840 URL: http://svn.apache.org/r1681840 Log: Be more specific about the Eclipse Compiler we depend on Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/LICENSE tomcat/tc8.0.x/trunk/NOTICE tomcat/tc8.0.x/trunk/res/INSTALLLICENSE Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 26 20:15:49 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,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,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,1657609,1657682,1657 907,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,137,149,1 666757,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,1681701,1681729 +/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,
svn commit: r1681841 - in /tomcat/tc7.0.x/trunk: ./ LICENSE NOTICE res/INSTALLLICENSE
Author: markt Date: Tue May 26 20:16:25 2015 New Revision: 1681841 URL: http://svn.apache.org/r1681841 Log: Be more specific about the Eclipse Compiler we depend on Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/LICENSE tomcat/tc7.0.x/trunk/NOTICE tomcat/tc7.0.x/trunk/res/INSTALLLICENSE Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 26 20:16:25 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,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 -/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 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,1353087,1353125,1353240,1
svn commit: r1681843 - in /tomcat/tc6.0.x/trunk: LICENSE NOTICE res/INSTALLLICENSE
Author: markt Date: Tue May 26 20:18:37 2015 New Revision: 1681843 URL: http://svn.apache.org/r1681843 Log: CTR (docs - sort of) Be more specific about the Eclipse Compiler we depend on Modified: tomcat/tc6.0.x/trunk/LICENSE tomcat/tc6.0.x/trunk/NOTICE tomcat/tc6.0.x/trunk/res/INSTALLLICENSE Modified: tomcat/tc6.0.x/trunk/LICENSE URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/LICENSE?rev=1681843&r1=1681842&r2=1681843&view=diff == --- tomcat/tc6.0.x/trunk/LICENSE (original) +++ tomcat/tc6.0.x/trunk/LICENSE Tue May 26 20:18:37 2015 @@ -210,7 +210,7 @@ and license terms. Your use of these sub conditions of the following licenses. -For the Eclipse JDT Java compiler: +For the Eclipse JDT Core Batch Compiler (ecj-x.x.x.jar) component: Eclipse Public License - v 1.0 Modified: tomcat/tc6.0.x/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/NOTICE?rev=1681843&r1=1681842&r2=1681843&view=diff == --- tomcat/tc6.0.x/trunk/NOTICE (original) +++ tomcat/tc6.0.x/trunk/NOTICE Tue May 26 20:18:37 2015 @@ -10,10 +10,10 @@ open source software. The original soft related information is available at http://nsis.sourceforge.net. -Java compilation software for JSP pages is provided by Eclipse, -which is open source software. The original software and -related information is available at -http://www.eclipse.org. +Java compilation software for JSP pages is provided by the Eclipse +JDT Core Batch Compiler component, which is open source software. +The original software and related information is available at +http://www.eclipse.org/jdt/core/. The original XML Schemas for Java EE Deployment Descriptors: - javaee_5.xsd Modified: tomcat/tc6.0.x/trunk/res/INSTALLLICENSE URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/INSTALLLICENSE?rev=1681843&r1=1681842&r2=1681843&view=diff == --- tomcat/tc6.0.x/trunk/res/INSTALLLICENSE (original) +++ tomcat/tc6.0.x/trunk/res/INSTALLLICENSE Tue May 26 20:18:37 2015 @@ -210,7 +210,7 @@ and license terms. Your use of these sub conditions of the following licenses. -For the Eclipse JDT Java compiler: +For the Eclipse JDT Core Batch Compiler (ecj-x.x.x.jar) component: Eclipse Public License - v 1.0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57282] request process UML diagram seems outdated
https://bz.apache.org/bugzilla/show_bug.cgi?id=57282 Mark Thomas changed: What|Removed |Added Attachment #32417|0 |1 is obsolete|| -- 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: r1681845 - in /tomcat/site/trunk: docs/images/ACNA2010_120x240_basic.gif xdocs/images/ACNA2010_120x240_basic.gif
Author: markt Date: Tue May 26 20:24:31 2015 New Revision: 1681845 URL: http://svn.apache.org/r1681845 Log: Remove old ApacheCon ad Removed: tomcat/site/trunk/docs/images/ACNA2010_120x240_basic.gif tomcat/site/trunk/xdocs/images/ACNA2010_120x240_basic.gif - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57282] request process UML diagram seems outdated
https://bz.apache.org/bugzilla/show_bug.cgi?id=57282 Mark Thomas changed: What|Removed |Added Attachment #32418|0 |1 is obsolete|| -- 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: r1681854 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java webapps/docs/architecture/startup/serverStartup.txt
Author: markt Date: Tue May 26 20:41:52 2015 New Revision: 1681854 URL: http://svn.apache.org/r1681854 Log: Typo Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/trunk/webapps/docs/architecture/startup/serverStartup.txt Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1681854&r1=1681853&r2=1681854&view=diff == --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue May 26 20:41:52 2015 @@ -759,7 +759,7 @@ public class StandardContext extends Con * Should Tomcat renew the threads of the thread pool when the application * is stopped to avoid memory leaks because of uncleaned ThreadLocal * variables. This also requires that the threadRenewalDelay property of the - * StandardThreadExecutor of ThreadPoolExecutor be set to a positive value. + * StandardThreadExecutor or ThreadPoolExecutor be set to a positive value. */ private boolean renewThreadsWhenStoppingContext = true; Modified: tomcat/trunk/webapps/docs/architecture/startup/serverStartup.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/startup/serverStartup.txt?rev=1681854&r1=1681853&r2=1681854&view=diff == --- tomcat/trunk/webapps/docs/architecture/startup/serverStartup.txt (original) +++ tomcat/trunk/webapps/docs/architecture/startup/serverStartup.txt Tue May 26 20:41:52 2015 @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. -Tomcat 5 Startup Sequence +Tomcat Startup Sequence Sequence 1. Start from Command Line Class: org.apache.catalina.startup.Bootstrap @@ -22,13 +22,15 @@ What it does: commonLoader (common)-> System Loader sharedLoader (shared)-> commonLoader -> System Loader catalinaLoader(server) -> commonLoader -> System Loader +(by default the commonLoader is used for the + sharedLoader and the serverLoader) b) Load startup class (reflection) org.apache.catalina.startup.Catalina setParentClassloader -> sharedLoader Thread.contextClassloader -> catalinaLoader c) Bootstrap.daemon.init() complete -Sequence 2. Process command line argument (start, startd, stop, stopd) +Sequence 2. Process command line argument (start, stop) Class: org.apache.catalina.startup.Bootstrap (assume command->start) What it does: a) Catalina.setAwait(true); @@ -50,7 +52,7 @@ What it does: The single entry for a set of connectors, so that a container can listen to multiple connectors ie, single entry -org.apache.coyote.tomcat5.CoyoteConnector +org.apache.catalina.Connector Connectors to listen for incoming requests only It also adds the following rulesets to the digester NamingRuleSet @@ -67,13 +69,13 @@ What it does: During the process call the Connectors also initialize the adapters. The adapters are the components that do the request pre-processing. Typical adapters are HTTP1.1 (default if no protocol is specified, -org.apache.coyote.http11.Http11Protocol) +org.apache.coyote.http11.Http11NioProtocol) AJP1.3 for mod_jk etc. c) Catalina.start() c1) Starts the NamingContext and binds all JNDI references into it c2) Starts the services under which are: -StandardService -> starts Engine (ContainerBase ->Logger,Loader,Realm,Cluster etc) +StandardService -> starts Engine (ContainerBase -> Realm,Cluster etc) c3) StandardHost (started by the service) Configures a ErrorReportValvem to do proper HTML output for different HTTP errors codes @@ -85,8 +87,7 @@ What it does: Starts the HostConfig component This component deploys all the webapps (webapps & conf/Catalina/localhost/*.xml) -Webapps are installed using the deployer (StandardHostDeployer) -The deployer will create a Digester for your context, this digester +HostConfig will create a Digester for your context, this digester will then invoke ContextConfig.start() The ContextConfig.start() will process the default web.xml (conf/web.xml) and then process the applications web.xml (WEB-INF/web.xml) @@ -96,23 +97,23 @@ What it does: context xml file, web.xml) then a reload is issued (stop/remo
svn commit: r1681861 - /tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
Author: markt
Date: Tue May 26 20:56:32 2015
New Revision: 1681861
URL: http://svn.apache.org/r1681861
Log:
Better message
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1681861&r1=1681860&r2=1681861&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Tue
May 26 20:56:32 2015
@@ -115,5 +115,5 @@ socket.apr.write.error=Unexpected error
socket.apr.closed=The socket [{0}] associated with this connection has been
closed.
sslHostConfig.certificateVerificationInvalid=The certificate verification
value [{0}] is not recognised
-sslHostConfig.mismatch=The property [{0}] was set on the SSLHostConfig named
[{1}] but this property is for connectors of type [{2}] by the SSLHostConfig is
being used with a connector of type [{3}]
+sslHostConfig.mismatch=The property [{0}] was set on the SSLHostConfig named
[{1}] and is for connectors of type [{2}] but the SSLHostConfig is being used
with a connector of type [{3}]
sslHostConfig.prefix_missing=The protocol [{0}] was added to the list of
protocols on the SSLHostConfig named [{1}]. Check if a +/- prefix is missing.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681862 - in /tomcat/trunk/webapps/docs/architecture: requestProcess.xml requestProcess/authentication-process.png requestProcess/request-process.png requestProcess/requestProcess.pdf req
Author: markt Date: Tue May 26 20:58:00 2015 New Revision: 1681862 URL: http://svn.apache.org/r1681862 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57282 Updated request processing sequence diagrams by Stephen Chen. Added: tomcat/trunk/webapps/docs/architecture/requestProcess/authentication-process.png (with props) tomcat/trunk/webapps/docs/architecture/requestProcess/request-process.png (with props) Removed: tomcat/trunk/webapps/docs/architecture/requestProcess/requestProcess.pdf tomcat/trunk/webapps/docs/architecture/requestProcess/roseModel.mdl Modified: tomcat/trunk/webapps/docs/architecture/requestProcess.xml Modified: tomcat/trunk/webapps/docs/architecture/requestProcess.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/requestProcess.xml?rev=1681862&r1=1681861&r2=1681862&view=diff == --- tomcat/trunk/webapps/docs/architecture/requestProcess.xml (original) +++ tomcat/trunk/webapps/docs/architecture/requestProcess.xml Tue May 26 20:58:00 2015 @@ -45,11 +45,16 @@ TODO - + A UML sequence diagram of the request process is available -here. +here. + +A UML sequence diagram of the authentication process is available +here. + + Added: tomcat/trunk/webapps/docs/architecture/requestProcess/authentication-process.png URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/requestProcess/authentication-process.png?rev=1681862&view=auto == Binary file - no diff available. Propchange: tomcat/trunk/webapps/docs/architecture/requestProcess/authentication-process.png -- svn:mime-type = image/png Added: tomcat/trunk/webapps/docs/architecture/requestProcess/request-process.png URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/requestProcess/request-process.png?rev=1681862&view=auto == Binary file - no diff available. Propchange: tomcat/trunk/webapps/docs/architecture/requestProcess/request-process.png -- svn:mime-type = image/png - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681863 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Author: markt Date: Tue May 26 20:59:22 2015 New Revision: 1681863 URL: http://svn.apache.org/r1681863 Log: Fix typo Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1681863&r1=1681862&r2=1681863&view=diff == --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue May 26 20:59:22 2015 @@ -759,7 +759,7 @@ public class StandardContext extends Con * Should Tomcat renew the threads of the thread pool when the application * is stopped to avoid memory leaks because of uncleaned ThreadLocal * variables. This also requires that the threadRenewalDelay property of the - * StandardThreadExecutor of ThreadPoolExecutor be set to a positive value. + * StandardThreadExecutor or ThreadPoolExecutor be set to a positive value. */ private boolean renewThreadsWhenStoppingContext = true; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681864 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/architecture/startup/serverStartup.txt
Author: markt Date: Tue May 26 21:00:29 2015 New Revision: 1681864 URL: http://svn.apache.org/r1681864 Log: Update startup description. Written with Tomcat 9 in mind but better than the old one based on Tomcat 5. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 26 21:00:29 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,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,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,1657609,1657682,1657 907,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,137,149,1 666757,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,1681701,1681729,1681837-1681838 +/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
svn commit: r1681865 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/architecture/startup/serverStartup.txt
Author: markt Date: Tue May 26 21:01:02 2015 New Revision: 1681865 URL: http://svn.apache.org/r1681865 Log: Update startup description. Written with Tomcat 9 in mind but better than the old one based on Tomcat 5. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 26 21:01:02 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,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 -/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 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1 352661,1352663,1352788,1352799,
svn commit: r1681867 - /tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt
Author: markt Date: Tue May 26 21:03:39 2015 New Revision: 1681867 URL: http://svn.apache.org/r1681867 Log: Fix an important difference Modified: tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt Modified: tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt?rev=1681867&r1=1681866&r2=1681867&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt Tue May 26 21:03:39 2015 @@ -69,7 +69,7 @@ What it does: During the process call the Connectors also initialize the adapters. The adapters are the components that do the request pre-processing. Typical adapters are HTTP1.1 (default if no protocol is specified, -org.apache.coyote.http11.Http11NioProtocol) +org.apache.coyote.http11.Http11Protocol) AJP1.3 for mod_jk etc. c) Catalina.start() - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681868 - /tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt
Author: markt Date: Tue May 26 21:04:50 2015 New Revision: 1681868 URL: http://svn.apache.org/r1681868 Log: Update startup description. Written with Tomcat 9 in mind but better than the old one based on Tomcat 5. Modified: tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt Modified: tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt?rev=1681868&r1=1681867&r2=1681868&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt Tue May 26 21:04:50 2015 @@ -13,126 +13,127 @@ See the License for the specific language governing permissions and limitations under the License. -Tomcat 5 Startup Sequence +Tomcat Startup Sequence Sequence 1. Start from Command Line Class: org.apache.catalina.startup.Bootstrap What it does: - a) Set up classloaders - commonLoader (common)-> System Loader - sharedLoader (shared)-> commonLoader -> System Loader - catalinaLoader(server) -> commonLoader -> System Loader - b) Load startup class (reflection) - org.apache.catalina.startup.Catalina - setParentClassloader -> sharedLoader - Thread.contextClassloader -> catalinaLoader - c) Bootstrap.daemon.init() complete - -Sequence 2. Process command line argument (start, startd, stop, stopd) +a) Set up classloaders +commonLoader (common)-> System Loader +sharedLoader (shared)-> commonLoader -> System Loader +catalinaLoader(server) -> commonLoader -> System Loader +(by default the commonLoader is used for the + sharedLoader and the serverLoader) +b) Load startup class (reflection) +org.apache.catalina.startup.Catalina +setParentClassloader -> sharedLoader +Thread.contextClassloader -> catalinaLoader +c) Bootstrap.daemon.init() complete + +Sequence 2. Process command line argument (start, stop) Class: org.apache.catalina.startup.Bootstrap (assume command->start) -What it does: - a) Catalina.setAwait(true); - b) Catalina.load() - b1) initDirs() -> set properties like - catalina.home - catalina.base == catalina.home (most cases) - b2) initNaming - setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, - org.apache.naming.java.javaURLContextFactory ->default) - b3) createStartDigester() - Configures a digester for the main server.xml elements like - org.apache.catalina.core.StandardServer (can change of course :) - org.apache.catalina.deploy.NamingResources - Stores naming resources in the J2EE JNDI tree - org.apache.catalina.LifecycleListener - implements events for start/stop of major components - org.apache.catalina.core.StandardService - The single entry for a set of connectors, - so that a container can listen to multiple connectors - ie, single entry - org.apache.coyote.tomcat5.CoyoteConnector - Connectors to listen for incoming requests only - It also adds the following rulesets to the digester - NamingRuleSet - EngineRuleSet - HostRuleSet - ContextRuleSet - b4) Load the server.xml and parse it using the digester - Parsing the server.xml using the digester is an automatic - XML-object mapping tool, that will create the objects defined in server.xml - Startup of the actual container has not started yet. - b5) Assigns System.out and System.err to the SystemLogHandler class - b6) Calls initialize on all components, this makes each object register itself with the - JMX agent. - During the process call the Connectors also initialize the adapters. - The adapters are the components that do the request pre-processing. - Typical adapters are HTTP1.1 (default if no protocol is specified, - org.apache.coyote.http11.Http11Protocol) - AJP1.3 for mod_jk etc. - - c) Catalina.start() - c1) Starts the NamingContext and binds all JNDI references into it -
svn commit: r1681869 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/ webapps/docs/architecture/ webapps/docs/architecture/requestProcess/
Author: markt Date: Tue May 26 21:07:01 2015 New Revision: 1681869 URL: http://svn.apache.org/r1681869 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57282 Updated request processing sequence diagrams by Stephen Chen. Added: tomcat/tc8.0.x/trunk/webapps/docs/architecture/requestProcess/authentication-process.png - copied unchanged from r1681862, tomcat/trunk/webapps/docs/architecture/requestProcess/authentication-process.png tomcat/tc8.0.x/trunk/webapps/docs/architecture/requestProcess/request-process.png - copied unchanged from r1681862, tomcat/trunk/webapps/docs/architecture/requestProcess/request-process.png Removed: tomcat/tc8.0.x/trunk/webapps/docs/architecture/requestProcess/requestProcess.pdf tomcat/tc8.0.x/trunk/webapps/docs/architecture/requestProcess/roseModel.mdl Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/architecture/requestProcess.xml tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 26 21:07:01 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,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,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,1657609,1657682,1657 907,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,137,149,1 666757,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,1681701,1681729,1681837-1681838,1681854 +/tomcat/trunk:1636524,1637156,16371
svn commit: r1681874 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/ webapps/docs/architecture/ webapps/docs/architecture/requestProcess/
Author: markt Date: Tue May 26 21:16:29 2015 New Revision: 1681874 URL: http://svn.apache.org/r1681874 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57282 Updated request processing sequence diagrams by Stephen Chen. Added: tomcat/tc7.0.x/trunk/webapps/docs/architecture/requestProcess/authentication-process.png - copied unchanged from r1681869, tomcat/tc8.0.x/trunk/webapps/docs/architecture/requestProcess/authentication-process.png tomcat/tc7.0.x/trunk/webapps/docs/architecture/requestProcess/request-process.png - copied unchanged from r1681869, tomcat/tc8.0.x/trunk/webapps/docs/architecture/requestProcess/request-process.png Removed: tomcat/tc7.0.x/trunk/webapps/docs/architecture/requestProcess/requestProcess.pdf tomcat/tc7.0.x/trunk/webapps/docs/architecture/requestProcess/roseModel.mdl Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/architecture/requestProcess.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 26 21:16:29 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,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 -/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 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1
[Bug 57282] request process UML diagram seems outdated
https://bz.apache.org/bugzilla/show_bug.cgi?id=57282 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #26 from Mark Thomas --- These have been added to the documentation for trunk (9.0.x), 8.0.x (for 8.0.24 onwards) and 7.0.x (for 7.0.63 onwards). Many thanks for all your hard work. -- 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
buildbot failure in ASF Buildbot on tomcat-trunk
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/1269 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] 1681838 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 exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1270 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] 1681862 Blamelist: markt BUILD FAILED: exception svn upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57282] request process UML diagram seems outdated
https://bz.apache.org/bugzilla/show_bug.cgi?id=57282 --- Comment #27 from Stephen Chen --- (In reply to Mark Thomas from comment #26) > These have been added to the documentation for trunk (9.0.x), 8.0.x (for > 8.0.24 onwards) and 7.0.x (for 7.0.63 onwards). > > Many thanks for all your hard work. Yeah, I am so honored&thrilled what I have done. Of course, many thanks for your great help, (In reply to Mark Thomas from comment #26) > These have been added to the documentation for trunk (9.0.x), 8.0.x (for > 8.0.24 onwards) and 7.0.x (for 7.0.63 onwards). > > Many thanks for all your hard work. Yeah!!! I am so thrilled&honored about what I have done for community. of course, many thanks for your great help(valuable reviews and comments), it can't be done without your help. -- 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
[Bug 57154] Failure of TestWsWebSocketContainer when directory %TEMP%\test exists
https://bz.apache.org/bugzilla/show_bug.cgi?id=57154 --- Comment #7 from Huxing Zhang --- Hi @Konstantin and @Mark, Is there any update on this? -- 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
Re: svn commit: r1681845 - in /tomcat/site/trunk: docs/images/ACNA2010_120x240_basic.gif xdocs/images/ACNA2010_120x240_basic.gif
2015-05-26 23:24 GMT+03:00 : > Author: markt > Date: Tue May 26 20:24:31 2015 > New Revision: 1681845 > > URL: http://svn.apache.org/r1681845 > Log: > Remove old ApacheCon ad > > Removed: > tomcat/site/trunk/docs/images/ACNA2010_120x240_basic.gif > tomcat/site/trunk/xdocs/images/ACNA2010_120x240_basic.gif This file is referenced by oldnews-2010.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed
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-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-tc8.0.x-test-apr : 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-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 56 mins 13 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 -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150527-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150527/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150527.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150527-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150527/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/
[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 7 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 40 mins 28 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 -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150527-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150527.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150527-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150527/bin/o penssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output/bu ild/lib/tomcat-util.jar:/srv/
Re: svn commit: r1681794 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
On 26/05/2015 19:43, Rémy Maucherat wrote: > 2015-05-26 20:37 GMT+02:00 Mark Thomas : > >> On 26/05/2015 19:33, Rémy Maucherat wrote: >>> 2015-05-26 20:17 GMT+02:00 Mark Thomas : >>> It was a left over from the attempt to make BIO support more connections than it had threads by not doing an immediate read on a keep-alive connection. It was no longer required. There is another "return false" in the correct place in the next if block. The testsuite still fails with NIO2, so something has to be wrong :) >> >> It hasn't had a chance to run with my fix yet. >> > That is correct, I thought the previous one had it already. Now I do see some test failures with my fix in place. I'll take a look at these today. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1681916 - in /tomcat/site/trunk: docs/oldnews-2010.html docs/oldnews-2011.html xdocs/oldnews-2010.xml xdocs/oldnews-2011.xml
Author: markt Date: Wed May 27 06:51:31 2015 New Revision: 1681916 URL: http://svn.apache.org/r1681916 Log: Remove reference to deleted image. Align locations of older news section. Modified: tomcat/site/trunk/docs/oldnews-2010.html tomcat/site/trunk/docs/oldnews-2011.html tomcat/site/trunk/xdocs/oldnews-2010.xml tomcat/site/trunk/xdocs/oldnews-2011.xml Modified: tomcat/site/trunk/docs/oldnews-2010.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1681916&r1=1681915&r2=1681916&view=diff == --- tomcat/site/trunk/docs/oldnews-2010.html (original) +++ tomcat/site/trunk/docs/oldnews-2010.html Wed May 27 06:51:31 2015 @@ -304,11 +304,6 @@ content directly in a web application (a 2010-05-27 Apache Tomcat Track at ApacheCon North America 2010 - - -http://archive.apachecon.com/c/acna2010/";> - - http://archive.apachecon.com/c/acna2010/";>ApacheCon Modified: tomcat/site/trunk/docs/oldnews-2011.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2011.html?rev=1681916&r1=1681915&r2=1681916&view=diff == --- tomcat/site/trunk/docs/oldnews-2011.html (original) +++ tomcat/site/trunk/docs/oldnews-2011.html Wed May 27 06:51:31 2015 @@ -195,21 +195,6 @@ Content -Old news - 2011 - - -These are former announcements from year 2011. Announcements from earlier -years can be found here: - - - - -year 2010 - - - - - 2011-12-05 Tomcat 6.0.35 Released @@ -668,6 +653,20 @@ Apache Tomcat. This release includes bug +Older news + + +Announcements from previous years can be found here: + + + + +year 2010 + + + + + Modified: tomcat/site/trunk/xdocs/oldnews-2010.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2010.xml?rev=1681916&r1=1681915&r2=1681916&view=diff == --- tomcat/site/trunk/xdocs/oldnews-2010.xml (original) +++ tomcat/site/trunk/xdocs/oldnews-2010.xml Wed May 27 06:51:31 2015 @@ -87,10 +87,6 @@ content directly in a web application (a -http://archive.apachecon.com/c/acna2010/";> http://archive.apachecon.com/c/acna2010/";>ApacheCon North America 2010 will be held 1-5 November 2010, at the Westin Modified: tomcat/site/trunk/xdocs/oldnews-2011.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2011.xml?rev=1681916&r1=1681915&r2=1681916&view=diff == --- tomcat/site/trunk/xdocs/oldnews-2011.xml (original) +++ tomcat/site/trunk/xdocs/oldnews-2011.xml Wed May 27 06:51:31 2015 @@ -8,14 +8,6 @@ - -These are former announcements from year 2011. Announcements from earlier -years can be found here: - - year 2010 - - - The Apache Tomcat Project is proud to announce the release of version 6.0.35 of @@ -328,5 +320,12 @@ Apache Tomcat. This release includes bug + +Announcements from previous years can be found here: + + year 2010 + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1681845 - in /tomcat/site/trunk: docs/images/ACNA2010_120x240_basic.gif xdocs/images/ACNA2010_120x240_basic.gif
On 27/05/2015 02:31, Konstantin Kolinko wrote: > 2015-05-26 23:24 GMT+03:00 : >> Author: markt >> Date: Tue May 26 20:24:31 2015 >> New Revision: 1681845 >> >> URL: http://svn.apache.org/r1681845 >> Log: >> Remove old ApacheCon ad >> >> Removed: >> tomcat/site/trunk/docs/images/ACNA2010_120x240_basic.gif >> tomcat/site/trunk/xdocs/images/ACNA2010_120x240_basic.gif > > > This file is referenced by oldnews-2010.html Thanks. I removed the link. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
