[DISCUSS] Logging
I've been looking at Bug 58588 [1]. It looks clear that the JULI extras JARs no longer add value and I'm happy to remove them. That bug also raises the question "How would users switch Tomcat's internal logging to LOGBack, log4j2 or something else?". A quick look at the respective manuals suggest the following: LOGBack inserts itself via the root logger so that should be OK. In this case we'd have: Tomcat -> JULI -> JUL -> LOGBack log4j2 replaces the LogManager. Providing a suitable selector (class loader or JNDI was used) this should be fine. In this case we'd have: Tomcat -> JULI -> log4j2 Thinking about all of this got me wondering. A primary driver for JULI was the lack of class loader aware logging frameworks. This particular problem appears to be solved (at least log4j and logback have solved it). Do we want to consider a change to the logging framework? Possible options include: 1. Simplified JULI that uses JUL directly but with our existing LogManager and configuration extensions. 2. Native log4j2. 3. Use SLF4j API with log4j2 by default. 4. Use SLF4j API with logback by default. 5. Something else... 6. Do nothing. Currently, I'm leaning towards either doing nothing (what we have works) or option 1. Options 2-5 all involved adding additional libraries which I instinctively prefer not to do without a really good reason. Thoughts? [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=58588 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1745467 - /tomcat/trunk/build.xml
Author: markt Date: Wed May 25 10:52:57 2016 New Revision: 1745467 URL: http://svn.apache.org/viewvc?rev=1745467&view=rev Log: Remove unused property Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1745467&r1=1745466&r2=1745467&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Wed May 25 10:52:57 2016 @@ -150,7 +150,6 @@ - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1745468 - /tomcat/tc8.5.x/trunk/build.xml
Author: markt Date: Wed May 25 10:53:26 2016 New Revision: 1745468 URL: http://svn.apache.org/viewvc?rev=1745468&view=rev Log: Remove unused property Modified: tomcat/tc8.5.x/trunk/build.xml Modified: tomcat/tc8.5.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?rev=1745468&r1=1745467&r2=1745468&view=diff == --- tomcat/tc8.5.x/trunk/build.xml (original) +++ tomcat/tc8.5.x/trunk/build.xml Wed May 25 10:53:26 2016 @@ -150,7 +150,6 @@ - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1745469 - /tomcat/tc8.0.x/trunk/build.xml
Author: markt Date: Wed May 25 10:55:19 2016 New Revision: 1745469 URL: http://svn.apache.org/viewvc?rev=1745469&view=rev Log: Remove unused property Modified: tomcat/tc8.0.x/trunk/build.xml Modified: tomcat/tc8.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.xml?rev=1745469&r1=1745468&r2=1745469&view=diff == --- tomcat/tc8.0.x/trunk/build.xml (original) +++ tomcat/tc8.0.x/trunk/build.xml Wed May 25 10:55:19 2016 @@ -146,7 +146,6 @@ - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1745471 - /tomcat/tc7.0.x/trunk/build.xml
Author: markt Date: Wed May 25 10:55:50 2016 New Revision: 1745471 URL: http://svn.apache.org/viewvc?rev=1745471&view=rev Log: Remove unused property Modified: tomcat/tc7.0.x/trunk/build.xml Modified: tomcat/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1745471&r1=1745470&r2=1745471&view=diff == --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Wed May 25 10:55:50 2016 @@ -138,7 +138,6 @@ - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1745473 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml webapps/docs/logging.xml
Author: markt
Date: Wed May 25 11:11:10 2016
New Revision: 1745473
URL: http://svn.apache.org/viewvc?rev=1745473&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58588
Remove the JULI extras package
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/logging.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1745473&r1=1745472&r2=1745473&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed May 25 11:11:10 2016
@@ -143,23 +143,17 @@
-
-
-
-
-
-
@@ -493,15 +487,6 @@
-
-
-
-
-
-
-
-
-
@@ -1244,9 +1229,6 @@
filesDir="${tomcat.classes}"
filesId="files.tomcat-embed-websocket"
meta-inf="${tomcat.manifests}/tomcat-websocket.jar"/>
-
@@ -1270,9 +1252,6 @@
-
@@ -1282,7 +1261,7 @@
+ depends="embed-jars,embed-sources" >
@@ -1599,149 +1578,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1808,57 +1647,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1745473&r1=1745472&r2=1745473&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May 25 11:11:10 2016
@@ -117,6 +117,17 @@
+
+
+
+58588: Remove the JULI extras package from the distribution.
+It was onyl useful for switching Tomcat's internal logging to log4j
+1.2.x and that version of log4j is no longer supported. No additional
+Tomcat code is required if switching Tomcat's internal logging to log
+via log4j 2.x. (markt)
+
+
+
Modified: tomcat/trunk/webapps/docs/logging.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=1745473&r1=1745472&r2=1745473&view=diff
==
--- tomcat/trunk/webapps/docs/logging.xml (original)
+++ tomcat/trunk/webapps/docs/logging.xml Wed May 25 11:11:10 2016
@@ -38,20 +38,19 @@
The internal logging for Apache Tomcat uses JULI, a packaged renamed fork
of http://commons.apache.org/logging";>Apache Commons Logging
- that, by default, is hard-coded to use the java.util.logging
- framework. This ensures that Tomcat's internal logging and any web
- application logging will remain independent, even if a web application
- uses Apache Commons Logging.
+ that is hard-coded to use the java.util.logging framework.
+ This ensures that Tomcat's internal logging and any web application
+ logging will remain independent, even if a web application uses Apache
+ Commons Logging.
To configure Tomcat to use an alternative logging framework for its
- internal logging, one has to replace the JULI implementation that is
- hard-coded to use java.util.logging with a JULI
- implementation that retains the full Commons Logging discovery mechanism.
- Such an implementation is provided as an extras
- component. Instructions on how to configure Tomcat to use Log4j framework
- for its internal logging may be found below.
+ internal logging, follow the instructions provided by the alternative
+ logging framework for redirecting logging for applications that use
+ java.util.logging. Keep in mind that the alternative logging
+ framework will need to be capable of working in an
[Bug 58588] Remove extras/juli from Tomcat 9 build and deliveries as Log4J 1.x has reached EOL.
https://bz.apache.org/bugzilla/show_bug.cgi?id=58588 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED OS||All Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed in 9.0.x for 9.0.0.M7 onwards with no plans to backport. -- 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: [DISCUSS] Logging
2016-05-25 12:43 GMT+02:00 Mark Thomas : > I've been looking at Bug 58588 [1]. It looks clear that the JULI extras > JARs no longer add value and I'm happy to remove them. That bug also > raises the question "How would users switch Tomcat's internal logging to > LOGBack, log4j2 or something else?". > > A quick look at the respective manuals suggest the following: > > LOGBack inserts itself via the root logger so that should be OK. In this > case we'd have: > > Tomcat -> JULI -> JUL -> LOGBack > > log4j2 replaces the LogManager. Providing a suitable selector (class > loader or JNDI was used) this should be fine. In this case we'd have: > > Tomcat -> JULI -> log4j2 > > Thinking about all of this got me wondering. A primary driver for JULI > was the lack of class loader aware logging frameworks. This particular > problem appears to be solved (at least log4j and logback have solved > it). Do we want to consider a change to the logging framework? Possible > options include: > > 1. Simplified JULI that uses JUL directly but with our existing > LogManager and configuration extensions. > > 2. Native log4j2. > > 3. Use SLF4j API with log4j2 by default. > > 4. Use SLF4j API with logback by default. > > 5. Something else... > > 6. Do nothing. > > Currently, I'm leaning towards either doing nothing (what we have works) > or option 1. Options 2-5 all involved adding additional libraries which > I instinctively prefer not to do without a really good reason. > > Thoughts? > I'd vote 6. Switching is a lot of trouble with little benefit. What would be the changes for 1 exactly ? The thing is/was supposed to be simple already. At JBoss, they use a logging tool with strong typing and a preprocessing tool. I was initially skeptical, but it worked well after a while. The extra robustness is nice in a way, it gives a bit more. Rémy
svn commit: r1745479 - /tomcat/trunk/webapps/docs/logging.xml
Author: markt Date: Wed May 25 12:55:50 2016 New Revision: 1745479 URL: http://svn.apache.org/viewvc?rev=1745479&view=rev Log: whitespace Modified: tomcat/trunk/webapps/docs/logging.xml Modified: tomcat/trunk/webapps/docs/logging.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/logging.xml?rev=1745479&r1=1745478&r2=1745479&view=diff == --- tomcat/trunk/webapps/docs/logging.xml (original) +++ tomcat/trunk/webapps/docs/logging.xml Wed May 25 12:55:50 2016 @@ -50,7 +50,7 @@ logging framework for redirecting logging for applications that use java.util.logging. Keep in mind that the alternative logging framework will need to be capable of working in an environment where - different loggers with the same name may exist in different class loaders. + different loggers with the same name may exist in different class loaders. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [DISCUSS] Logging
On 25/05/2016 12:26, Rémy Maucherat wrote:
> 2016-05-25 12:43 GMT+02:00 Mark Thomas :
>
>> I've been looking at Bug 58588 [1]. It looks clear that the JULI extras
>> JARs no longer add value and I'm happy to remove them. That bug also
>> raises the question "How would users switch Tomcat's internal logging to
>> LOGBack, log4j2 or something else?".
>>
>> A quick look at the respective manuals suggest the following:
>>
>> LOGBack inserts itself via the root logger so that should be OK. In this
>> case we'd have:
>>
>> Tomcat -> JULI -> JUL -> LOGBack
>>
>> log4j2 replaces the LogManager. Providing a suitable selector (class
>> loader or JNDI was used) this should be fine. In this case we'd have:
>>
>> Tomcat -> JULI -> log4j2
>>
>> Thinking about all of this got me wondering. A primary driver for JULI
>> was the lack of class loader aware logging frameworks. This particular
>> problem appears to be solved (at least log4j and logback have solved
>> it). Do we want to consider a change to the logging framework? Possible
>> options include:
>>
>> 1. Simplified JULI that uses JUL directly but with our existing
>> LogManager and configuration extensions.
>>
>> 2. Native log4j2.
>>
>> 3. Use SLF4j API with log4j2 by default.
>>
>> 4. Use SLF4j API with logback by default.
>>
>> 5. Something else...
>>
>> 6. Do nothing.
>>
>> Currently, I'm leaning towards either doing nothing (what we have works)
>> or option 1. Options 2-5 all involved adding additional libraries which
>> I instinctively prefer not to do without a really good reason.
>>
>> Thoughts?
>>
>
> I'd vote 6. Switching is a lot of trouble with little benefit.
> What would be the changes for 1 exactly ? The thing is/was supposed to be
> simple already.
When I wrote the original e-mail I wasn't sure. All I had in my mind was
that Tomcat -> j.u.l. should be simpler than Tomcat -> CL -> j.u.l.
I've taken a quick look and what this means in terms of code is:
- We could remove o.a.juli.logging. All 92 lines of code.
- A huge amount of renaming (see the sample diff attached)
In terms of performance, the current CL layer always triggers an
exception to determine the current class and method. With direct to
j.u.l. it should be possible to avoid this if those values are not
required in the output. That could significantly speed up logging.
However, Tomcat doesn't log much unless it really has to so the real
performance benefit is probably minimal. And in debug situations, the
class and method can be very helpful.
To be sure of the performance impact, we'd need to try it. The changes
look to be fairly easy to do via global search and replace so I'll give
it a go locally and see what happens.
Mark
diff --git
a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
index ba999dc..fb74840 100644
--- a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
@@ -28,6 +28,8 @@
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.security.auth.message.config.AuthConfigFactory;
import javax.security.auth.message.config.AuthConfigProvider;
@@ -36,13 +38,11 @@
import org.apache.catalina.Globals;
import
org.apache.catalina.authenticator.jaspic.PersistentProviderRegistrations.Provider;
import
org.apache.catalina.authenticator.jaspic.PersistentProviderRegistrations.Providers;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
public class AuthConfigFactoryImpl extends AuthConfigFactory {
-private static final Log log =
LogFactory.getLog(AuthConfigFactoryImpl.class);
+private static final Logger log =
Logger.getLogger(AuthConfigFactoryImpl.class.getName());
private static final StringManager sm =
StringManager.getManager(AuthConfigFactoryImpl.class);
private static final String CONFIG_PATH = "conf/jaspic-providers.xml";
@@ -88,8 +88,8 @@
private String doRegisterConfigProvider(String className,
@SuppressWarnings("rawtypes") Map properties, String layer, String
appContext,
String description) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("authConfigFactoryImpl.registerClass",
+if (log.isLoggable(Level.FINE)) {
+log.fine(sm.getString("authConfigFactoryImpl.registerClass",
className, layer, appContext));
}
Class clazz;
@@ -118,8 +118,8 @@
@Override
public String registerConfigProvider(AuthConfigProvider provider, String
layer,
String appContext, String description) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("authConfigFactoryImpl.registerInstanc
Re: [DISCUSS] Logging
On 25/05/2016 12:26, Rémy Maucherat wrote: > 2016-05-25 12:43 GMT+02:00 Mark Thomas : > >> I've been looking at Bug 58588 [1]. It looks clear that the JULI extras >> JARs no longer add value and I'm happy to remove them. That bug also >> raises the question "How would users switch Tomcat's internal logging to >> LOGBack, log4j2 or something else?". >> >> A quick look at the respective manuals suggest the following: >> >> LOGBack inserts itself via the root logger so that should be OK. In this >> case we'd have: >> >> Tomcat -> JULI -> JUL -> LOGBack >> >> log4j2 replaces the LogManager. Providing a suitable selector (class >> loader or JNDI was used) this should be fine. In this case we'd have: >> >> Tomcat -> JULI -> log4j2 >> >> Thinking about all of this got me wondering. A primary driver for JULI >> was the lack of class loader aware logging frameworks. This particular >> problem appears to be solved (at least log4j and logback have solved >> it). Do we want to consider a change to the logging framework? Possible >> options include: >> >> 1. Simplified JULI that uses JUL directly but with our existing >> LogManager and configuration extensions. >> >> 2. Native log4j2. >> >> 3. Use SLF4j API with log4j2 by default. >> >> 4. Use SLF4j API with logback by default. >> >> 5. Something else... >> >> 6. Do nothing. >> >> Currently, I'm leaning towards either doing nothing (what we have works) >> or option 1. Options 2-5 all involved adding additional libraries which >> I instinctively prefer not to do without a really good reason. >> >> Thoughts? >> > > I'd vote 6. Switching is a lot of trouble with little benefit. > What would be the changes for 1 exactly ? The thing is/was supposed to be > simple already. When I wrote the original e-mail I wasn't sure. All I had in my mind was that Tomcat -> j.u.l. should be simpler than Tomcat -> CL -> j.u.l. I've taken a quick look and what this means in terms of code is: - We could remove o.a.juli.logging. All 92 lines of code. - A huge amount of renaming In terms of performance, the current CL layer always triggers an exception to determine the current class and method. With direct to j.u.l. it should be possible to avoid this if those values are not required in the output. That could significantly speed up logging. However, Tomcat doesn't log much unless it really has to so the real performance benefit is probably minimal. And in debug situations, the class and method can be very helpful. To be sure of the performance impact, we'd need to try it. I took a quick look at this and it isn't quite as simple as a global search and replace. I've set up a local branch where I can try this. I'll see how much work it turns out to be. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59081] Cipher ordering not working
https://bz.apache.org/bugzilla/show_bug.cgi?id=59081 Ognjen Blagojevic changed: What|Removed |Added Status|RESOLVED|CLOSED -- 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: r1745496 - /tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
Author: markt
Date: Wed May 25 14:35:58 2016
New Revision: 1745496
URL: http://svn.apache.org/viewvc?rev=1745496&view=rev
Log:
Remove unnecessary field
Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1745496&r1=1745495&r2=1745496&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Wed
May 25 14:35:58 2016
@@ -78,17 +78,13 @@ import org.apache.tomcat.util.res.String
* @author Remy Maucherat
*/
public class NamingContextListener
-implements LifecycleListener, ContainerListener, PropertyChangeListener {
+implements LifecycleListener, ContainerListener,
PropertyChangeListener {
private static final Log log =
LogFactory.getLog(NamingContextListener.class);
// - Instance Variables
-
-protected Log logger = log;
-
-
/**
* Name of the associated naming context.
*/
@@ -217,7 +213,6 @@ public class NamingContextListener
if (container instanceof Context) {
namingResources = ((Context) container).getNamingResources();
-logger = log;
token = ((Context) container).getNamingToken();
} else if (container instanceof Server) {
namingResources = ((Server) container).getGlobalNamingResources();
@@ -251,7 +246,7 @@ public class NamingContextListener
try {
createNamingContext();
} catch (NamingException e) {
-logger.error
+log.error
(sm.getString("naming.namingContextCreationFailed",
e));
}
@@ -265,7 +260,7 @@ public class NamingContextListener
ContextBindings.bindClassLoader(container, token,
((Context)
container).getLoader().getClassLoader());
} catch (NamingException e) {
-logger.error(sm.getString("naming.bindFailed", e));
+log.error(sm.getString("naming.bindFailed", e));
}
}
@@ -276,7 +271,7 @@ public class NamingContextListener
ContextBindings.bindClassLoader(container, token,
this.getClass().getClassLoader());
} catch (NamingException e) {
-logger.error(sm.getString("naming.bindFailed", e));
+log.error(sm.getString("naming.bindFailed", e));
}
if (container instanceof StandardServer) {
((StandardServer) container).setGlobalNamingContext
@@ -703,7 +698,7 @@ public class NamingContextListener
// Ignore because UserTransaction was obviously
// added via ResourceLink
} catch (NamingException e) {
-logger.error(sm.getString("naming.bindFailed", e));
+log.error(sm.getString("naming.bindFailed", e));
}
}
@@ -713,7 +708,7 @@ public class NamingContextListener
compCtx.bind("Resources",
((Context) container).getResources());
} catch (NamingException e) {
-logger.error(sm.getString("naming.bindFailed", e));
+log.error(sm.getString("naming.bindFailed", e));
}
}
@@ -786,7 +781,7 @@ public class NamingContextListener
createSubcontexts(envCtx, ejb.getName());
envCtx.bind(ejb.getName(), ref);
} catch (NamingException e) {
-logger.error(sm.getString("naming.bindFailed", e));
+log.error(sm.getString("naming.bindFailed", e));
}
}
@@ -857,25 +852,25 @@ public class NamingContextListener
} else {
value = constructEnvEntry(env.getType(), env.getValue());
if (value == null) {
-logger.error(sm.getString(
+log.error(sm.getString(
"naming.invalidEnvEntryType", env.getName()));
}
}
} catch (NumberFormatException e) {
-logger.error(sm.getString("naming.invalidEnvEntryValue",
env.getName()));
+log.error(sm.getString("naming.invalidEnvEntryValue",
env.getName()));
} catch (IllegalArgumentException e) {
-logger.error(sm.getString("naming.invalidEnvEntryValue",
env.getName()));
+log.error(sm.getString("naming.invalidEnvEntryValue",
env.getName()));
}
[Bug 59635] New: PerMessageDeflate.sendMassagePart() IllegalArgumentException using atmosphere
https://bz.apache.org/bugzilla/show_bug.cgi?id=59635 Bug ID: 59635 Summary: PerMessageDeflate.sendMassagePart() IllegalArgumentException using atmosphere Product: Tomcat 8 Version: 8.0.33 Hardware: Macintosh Status: NEW Severity: blocker Priority: P2 Component: WebSocket Assignee: dev@tomcat.apache.org Reporter: l.kaspa...@laudert.de Hi, I have a problem since I have updated my Tomcat from version 8.0.32 to version 8.0.33. I have a java maven project based on Wicket MVC, Atmosphere and Tomcat. After the update to Tomcat 8.0.33 I get an IllegalArgumentException when I am sending an empty atmosphere message. The reason for this exception seems to be located in PerMessageDeflate.sendMessagePart(). I compared the method between both versions and found out that a change was made where the message is checked if it is empty. Following bug report should match to this change: https://bz.apache.org/bugzilla/show_bug.cgi?id=59189 Line 324 in PerMessageDeflate was changed from "uncompressedPart.getPayload().limit() == 0" to "uncompressedPart.getPayload().limit() == 0 && uncompressedPart.isFin() && deflater.getBytesRead() == 0)" It seems that now our empty message isn't handled like an empty message anymore, leeding to the following IllegalArgumentException: java.lang.IllegalArgumentException at java.nio.Buffer.limit(Buffer.java:275) ~[?:1.8.0_74] at org.apache.tomcat.websocket.PerMessageDeflate.sendMessagePart(PerMessageDeflate.java:373) ~[tomcat-websocket.jar:8.0.33] at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessage(WsRemoteEndpointImplBase.java:300) ~[tomcat-websocket.jar:8.0.33] at org.apache.tomcat.websocket.WsRemoteEndpointImplBase$TextMessageSendHandler.write(WsRemoteEndpointImplBase.java:759) ~[tomcat-websocket.jar:8.0.33] at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendStringByCompletion(WsRemoteEndpointImplBase.java:216) ~[tomcat-websocket.jar:8.0.33] at org.apache.tomcat.websocket.WsRemoteEndpointAsync.sendText(WsRemoteEndpointAsync.java:47) ~[tomcat-websocket.jar:8.0.33] at org.atmosphere.container.version.JSR356WebSocket.write(JSR356WebSocket.java:73) ~[atmosphere-runtime-2.2.7.jar:2.2.7] at org.atmosphere.websocket.WebSocket.write(WebSocket.java:254) ~[atmosphere-runtime-2.2.7.jar:2.2.7] at org.atmosphere.websocket.WebSocket.write(WebSocket.java:219) ~[atmosphere-runtime-2.2.7.jar:2.2.7] at org.atmosphere.websocket.WebSocket.write(WebSocket.java:47) ~[atmosphere-runtime-2.2.7.jar:2.2.7] at org.atmosphere.cpr.AtmosphereResponse$2.write(AtmosphereResponse.java:531) ~[atmosphere-runtime-2.2.7.jar:2.2.7] at org.atmosphere.handler.AbstractReflectorAtmosphereHandler.onStateChange(AbstractReflectorAtmosphereHandler.java:148) ~[atmosphere-runtime-2.2.7.jar:2.2.7] at org.atmosphere.cpr.DefaultBroadcaster.invokeOnStateChange(DefaultBroadcaster.java:1074) [atmosphere-runtime-2.2.7.jar:2.2.7] at org.atmosphere.cpr.DefaultBroadcaster.prepareInvokeOnStateChange(DefaultBroadcaster.java:1094) [atmosphere-runtime-2.2.7.jar:2.2.7] at org.atmosphere.cpr.DefaultBroadcaster.executeAsyncWrite(DefaultBroadcaster.java:899) [atmosphere-runtime-2.2.7.jar:2.2.7] at org.atmosphere.cpr.DefaultBroadcaster$3.run(DefaultBroadcaster.java:520) [atmosphere-runtime-2.2.7.jar:2.2.7] at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) [?:1.8.0_74] at java.util.concurrent.FutureTask.run(FutureTask.java:266) [?:1.8.0_74] at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) [?:1.8.0_74] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) [?:1.8.0_74] at java.lang.Thread.run(Thread.java:745) [?:1.8.0_74] -- 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: [SECURITY] Java Deserialization, JMX and CVE-2016-3427
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Mark, On 5/24/16 10:06 AM, Mark Thomas wrote: > TL;DR If you use remote JMX, you need to update your JVM to address > CVE-2016-3427 > > For the longer version, see the blog post I just published on > this: http://engineering.pivotal.io/post/java-deserialization-jmx/ Okay, I give up: what version of Java 8 actually has this patch? Oracle's site gives me the runaround and tells me that it's been patched in April, but I have no idea what version of Java was published in April, and Oracle's site seems very reticent to tell me :( The CVEs have virtuall no information other than "something bad exists in some versions of some stuff, and you should upgrade". Upgrade to what ? - -chris -BEGIN PGP SIGNATURE- Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAldFwPAACgkQ9CaO5/Lv0PBRjQCeOkzoLqUv6DMHkLWkEbfySe74 tvgAnRnNMavAA9M7Y2FxoTOQ1mo8eIW9 =g9B3 -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [SECURITY] Java Deserialization, JMX and CVE-2016-3427
On Wed, May 25, 2016 at 11:12 AM, Christopher Schultz
wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
> Mark,
>
> On 5/24/16 10:06 AM, Mark Thomas wrote:
>> TL;DR If you use remote JMX, you need to update your JVM to address
>> CVE-2016-3427
>>
>> For the longer version, see the blog post I just published on
>> this: http://engineering.pivotal.io/post/java-deserialization-jmx/
>
> Okay, I give up: what version of Java 8 actually has this patch?
> Oracle's site gives me the runaround and tells me that it's been patched
> in April, but I have no idea what version of Java was published in
> April, and Oracle's site seems very reticent to tell me :(
>
> The CVEs have virtuall no information other than "something bad exists
> in some versions of some stuff, and you should upgrade". Upgrade to what
> ?
When I clicked on the CVE link and the link to oracle page onward in
the Reference section
(CONFIRM:http://www.oracle.com/technetwork/security-advisory/cpuapr2016v3-2985753.html),
I could see the Java version ("Supported Versions Affected" column) in
the table when I look up "CVE-2016-3427".
>
> - -chris
> -BEGIN PGP SIGNATURE-
> Comment: GPGTools - http://gpgtools.org
> Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
>
> iEYEARECAAYFAldFwPAACgkQ9CaO5/Lv0PBRjQCeOkzoLqUv6DMHkLWkEbfySe74
> tvgAnRnNMavAA9M7Y2FxoTOQ1mo8eIW9
> =g9B3
> -END PGP SIGNATURE-
>
> -
> To unsubscribe, e-mail: users-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: users-h...@tomcat.apache.org
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "FAQ/Connectors" by ChristopherSchultz
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "FAQ/Connectors" page has been changed by ChristopherSchultz: https://wiki.apache.org/tomcat/FAQ/Connectors?action=diff&rev1=16&rev2=17 directives to say http:// (or https://) instead of ajp://. This might help you if you need to switch protocols for debugging purposes or if you suddenly need switch to HTTPS to secure the traffic without any - external configuration (e.g. stunnel or VPN). + external configuration (e.g. stunnel or VPN). (See [[AJP with stunnel]].) mod_proxy also supports ProxyPassMatch which lets you use regular expressions in your URL mappings, which mod_jk's JkMount does not - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [SECURITY] Java Deserialization, JMX and CVE-2016-3427
Woonsan,
On 5/25/16 11:29 AM, Woonsan Ko wrote:
> On Wed, May 25, 2016 at 11:12 AM, Christopher Schultz
> wrote:
> Mark,
>
> On 5/24/16 10:06 AM, Mark Thomas wrote:
TL;DR If you use remote JMX, you need to update your JVM to address
CVE-2016-3427
For the longer version, see the blog post I just published on
this: http://engineering.pivotal.io/post/java-deserialization-jmx/
>
> Okay, I give up: what version of Java 8 actually has this patch?
> Oracle's site gives me the runaround and tells me that it's been patched
> in April, but I have no idea what version of Java was published in
> April, and Oracle's site seems very reticent to tell me :(
>
> The CVEs have virtuall no information other than "something bad exists
> in some versions of some stuff, and you should upgrade". Upgrade to what
> ?
>
>> When I clicked on the CVE link and the link to oracle page onward in
>> the Reference section
>> (CONFIRM:http://www.oracle.com/technetwork/security-advisory/cpuapr2016v3-2985753.html),
>> I could see the Java version ("Supported Versions Affected" column) in
>> the table when I look up "CVE-2016-3427".
Right:
"Java SE: 6u113, 7u99, 8u77; Java SE Embedded: 8u77; JRockit: R28.3.9"
I have Java 1.8.0_91. Am I affected? What about if I had Java 1.8.0_60?
That doesn't give a version range. It makes it seem like only that
version number was affected. It also doesn't say what version has the
fix. What if you are on a beta-release schedule and you have out-of-band
updates from the public ones? What about Java 9? What about Java 5?
The documentation is just horrible.
-chris
signature.asc
Description: OpenPGP digital signature
Re: [VOTE][RESULT] Release Apache Tomcat 9.0.0.M6
A bit late to this but I've done quick sanity checks from a Spring Framework perspective (framework tests, websocket, Servlet 3 async, Servlet 3.1 non-blocking) with no issues encountered. On Mon, May 16, 2016 at 6:34 AM, Mark Thomas wrote: > The following votes were cast: > > Binding: > - alpha: remm, markt, violetagg, fschumacher, kfujino, mgrigorov, rjung > > > The vote therefore passes. > > Thank you to everyone who tested and/or voted on this release. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
[Tomcat Wiki] Update of "AJP with stunnel" by ChristopherSchultz
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "AJP with stunnel" page has been changed by ChristopherSchultz:
https://wiki.apache.org/tomcat/AJP%20with%20stunnel
New page:
= AJP over stunnel =
stunnel is a little more complicated than a normal protocol because it can be
used in a number of different ways. I'll give some contrived examples to see
how you can set it up in different ways, depending upon the support for
encryption of the underlying protocol.
This wiki entry is intended to be a starter-guide and not a replacement for the
fine [https://www.stunnel.org/docs.html|documentation provided by the stunnel
team].
Let's say that you have an HTTPS server, but your client can't speak HTTPS for
some reason. If you set up stunnel on the *client* side, you can connect
locally to the stunnel server and have it establish a secure-connection to the
remote server running HTTPS. Like this:
{{{
client -> localhost:12345 (stunnel)
stunnel -> remote_host:443 (httpd)
}}}
As far as the client is concerned, it's using HTTP to talk to localhost. But
really it's talking to remove_host:443, so everyone is happy. (Yes, there are
issues with URLs and redirects produced by the server, but that's out of scope
for this discussion).
Let's take another example: you have clients that are HTTPS-capable, but the
service you are running can only support HTTP for some reason, and you want to
secure it. Set up stunnel on the *server*, then have your remote clients
connect to *it* and tunnel to localhost. Like this:
{{{
client -> remote_host:443 (stunnel)
stunnel localhost:8080 (httpd)
}}}
As far as the client is concerned, it's using HTTPS to communicate with
remote_host:443, but really it's connecting to remote_host:8080. (Yes, there
are some issues with URLs and redirects but that's out of scope for this
discussion.)
So what if the underling protocol doesn't support TLS at all? Well, then you
have to set up stunnel on *both sides* of the tunnel, like this:
{{{
client (mod_jk) -> localhost:12345 (stunnel)
stunnel -> remote_host:12345 (stunnel)
stunnel -> localhost:8009 (Tomcat)
}}}
The setup for stunnel looks like this for the client (on the web server):
{{{
sslVersion = all
options = NO_SSLv2
options = NO_SSLv3
client = yes
[ajp13s]
accept=localhost:8009
connect=remote_host:8010
}}}
On the server, it looks like this:
{{{
sslVersion = all
options = NO_SSLv2
options = NO_SSLv3
client = no
[ajp13s]
accept=8010
connect=localhost:8009
}}}
On the web server, set your worker's host to "localhost" and port to 8009.
mod_jk will connect to localhost:8009 which stunnel will accept and forward
over the network to remote_host:8010 which will be accepted by stunnel on the
server and forwarded to localhost:8009 on the server.
stunnel is great because it will auto-reconnect if the connection is dropped
for some reason. Remember a few things with stunnel:
1. Depending upon the version, you might only be able to use TLSv1 (and not
e.g. TLSv1.2)
2. stunnel generally ignores certificate issues, such as expiration, etc. You
might want to configure it with a little more care than the default. '''THIS
ALSO MEANS IT DOES NOT AUTHENTICATE THE SERVER BY DEFAULT'''. You could
accidentally connect to a malicious server.
This should be enough to get you started. Please refer to the official stunnel
documentation for specifics.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: 8.0.35 Javadoc problems
Did this issue hold up the release announcement for 8.0.35? There was a user in #tomcat asking why it wasn't announced and was concerned that the release had issues. -Coty - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: [SECURITY] Java Deserialization, JMX and CVE-2016-3427
> From: Christopher Schultz [mailto:ch...@christopherschultz.net] > Subject: Re: [SECURITY] Java Deserialization, JMX and CVE-2016-3427 > "Java SE: 6u113, 7u99, 8u77; Java SE Embedded: 8u77; JRockit: R28.3.9" > I have Java 1.8.0_91. Am I affected? No. > What about if I had Java 1.8.0_60? Yes. > That doesn't give a version range. It makes it seem like only that > version number was affected. It also doesn't say what version has the > fix. Oracle has certainly made a mess of it. (Among other things, they decided to co-opt the acronym "CPU", intending it to stand for "Critical Patch Update"; I guess they were unaware it had any prior meaning.) As far as the affected versions go, that column means the specified version and all priors are impacted, and all later versions include the fix. Not at all clear. > What if you are on a beta-release schedule and you have out-of-band > updates from the public ones? Then you get direct weekly e-mails from Oracle describing what's in each CPU, when it will be available, and what build number it will be. > What about Java 9? That's included in the e-mails mentioned above. It's still in major flux, so no one should be using it in production or anywhere else that can be accessed from the internet. > What about Java 5? Not supported, unless you pay lots of money, in which case you get e-mails. - Chuck THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY MATERIAL and is thus for use only by the intended recipient. If you received this in error, please contact the sender and delete the e-mail and its attachments from all computers. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tomcat 8.5: Avoid NPE on bind for APR when using SSL.
This needs to be ported back to 8.5. http://svn.apache.org/viewvc?view=revision&revision=1726515 - Matt
Re: Tomcat 8.5: Avoid NPE on bind for APR when using SSL.
2016-05-25 19:11 GMT+02:00 Matt Cosentino : > This needs to be ported back to 8.5. > > http://svn.apache.org/viewvc?view=revision&revision=1726515 > > No. Rémy
Re: [SECURITY] Java Deserialization, JMX and CVE-2016-3427
On 25/05/2016 16:12, Christopher Schultz wrote: > Mark, > > On 5/24/16 10:06 AM, Mark Thomas wrote: >> TL;DR If you use remote JMX, you need to update your JVM to address >> CVE-2016-3427 > >> For the longer version, see the blog post I just published on >> this: http://engineering.pivotal.io/post/java-deserialization-jmx/ > > Okay, I give up: what version of Java 8 actually has this patch? 8u91 onwards. If you want the fix in an early Java version then you'll need to be paying Oracle $$$ for extended Java support > Oracle's site gives me the runaround and tells me that it's been patched > in April, but I have no idea what version of Java was published in > April, and Oracle's site seems very reticent to tell me :( > > The CVEs have virtuall no information other than "something bad exists > in some versions of some stuff, and you should upgrade". Upgrade to what > ? At least you can derive that form public information. What annoys me far more is that Oracle provide next to no detail with their CVE announcements so it is impossible for a user to determine if the issue affects them or not. For example, this issue only applies if you are using JMX/RMI. If you are, it is likely to be a significant risk. If you aren't, it won't affect you. One of the reasons I published that blog post was to provide folks with the information they need to figure out whether this affects them or not. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: 8.0.35 Javadoc problems
On 25/05/2016 17:00, Coty Sutherland wrote: > Did this issue hold up the release announcement for 8.0.35? There was > a user in #tomcat asking why it wasn't announced and was concerned > that the release had issues. No. I just forgot to send out the announcement. I'll get that done shortly. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 8.0.35 available
Apologies for the delay in sending this out. The Apache Tomcat team announces the immediate availability of Apache Tomcat 8.0.35. Apache Tomcat 8.0 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language and Java WebSocket technologies. Apache Tomcat 8.0.35 includes fixes for issues identified in 8.0.33 as well as other enhancements and changes. The notable changes since 8.0.33 include: - Make the default TLS configuration more secure. - Update the packaged version of the Tomcat Native Library to 1.2.7 to pick up the Windows binaries that are based on OpenSSL 1.0.2h and APR 1.5.2. 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
[Bug 59179] HTTP Public Key Pinning for Tomcat
https://bz.apache.org/bugzilla/show_bug.cgi?id=59179 --- Comment #2 from Abdessamed MANSOURI --- Created attachment 33891 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33891&action=edit Patch for what Mark recommended. This patch is based on OP's patch, i did what Mark recommended. -- 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: 8.0.35 Javadoc problems
> No. I just forgot to send out the announcement. I'll get that done shortly. Cool, thanks! - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [DISCUSS] Logging
On 25/05/2016 15:03, Mark Thomas wrote: > On 25/05/2016 12:26, Rémy Maucherat wrote: >> 2016-05-25 12:43 GMT+02:00 Mark Thomas : >>> 1. Simplified JULI that uses JUL directly but with our existing >>> LogManager and configuration extensions. >>> Thoughts? >>> >> >> I'd vote 6. Switching is a lot of trouble with little benefit. >> What would be the changes for 1 exactly ? The thing is/was supposed to be >> simple already. > To be sure of the performance impact, we'd need to try it. I took a > quick look at this and it isn't quite as simple as a global search and > replace. I've set up a local branch where I can try this. I'll see how > much work it turns out to be. It is 2-3 hours of effort to switch all the Tomcat code to go directly to j.u.l. There is a fair amount of automated conversion so some further manual clean-up is likely to be required. Pros: - No need for JARs to depend on JULI. In theory this makes it easier for other folks to consume things like Jasper or Tomcat JDBC. - JULI becomes a 'drop-in' extension to j.u.l. that folks can use without having to change any existing code Cons: - It breaks multiple APIs. We pass Log instances in quite a few places. - Minimal performance difference. I ran the same test 5 times with no clear performance difference. If there is one, it is going to be small. - It is likely to cause merge errors for back-ports. - The code isn't as clean as the Logger API does not support log.(String, Throwable) Overall, I think this was an interesting experiment but it is not worth it for the majority of the code. If there is demand from down-stream consumers of components like Jasper or WebSocket to remove the JULI dependency then we can look at that on a case by case basis. I'll keep the branch locally for now in case it is useful. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1745535 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/ha/context/ catalina/startup/ catalina/tribes/transport/bio/ catalina/tribes/util/ tomcat/util/descriptor/web/
Author: markt
Date: Wed May 25 20:44:36 2016
New Revision: 1745535
URL: http://svn.apache.org/viewvc?rev=1745535&view=rev
Log:
Remove unnecessary whitespace
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/EngineConfig.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
tomcat/trunk/java/org/apache/catalina/tribes/util/Logs.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1745535&r1=1745534&r2=1745535&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed May 25
20:44:36 2016
@@ -77,7 +77,7 @@ import org.apache.tomcat.util.modeler.Ut
public class StandardWrapper extends ContainerBase
implements ServletConfig, Wrapper, NotificationEmitter {
-private static final Log log = LogFactory.getLog( StandardWrapper.class );
+private static final Log log = LogFactory.getLog(StandardWrapper.class);
protected static final String[] DEFAULT_SERVLET_METHODS = new String[] {
"GET", "HEAD", "POST" };
Modified:
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=1745535&r1=1745534&r2=1745535&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Wed
May 25 20:44:36 2016
@@ -43,7 +43,7 @@ import org.apache.tomcat.util.res.String
*/
public class ReplicatedContext extends StandardContext implements MapOwner {
private int mapSendOptions = Channel.SEND_OPTIONS_DEFAULT;
-private static final Log log = LogFactory.getLog( ReplicatedContext.class
);
+private static final Log log = LogFactory.getLog(ReplicatedContext.class);
protected static final long DEFAULT_REPL_TIMEOUT = 15000;//15 seconds
private static final StringManager sm =
StringManager.getManager(ReplicatedContext.class);
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1745535&r1=1745534&r2=1745535&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed May 25
20:44:36 2016
@@ -116,7 +116,7 @@ import org.xml.sax.SAXParseException;
*/
public class ContextConfig implements LifecycleListener {
-private static final Log log = LogFactory.getLog( ContextConfig.class );
+private static final Log log = LogFactory.getLog(ContextConfig.class);
/**
Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineConfig.java?rev=1745535&r1=1745534&r2=1745535&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/EngineConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/EngineConfig.java Wed May 25
20:44:36 2016
@@ -38,7 +38,7 @@ public class EngineConfig
implements LifecycleListener {
-private static final Log log = LogFactory.getLog( EngineConfig.class );
+private static final Log log = LogFactory.getLog(EngineConfig.class);
// - Instance Variables
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?rev=1745535&r1=1745534&r2=1745535&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
Wed May 25 20:44:36 2016
@@ -44,7 +44,7 @@ import org.apache.juli.logging.LogFactor
*/
public class BioReplicationTask extends AbstractRxTask {
-private static final Log log = LogFactory.getLog( BioReplicationTask.class
svn commit: r1745538 - in /tomcat/trunk/test/org/apache: catalina/nonblocking/TestNonBlockingAPI.java tomcat/util/net/TestXxxEndpoint.java
Author: markt
Date: Wed May 25 20:47:26 2016
New Revision: 1745538
URL: http://svn.apache.org/viewvc?rev=1745538&view=rev
Log:
Remove unnecessary Log definitions. Parent class defines a Log.
Modified:
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
tomcat/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
Modified:
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1745538&r1=1745537&r2=1745538&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Wed May 25 20:47:26 2016
@@ -50,14 +50,10 @@ import org.apache.catalina.startup.Teste
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.valves.TesterAccessLogValve;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteChunk;
public class TestNonBlockingAPI extends TomcatBaseTest {
-private static final Log log = LogFactory.getLog(TestNonBlockingAPI.class);
-
private static final int CHUNK_SIZE = 1024 * 1024;
private static final int WRITE_SIZE = CHUNK_SIZE * 10;
private static final byte[] DATA = new byte[WRITE_SIZE];
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java?rev=1745538&r1=1745537&r2=1745538&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java Wed May
25 20:47:26 2016
@@ -30,8 +30,6 @@ import org.junit.Test;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jni.Address;
import org.apache.tomcat.jni.Error;
import org.apache.tomcat.jni.Library;
@@ -45,8 +43,6 @@ import org.apache.tomcat.jni.Socket;
*/
public class TestXxxEndpoint extends TomcatBaseTest {
-private static Log log = LogFactory.getLog(TestXxxEndpoint.class);
-
private long createAprPool() {
// Create the pool for the server socket
-
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-validate (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-validate has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 1 min 40 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.19-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.19-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20160525.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20160525.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20160525.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-20.0-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.19-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 6.19-SNAPSHOT on 3002 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/webapps/docs/ssl-howto.xml:141: Line matches the illegal pattern '\s+$'. [RegexpSingleline] BUILD FAILED /srv/gump/public/workspace/tomcat-8.0.x/build.xml:545: Got 1 errors and 0 warnings. Total time: 1 minute 39 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20160525180004, vmgump.apache.org:vmgump:20160525180004 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59564] HttpServletRequest.getPart() always returns null with HTTP/2
https://bz.apache.org/bugzilla/show_bug.cgi?id=59564
Violeta Georgieva changed:
What|Removed |Added
Status|NEEDINFO|NEW
--- Comment #4 from Violeta Georgieva ---
Hi,
I was able to reproduce this issue.
I think that we should invoke 'data.arrayOffset() + data.position()' when we
fill the data:
Index: Http2Parser.java
===
--- Http2Parser.java(revision 1745545)
+++ Http2Parser.java(working copy)
@@ -561,7 +561,7 @@
}
default boolean fill(boolean block, ByteBuffer data, int len) throws
IOException {
-boolean result = fill(block, data.array(), data.arrayOffset(),
len);
+boolean result = fill(block, data.array(), data.arrayOffset() +
data.position(), len);
if (result) {
data.position(data.position() + len);
}
What do you think?
Regards,
Violeta
--
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 59604] Invalid url-pattern in servlet mapping on s390x
https://bz.apache.org/bugzilla/show_bug.cgi?id=59604 --- Comment #13 from Dave --- Created attachment 33892 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33892&action=edit conf/web.xml (did not make any changes) -- 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 59604] Invalid url-pattern in servlet mapping on s390x
https://bz.apache.org/bugzilla/show_bug.cgi?id=59604 --- Comment #14 from Dave --- Created attachment 33893 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33893&action=edit log file with nothing in webapps/ -- 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 59604] Invalid url-pattern in servlet mapping on s390x
https://bz.apache.org/bugzilla/show_bug.cgi?id=59604 Dave changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #15 from Dave --- If I remove everything in webapps/ then there are no errors in the startup log. -- 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 57098] Weird Reponse for a HTTP request on HTTPS(SSL) port
https://bz.apache.org/bugzilla/show_bug.cgi?id=57098 Yang changed: What|Removed |Added CC||muyuqiu...@163.com -- 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: r1745563 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/ssl-howto.xml
Author: violetagg Date: Thu May 26 06:38:55 2016 New Revision: 1745563 URL: http://svn.apache.org/viewvc?rev=1745563&view=rev Log: Merged revision 1745337 from tomcat/trunk: Checkstyle. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/docs/ssl-howto.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 26 06:38:55 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677 ,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677 ,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337 Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1745563&r1=1745562&r2=1745563&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu May 26 06:38:55 2016 @@ -92,7 +92,7 @@ Server header may be configured by setting the server attribute on the Connector. A new Connector attribute, serverRemoveAppProvidedValues may be used to -remove any Server header set by a web application. (markt) +remove any Server header set by a web application. (markt) Modified: tomcat/tc8.5.x/trunk/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/ssl-howto.xml?rev=1745563&r1=1745562&r2=1745563&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/ssl-howto.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/ssl-howto.xml Thu May 26 06:38:55 2016 @@ -138,7 +138,7 @@ scenarios, they are not suitable for any When securing a website with SSL
svn commit: r1745564 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/ssl-howto.xml
Author: violetagg Date: Thu May 26 06:41:35 2016 New Revision: 1745564 URL: http://svn.apache.org/viewvc?rev=1745564&view=rev Log: Merged revision 1745337 from tomcat/trunk: Checkstyle. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/ssl-howto.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 26 06:41:35 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,16945
svn commit: r1745565 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/ssl-howto.xml
Author: violetagg Date: Thu May 26 06:44:20 2016 New Revision: 1745565 URL: http://svn.apache.org/viewvc?rev=1745565&view=rev Log: Merged revision 1745337 from tomcat/trunk: Checkstyle. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/ssl-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 26 06:44:20 2016 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1 726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272 /tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228 -/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
svn commit: r1745566 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/ssl-howto.xml
Author: violetagg Date: Thu May 26 06:45:54 2016 New Revision: 1745566 URL: http://svn.apache.org/viewvc?rev=1745566&view=rev Log: Merged revision 1745337 from tomcat/trunk: Checkstyle. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 26 06:45:54 2016 @@ -1,4 +1,4 @@ /tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989 ,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230 /tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152 /tomcat/tc8.5.x/trunk:1737199,1737966,1738044,1741174,1741182,1741191,1741209,1741226,1741233,1742277,1743118,1743139-1743140,1744059,1744127,1744151,1744232,1744377,1744687,1745228 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770 809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379
