date:20161006

[Bug 60208] Regression: Cookies whose names match the web application context are now missing from request.getCookies() result

2016-10-06 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
As of Tomcat 8.5.x, cookies are processed as per RFC6265.

'/' is not a valid character for a cookie name in RFC6265 so the cookie will be
ignored.

You have the option of fixing the broken cookie or configuring Tomcat to use
the legacy cookie parser.

Further support is available from the Tomcat users mailing list.

-- 
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 60199] Improve error message if a session attribute could not load due to deserialization problems

2016-10-06 Thread bugzilla

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

--- Comment #4 from igor.muk...@gmx.de ---
I never saw such a warning on the tomcat shutdown. And I just tested it, and I
don't any warning still.

But I see the line you meant in the code of StandardSession.doWriteObject:

manager.getContext().getLogger().warn(
sm.getString("standardSession.notSerializable", saveNames.get(i), id), e);

In the debugger I see the line executed not I don't see any output in my logs.
Really strange. (This is a Spring Boot project with devtools)

Still I think telling the name of the attribute which caused the problem on the
tomcat start would be helpful, because one would know right away what the
problem is, and he does not need to know that there was a message in the
shutdown log which nobody every reads.

-- 
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: r1763505 - /tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java

2016-10-06 Thread violetagg

Author: violetagg
Date: Thu Oct  6 07:30:12 2016
New Revision: 1763505

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

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1763505&r1=1763504&r2=1763505&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu Oct  
6 07:30:12 2016
@@ -35,9 +35,7 @@ import org.apache.catalina.Globals;
 import org.apache.coyote.ActionCode;
 import org.apache.coyote.Response;
 import org.apache.tomcat.util.buf.B2CConverter;
-import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.C2BConverter;
-import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
@@ -48,8 +46,7 @@ import org.apache.tomcat.util.res.String
  * @author Costin Manolache
  * @author Remy Maucherat
  */
-public class OutputBuffer extends Writer
-implements ByteChunk.ByteOutputChannel, CharChunk.CharOutputChannel {
+public class OutputBuffer extends Writer {
 
 private static final StringManager sm = 
StringManager.getManager(OutputBuffer.class);
 
@@ -340,7 +337,6 @@ public class OutputBuffer extends Writer
  *
  * @throws IOException An underlying IOException occurred
  */
-@Override
 public void realWriteBytes(byte buf[], int off, int cnt) throws 
IOException {
 
 if (closed) {
@@ -374,7 +370,6 @@ public class OutputBuffer extends Writer
  *
  * @throws IOException An underlying IOException occurred
  */
-@Override
 public void realWriteBytes(ByteBuffer buf) throws IOException {
 
 if (closed) {
@@ -486,7 +481,6 @@ public class OutputBuffer extends Writer
  *
  * @throws IOException An underlying IOException occurred
  */
-@Override
 public void realWriteChars(char buf[], int off, int len) throws 
IOException {
 
 CharBuffer outputCharChunk = CharBuffer.wrap(buf, off, len);



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

svn commit: r1763506 - in /tomcat/site/trunk: docs/migration-85.html docs/migration-9.html xdocs/migration-85.xml xdocs/migration-9.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 07:31:40 2016
New Revision: 1763506

URL: http://svn.apache.org/viewvc?rev=1763506&view=rev
Log:
Add cookie processing changes to the migration guide

Modified:
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/migration-9.xml

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1763506&r1=1763505&r2=1763506&view=diff
==
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Thu Oct  6 07:31:40 2016
@@ -249,6 +249,9 @@
 SessionManager
 
 
+Cookies
+
+
 Web applications
 
 
@@ -530,7 +533,7 @@ of Apache Tomcat.
 
 
 
-Clarify are:
+The replacements are as follows:
 
 
   
@@ -542,7 +545,7 @@ of Apache Tomcat.
 
   
 The maxInactiveInterval attribute has been deprecated in
-  8.0. If the value is specified, a warning log is Issued. This should
+  8.0. If the value is specified, a warning log is issued. This should
   be configured via the Context. The value is inherited based on the
   value of the  element in
   /WEB-INF/web.xml.
@@ -555,6 +558,22 @@ of Apache Tomcat.
   
 
 
+
+  
+
+Cookies
+
+  
+
+The default CookieProcessor is now the
+Rfc6265CookieProcessor. The CookieProcessor is
+configurable per Context and the
+LegacyCookieProcessor may be used to obtain the 8.0.x
+behaviour.
+
+  
+
+
 
   
 

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1763506&r1=1763505&r2=1763506&view=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Thu Oct  6 07:31:40 2016
@@ -267,6 +267,9 @@
 SessionManager
 
 
+Cookies
+
+
 Web applications
 
 
@@ -683,7 +686,7 @@ of Apache Tomcat.
 
 
 
-Clarify are:
+The replacements are as follows:
 
 
   
@@ -695,7 +698,7 @@ of Apache Tomcat.
 
   
 The maxInactiveInterval attribute has been deprecated in
-  8.0. If the value is specified, a warning log is Issued. This should
+  8.0. If the value is specified, a warning log is issued. This should
   be configured via the Context. The value is inherited based on the
   value of the  element in
   /WEB-INF/web.xml.
@@ -708,6 +711,22 @@ of Apache Tomcat.
   
 
 
+
+  
+
+Cookies
+
+  
+
+The default CookieProcessor is now the
+Rfc6265CookieProcessor. The CookieProcessor is
+configurable per Context and the
+LegacyCookieProcessor may be used to obtain the 8.0.x
+behaviour.
+
+  
+
+
 
   
 

Modified: tomcat/site/trunk/xdocs/migration-85.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-85.xml?rev=1763506&r1=1763505&r2=1763506&view=diff
==
--- tomcat/site/trunk/xdocs/migration-85.xml (original)
+++ tomcat/site/trunk/xdocs/migration-85.xml Thu Oct  6 07:31:40 2016
@@ -162,7 +162,7 @@ of Apache Tomcat.
   sessionIdLength
 
 
-Clarify are:
+The replacements are as follows:
 
   The distributable attribute has been deprecated in 8.0
   and specified value is ignored. This should be configured via the
@@ -170,7 +170,7 @@ of Apache Tomcat.
   the  element in
   /WEB-INF/web.xml.
   The maxInactiveInterval attribute has been deprecated in
-  8.0. If the value is specified, a warning log is Issued. This should
+  8.0. If the value is specified, a warning log is issued. This should
   be configured via the Context. The value is inherited based on the
   value of the  element in
   /WEB-INF/web.xml.
@@ -180,6 +180,16 @@ of Apache Tomcat.
 
   
 
+  
+  
+The default CookieProcessor is now the
+Rfc6265CookieProcessor. The CookieProcessor is
+configurable per Context and the
+LegacyCookieProcessor may be used to obtain the 8.0.x
+behaviour.
+
+  
+
   
   
 The Manager and HostManager web applications are configured by default

Modified: tomcat/site/trunk/xdocs/migration-9.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1763506&r1=1763505&r2=1763506&view=diff
==
--- tomcat/site/trunk/xdocs/migration-9.xml (original)
+++ tomcat/site/trunk/xdocs/migration-9.xml Thu Oct  6 07:31:40 2016
@@ -235,7 +235,7 @@ of Apache Tomcat.
   sessionIdLength
 
 
-Clarify are:
+The replacements are as follows:
 
   The distributable attribute has been depre

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

2016-10-06 Thread Bill Barker

To whom it may engage...

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

Project tomcat-trunk-test-nio2 has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 4 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
 -WARNING- No directory 
[/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: 28 mins 36 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 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.5-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161006-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20161006.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20161006-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-20161006/bin/openssl
 -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/pub

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

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 07:52:28 2016
New Revision: 1763510

URL: http://svn.apache.org/viewvc?rev=1763510&view=rev
Log:
Copy the 9.0.0.M1 to M4 change log entries to the 8.5.x changelog to make it 
easier for people to find the changes in 8..x compared to 8.0.x

Modified:
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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=1763510&r1=1763509&r2=1763510&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Oct  6 07:52:28 2016
@@ -1307,14 +1307,738 @@
   
 
 
+  
+
+  
+Remove support for Comet. (markt)
+  
+  
+Tighten up the default file permissions for the .tar.gz
+distribution so no files or directories are world readable by default.
+Configure Tomcat to run with a default umask of 0027 which
+may be overridden by setting UMASK in
+setenv.sh. (markt)
+  
+  
+Remove native code (Windows Service Wrapper, APR/native connector)
+support for Windows Itanium. (markt)
+  
+
+  
+  
+
+  
+The default HTTP cookie parser has been changed to
+org.apache.tomcat.util.http.Rfc6265CookieProcessor. 
(markt)
+  
+  
+Refactor creation of MapperListener to ensure that the
+Mapper used is the Mapper associated with the
+Service for which the listener was created. (markt)
+  
+  
+Move the functionality that provides redirects for context roots and
+directories where a trailing / is added from the Mapper to
+the DefaultServlet. This enables such requests to be
+processed by any configured Valves and Filters before the redirect is
+made. This behaviour is configurable via the
+mapperContextRootRedirectEnabled and
+mapperDirectoryRedirectEnabled attributes of the Context
+which may be used to restore the previous behaviour. (markt)
+  
+  
+Refactor Service.getContainer() to return an
+Engine rather than a Container. (markt)
+  
+  
+34319: Only load those keys in
+StoreBase.processExpire from JDBCStore that are old enough
+to be expired. Based on a patch by Tom Anderson. (fschumacher)
+  
+  
+58351: Make the server build date and server version number
+accessible via JMX. Patch provided by  Huxing Zhang. (markt)
+  
+  
+56917: As per RFC7231 (HTTP/1.1), allow HTTP/1.1 and later
+redirects to use relative URIs. This is controlled by a new attribute
+useRelativeRedirects on the Context and
+defaults to true. (markt)
+  
+  
+58629: Allow an embedded Tomcat instance to start when the
+Service has no Engine configured. (markt)
+  
+  
+Correctly notify the MapperListener associated with a Service if the
+Engine for that Service is changed. (markt)
+  
+  
+Make a web application's CredentialHandler available through a context
+attribute. This allows a web application to use the same algorithm
+for validating or generating new stored credentials from cleartext
+ones. (schultz)
+  
+  
+58635: Enable break points to be set within agent code when
+running Tomcat with a Java agent. Based on a patch by Huxing Zhang.
+(markt)
+  
+  
+Fixed potential NPE in HostConfig while deploying an
+application. Issue reported by coverity scan. (violetagg)
+  
+  
+58655: Fix an  IllegalStateException when
+calling HttpServletResponse.sendRedirect() with the
+RemoteIpFilter. This was caused by trying to correctly
+generate the absolute URI for the redirect. With the fix for
+56917, redirects may now be relative making the
+sendRedirect() implementation for the
+RemoteIpFilter much simpler. This also addresses issues
+where the redirect may not have behaved as expected when redirecting
+from http to https to from https to http. (markt)
+  
+  
+58657: Exceptions in a Servlet 3.1 ReadListener
+or WriteListener do not need to be immediately fatal to 
the
+connection. Allow an error response to be written. (markt)
+  
+  
+Correct implementation of
+validateClientProvidedNewSessionId so client provided
+session IDs may be rejected if validation is enabled. (markt)
+  
+  
+58701: Reset the instanceInitialized field in
+StandardWrapper when unloading a Servlet so that a new
+instance may be correctly initialized. (markt)
+  
+  
+Add a new flag aprPreferred to the Apr listener.

svn commit: r1763511 - /tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java

2016-10-06 Thread violetagg

Author: violetagg
Date: Thu Oct  6 07:58:47 2016
New Revision: 1763511

URL: http://svn.apache.org/viewvc?rev=1763511&view=rev
Log:
Use ByteBuffer instead of ByteChunk. This is in a preparation for removing 
o.a.coyote.InputBuffer.doRead(ByteChunk).

Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java?rev=1763511&r1=1763510&r2=1763511&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java 
Thu Oct  6 07:58:47 2016
@@ -18,6 +18,8 @@
 package org.apache.coyote.http11.filters;
 
 import java.io.IOException;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.coyote.InputBuffer;
@@ -39,7 +41,7 @@ public class BufferedInputFilter impleme
 
 // - Instance Variables
 
-private ByteChunk buffered = null;
+private ByteBuffer buffered;
 private final ByteChunk tempRead = new ByteChunk(1024);
 private InputBuffer buffer;
 private boolean hasRead = false;
@@ -64,8 +66,8 @@ public class BufferedInputFilter impleme
  */
 public void setLimit(int limit) {
 if (buffered == null) {
-buffered = new ByteChunk(4048);
-buffered.setLimit(limit);
+buffered = ByteBuffer.allocate(limit);
+buffered.flip();
 }
 }
 
@@ -81,10 +83,12 @@ public class BufferedInputFilter impleme
 // save off the Request body
 try {
 while (buffer.doRead(tempRead) >= 0) {
-buffered.append(tempRead);
+
buffered.mark().position(buffered.limit()).limit(buffered.capacity());
+buffered.put(tempRead.getBytes(), tempRead.getStart(), 
tempRead.getLength());
+buffered.limit(buffered.position()).reset();
 tempRead.recycle();
 }
-} catch(IOException ioe) {
+} catch(IOException | BufferOverflowException ioe) {
 // No need for i18n - this isn't going to get logged anywhere
 throw new IllegalStateException(
 "Request body too large for buffer");
@@ -96,12 +100,12 @@ public class BufferedInputFilter impleme
  */
 @Override
 public int doRead(ByteChunk chunk) throws IOException {
-if (hasRead || buffered.getLength() <= 0) {
+if (isFinished()) {
 return -1;
 }
 
-chunk.setBytes(buffered.getBytes(), buffered.getStart(),
-buffered.getLength());
+chunk.setBytes(buffered.array(), buffered.arrayOffset() + 
buffered.position(),
+buffered.remaining());
 hasRead = true;
 return chunk.getLength();
 }
@@ -114,10 +118,10 @@ public class BufferedInputFilter impleme
 @Override
 public void recycle() {
 if (buffered != null) {
-if (buffered.getBuffer().length > 65536) {
+if (buffered.capacity() > 65536) {
 buffered = null;
 } else {
-buffered.recycle();
+buffered.position(0).limit(0);
 }
 }
 tempRead.recycle();
@@ -137,12 +141,12 @@ public class BufferedInputFilter impleme
 
 @Override
 public int available() {
-return buffered.getLength();
+return buffered.remaining();
 }
 
 
 @Override
 public boolean isFinished() {
-return hasRead || buffered.getLength() <= 0;
+return hasRead || buffered.remaining() <= 0;
 }
 }



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

[Bug 60199] Improve error message if a session attribute could not load due to deserialization problems

2016-10-06 Thread bugzilla

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

--- Comment #5 from Mark Thomas  ---
With the proposed patch the error is logged higher up the stack. I suspect a
logging configuration issue. The users list is the place to seek help with
that.

The proposed patch also causes deserialization to stop on the first error. That
is not the desired behaviour.

I have an alternative patch that I'll apply shortly that logs a warn message
with the attribute name or a debug message that includes the stack trace.

-- 
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: r1763512 - in /tomcat/trunk: java/org/apache/catalina/session/LocalStrings.properties java/org/apache/catalina/session/StandardSession.java webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:11:15 2016
New Revision: 1763512

URL: http://svn.apache.org/viewvc?rev=1763512&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60199
Log a warning if deserialization issues prevent a session attribute from being 
loaded.

Modified:
tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1763512&r1=1763511&r2=1763512&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/LocalStrings.properties Thu 
Oct  6 08:11:15 2016
@@ -56,6 +56,7 @@ standardSession.getThisAccessedTime.ise=
 standardSession.getLastAccessedTime.ise=getLastAccessedTime: Session already 
invalidated
 standardSession.getValueNames.ise=getValueNames: Session already invalidated
 standardSession.logoutfail=Exception logging out user when expiring session
+standardSession.notDeserializable=Cannot deserialize session attribute {0} for 
session {1}
 standardSession.notSerializable=Cannot serialize session attribute {0} for 
session {1}
 standardSession.removeAttribute.ise=removeAttribute: Session already 
invalidated
 standardSession.sessionEvent=Session event listener threw exception

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1763512&r1=1763511&r2=1763512&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Thu Oct  
6 08:11:15 2016
@@ -1611,6 +1611,12 @@ public class StandardSession implements
 value = stream.readObject();
 } catch (WriteAbortedException wae) {
 if (wae.getCause() instanceof NotSerializableException) {
+String msg = 
sm.getString("standardSession.notDeserializable", name, id);
+if (manager.getContext().getLogger().isDebugEnabled()) {
+manager.getContext().getLogger().debug(msg, wae);
+} else {
+manager.getContext().getLogger().warn(msg);
+}
 // Skip non serializable attributes
 continue;
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763512&r1=1763511&r2=1763512&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  6 08:11:15 2016
@@ -121,6 +121,10 @@
 60196: Ensure that the isMandatory flag is
 correctly set when using JASPIC authentication. (markt)
   
+  
+60199: Log a warning if deserialization issues prevent a
+session attribute from being loaded. (markt)
+  
 
   
   



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

svn commit: r1763513 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/session/LocalStrings.properties java/org/apache/catalina/session/StandardSession.java webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:11:42 2016
New Revision: 1763513

URL: http://svn.apache.org/viewvc?rev=1763513&view=rev
Log:
Log a warning if deserialization issues prevent a session attribute from being 
loaded.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

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

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

[Bug 60199] Improve error message if a session attribute could not load due to deserialization problems

2016-10-06 Thread bugzilla

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

--- Comment #6 from igor.muk...@gmx.de ---
Mark, great! Thank you.

-- 
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: r1763514 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/session/LocalStrings.properties java/org/apache/catalina/session/StandardSession.java webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:12:07 2016
New Revision: 1763514

URL: http://svn.apache.org/viewvc?rev=1763514&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60199
Log a warning if deserialization issues prevent a session attribute from being 
loaded.

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

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

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

svn commit: r1763515 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/session/LocalStrings.properties java/org/apache/catalina/session/StandardSession.java webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:12:58 2016
New Revision: 1763515

URL: http://svn.apache.org/viewvc?rev=1763515&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60199
Log a warning if deserialization issues prevent a session attribute from being 
loaded.

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct  6 08:12:58 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,1681703,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,1702
 
742,1702744,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,1
 
726171-1726173,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,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206
-/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,1746940,1748548,1748716,1749288,1749375,1749668-1749669,1750016,1750057,1750976,1751000,1751062,1751098,1754112,1754144,1754282,1754312,1754614,1754726,1754806,1754878,1754889,1754894

[Bug 60199] Improve error message if a session attribute could not load due to deserialization problems

2016-10-06 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #7 from Mark Thomas  ---
This has been fixed in the following branches:
- 9.0.x for 9.0.0.M11 onwards
- 8.5.x for 8.5.6 onwards
- 8.0.x for 8.0.38 onwards
- 7.0.x for 7.0.73 onwards

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

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

[Bug 60208] Regression: Cookies whose names match the web application context are now missing from request.getCookies() result

2016-10-06 Thread bugzilla

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

--- Comment #2 from Réda Housni Alaoui  ---
Hello,

Ok I understand.

But why does Tomcat 8.5.5 correctly create the cookie with '/' in its name when
the application asks it?
Don't you think an exception should be thrown at cookie creation in this case?

I think this behaviour lack of consistency.

-- 
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 on tomcat-7-trunk

2016-10-06 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

svn commit: r1763516 - in /tomcat/trunk: java/javax/servlet/http/Cookie.java test/javax/servlet/http/TestCookieNetscapeValidator.java

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:28:37 2016
New Revision: 1763516

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

Removed:
tomcat/trunk/test/javax/servlet/http/TestCookieNetscapeValidator.java
Modified:
tomcat/trunk/java/javax/servlet/http/Cookie.java

Modified: tomcat/trunk/java/javax/servlet/http/Cookie.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/Cookie.java?rev=1763516&r1=1763515&r2=1763516&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/Cookie.java (original)
+++ tomcat/trunk/java/javax/servlet/http/Cookie.java Thu Oct  6 08:28:37 2016
@@ -419,17 +419,6 @@ class CookieNameValidator {
 }
 }
 
-class NetscapeValidator extends CookieNameValidator {
-// the Netscape specification describes NAME=VALUE as
-// "a sequence of characters excluding semi-colon, comma and white space"
-// we also exclude the '=' character that separates NAME from VALUE
-private static final String NETSCAPE_SEPARATORS = ",; " + "=";
-
-NetscapeValidator() {
-super(NETSCAPE_SEPARATORS);
-}
-}
-
 class RFC6265Validator extends CookieNameValidator {
 private static final String RFC2616_SEPARATORS = "()<>@,;:\\\"/[]?={} \t";
 



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

[Bug 59876] java.io.EOFException is thrown

2016-10-06 Thread bugzilla

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

--- Comment #2 from remi.lebast...@flexcom.lu ---
I have the same problem with the stack trace : 
ERROR org.atmosphere.container.JSR356Endpoint -java.io.EOFException
at
org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.fillReadBuffer(NioEndpoint.java:1222)
~[tomcat-coyote.jar:8.5.3]
at
org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.isReadyForRead(NioEndpoint.java:1128)
~[tomcat-coyote.jar:8.5.3]
at
org.apache.tomcat.websocket.server.WsFrameServer.onDataAvailable(WsFrameServer.java:58)
~[tomcat-websocket.jar:8.5.3]
at
org.apache.tomcat.websocket.server.WsHttpUpgradeHandler.upgradeDispatch(WsHttpUpgradeHandler.java:148)
[tomcat-websocket.jar:8.5.3]
at
org.apache.coyote.http11.upgrade.UpgradeProcessorInternal.dispatch(UpgradeProcessorInternal.java:54)
[tomcat-coyote.jar:8.5.3]
at
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:53)
[tomcat-coyote.jar:8.5.3]
at
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:785)
[tomcat-coyote.jar:8.5.3]
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1425)
[tomcat-coyote.jar:8.5.3]
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:52)
[tomcat-coyote.jar:8.5.3]
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
[?:1.8.0_91]
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
[?:1.8.0_91]
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
[tomcat-util.jar:8.5.3]
at java.lang.Thread.run(Thread.java:745) [?:1.8.0_91]

The class have changed due to tomcat development (I'm on a 8.5.3 version) but I
think it's the same bug.
The issue seems to appear only on linux environment.
I will investigate and put a test case as soon as I have a moment for that
because it's tricky to reproduce!

-- 
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 60208] Regression: Cookies whose names match the web application context are now missing from request.getCookies() result

2016-10-06 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|INVALID |---
 Status|RESOLVED|REOPENED

--- Comment #3 from Mark Thomas  ---
Agreed. Generation and parsing should be consistent. '/' was an edge case that
wasn't handled correctly. I'll get that fixed.

-- 
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: r1763518 - in /tomcat/trunk: java/javax/servlet/http/Cookie.java webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:44:44 2016
New Revision: 1763518

URL: http://svn.apache.org/viewvc?rev=1763518&view=rev
Log:
When using RFC6265 compliant cookies, the / character should not be allowed in 
a cookie name since the RFC6265 will drop such cookies as invalid.

Modified:
tomcat/trunk/java/javax/servlet/http/Cookie.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/javax/servlet/http/Cookie.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/Cookie.java?rev=1763518&r1=1763517&r2=1763518&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/Cookie.java (original)
+++ tomcat/trunk/java/javax/servlet/http/Cookie.java Thu Oct  6 08:44:44 2016
@@ -424,7 +424,11 @@ class RFC6265Validator extends CookieNam
 
 RFC6265Validator() {
 super(RFC2616_SEPARATORS);
+}
+}
 
+class RFC2109Validator extends RFC6265Validator {
+RFC2109Validator() {
 // special treatment to allow for FWD_SLASH_IS_SEPARATOR property
 boolean allowSlash;
 String prop = 
System.getProperty("org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR");
@@ -437,11 +441,6 @@ class RFC6265Validator extends CookieNam
 allowed.set('/');
 }
 }
-}
-
-class RFC2109Validator extends RFC6265Validator {
-RFC2109Validator() {
-}
 
 @Override
 void validate(String name) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763518&r1=1763517&r2=1763518&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  6 08:44:44 2016
@@ -125,6 +125,11 @@
 60199: Log a warning if deserialization issues prevent a
 session attribute from being loaded. (markt)
   
+  
+60298: When using RFC6265 compliant cookies, the
+/ character should not be allowed in a cookie name since
+the RFC6265 will drop such cookies as invalid. (markt)
+  
 
   
   



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

svn commit: r1763519 - in /tomcat/tc8.5.x/trunk: ./ java/javax/servlet/http/Cookie.java test/javax/servlet/http/TestCookieNetscapeValidator.java

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:45:24 2016
New Revision: 1763519

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

Removed:

tomcat/tc8.5.x/trunk/test/javax/servlet/http/TestCookieNetscapeValidator.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/javax/servlet/http/Cookie.java

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

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

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:46:11 2016
New Revision: 1763520

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

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763520&r1=1763519&r2=1763520&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  6 08:46:11 2016
@@ -126,7 +126,7 @@
 session attribute from being loaded. (markt)
   
   
-60298: When using RFC6265 compliant cookies, the
+60208: When using RFC6265 compliant cookies, the
 / character should not be allowed in a cookie name since
 the RFC6265 will drop such cookies as invalid. (markt)
   



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

svn commit: r1763521 - in /tomcat/tc8.5.x/trunk: ./ java/javax/servlet/http/Cookie.java webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:46:39 2016
New Revision: 1763521

URL: http://svn.apache.org/viewvc?rev=1763521&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60208
When using RFC6265 compliant cookies, the / character should not be allowed in 
a cookie name since the RFC6265 will drop such cookies as invalid.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/javax/servlet/http/Cookie.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

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

[Bug 60208] Regression: Cookies whose names match the web application context are now missing from request.getCookies() result

2016-10-06 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #4 from Mark Thomas  ---
This has been fixed in the following branches:
- 9.0.x for 9.0.0.M11 onwards
- 8.5.x for 8.5.6 onwards

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

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

svn commit: r1763524 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:55:14 2016
New Revision: 1763524

URL: http://svn.apache.org/viewvc?rev=1763524&view=rev
Log:
Add missing tags

Modified:
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1763524&r1=1763523&r2=1763524&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Thu Oct  6 08:55:14 2016
@@ -44,7 +44,9 @@
   
   
 
-  ISAPI: Align the make files for 32-bit and 64-bit builds. (markt)
+  
+ISAPI: Align the make files for 32-bit and 64-bit builds. (markt)
+  
 
   
 



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

[Bug 59876] java.io.EOFException is thrown

2016-10-06 Thread bugzilla

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

--- Comment #3 from Remy Maucherat  ---
Ok, but this needs to be a bug. IO exceptions will happen once in a while, this
is normal. You don't see them with the regular request processing however as
they are detected and filtered out, but in upgrade mode this is not there (at
least for now), that's the main difference.

-- 
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: r1763526 - in /tomcat/jk/trunk/xdocs: ajp/project.xml common_howto/project.xml miscellaneous/project.xml news/project.xml project.xml reference/project.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 08:57:52 2016
New Revision: 1763526

URL: http://svn.apache.org/viewvc?rev=1763526&view=rev
Log:
Add missing LHS menu links for news section

Modified:
tomcat/jk/trunk/xdocs/ajp/project.xml
tomcat/jk/trunk/xdocs/common_howto/project.xml
tomcat/jk/trunk/xdocs/miscellaneous/project.xml
tomcat/jk/trunk/xdocs/news/project.xml
tomcat/jk/trunk/xdocs/project.xml
tomcat/jk/trunk/xdocs/reference/project.xml

Modified: tomcat/jk/trunk/xdocs/ajp/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/project.xml?rev=1763526&r1=1763525&r2=1763526&view=diff
==
--- tomcat/jk/trunk/xdocs/ajp/project.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/project.xml Thu Oct  6 08:57:52 2016
@@ -67,6 +67,8 @@
 
 
 
+
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/common_howto/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/project.xml?rev=1763526&r1=1763525&r2=1763526&view=diff
==
--- tomcat/jk/trunk/xdocs/common_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/project.xml Thu Oct  6 08:57:52 2016
@@ -67,6 +67,8 @@
 
 
 
+
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/miscellaneous/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/project.xml?rev=1763526&r1=1763525&r2=1763526&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/project.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/project.xml Thu Oct  6 08:57:52 2016
@@ -67,6 +67,8 @@
 
 
 
+
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/project.xml?rev=1763526&r1=1763525&r2=1763526&view=diff
==
--- tomcat/jk/trunk/xdocs/news/project.xml (original)
+++ tomcat/jk/trunk/xdocs/news/project.xml Thu Oct  6 08:57:52 2016
@@ -67,6 +67,8 @@
 
 
 
+
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/project.xml?rev=1763526&r1=1763525&r2=1763526&view=diff
==
--- tomcat/jk/trunk/xdocs/project.xml (original)
+++ tomcat/jk/trunk/xdocs/project.xml Thu Oct  6 08:57:52 2016
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/jk/trunk/xdocs/reference/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/project.xml?rev=1763526&r1=1763525&r2=1763526&view=diff
==
--- tomcat/jk/trunk/xdocs/reference/project.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/project.xml Thu Oct  6 08:57:52 2016
@@ -67,6 +67,8 @@
 
 
 
+
+
 
 
 



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

buildbot failure in on tomcat-trunk

2016-10-06 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1763520
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: r1763527 [3/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ ref

2016-10-06 Thread markt

Modified: tomcat/site/trunk/docs/connectors-doc/common_howto/workers.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/common_howto/workers.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/common_howto/workers.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/common_howto/workers.html Thu Oct  6 
09:00:17 2016
@@ -1,8 +1,8 @@
-The Apache Tomcat Connectors - Common HowTo - 
Workers HowTohttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">LinksDocs HomeCommon 
HowToFor the 
impatientAll about 
workersTimeoutsLoad BalancingReverse 
ProxyWebserver HowToApache HTTP ServerIISNetscape/SunOne/SunReference
 Guideworkers.propertiesuriworkermap.propertie
 sStatus WorkerApache HTTP ServerIISAJP Protocol 
ReferenceAJPv13AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&email
 
assigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews2014201220112010200920
 082007200620052004The Apache Tomcat 
Connectors - Common HowToWorkers HowToprint-friendlyversion
+The Apache Tomcat Connectors - Common HowTo - 
Workers HowTohttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">LinksDocs HomeCommon 
HowToFor the 
impatientAll about 
workersTimeoutsLoad BalancingReverse ProxyWeb 
Server HowToApache HTTP Server 
(mod_jk)Microsoft IIS (ISAPI 
redirector)iPlanet Web 
Server (NSAPI redirector)Reference 
Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP Server (mod_jk)Microsoft IIS (ISAPI 
redirector)AJP Protocol 
ReferenceAJPv13 
(ajp13)AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=
 
ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews201620152014201220112010200920082007200620052004The Apache Tomcat 
Connectors - Common HowToWorkers HowToprint-friendlyversion
 Introduction
 
 A Tomcat worker is a Tomcat instance that is waiting to execute servlets on 
behalf of some web server. 
-For example, we can have a web server such as Apache forwarding servlet 
requests to a 
+For example, we can have a web server such as the Apache HTTP Server 
forwarding servlet requests to a 
 Tomcat process (the worker) running behind it.
 
 
@@ -60,7 +60,7 @@ When starting up, the web server plugin
 worker.list property, these are also the workers to whom you can map 
requests. The directive can be used multiple times.
 
 
-Workers 
Type
+Worker 
Types
 
 Each named worker should also have a few entries to provide additional 
information on his behalf.
 This information includes the worker's type and other related worker 
information. 
@@ -69,10 +69,11 @@ Currently the following worker types tha
 
 
   TypeDescription
-  ajp12This worker knows how to forward requests to 
out-of-process Tomcat workers using the ajpv12 protocol.
-  ajp13This worker knows how to forward requests to 
out-of-process Tomcat workers using the ajpv13 protocol.
-  lbThis is a load-balancing worker; it knows how to provide 
round-robin based sticky load balancing with a certain level of 
fault-tolerance.
+  ajp13This worker knows how to forward requests to 
out-of-process Tomcat workers using the ajp13 protocol.
+  lbThis is a load balancing worker; it knows how to provide 
fl

svn commit: r1763527 [1/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ ref

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 09:00:17 2016
New Revision: 1763527

URL: http://svn.apache.org/viewvc?rev=1763527&view=rev
Log:
Update JK Connectors docs for 1.2.42 release

Added:
tomcat/site/trunk/docs/connectors-doc/news/20160901.html   (with props)
tomcat/site/trunk/docs/connectors-doc/news/printer/20160901.html   (with 
props)
Modified:
tomcat/site/trunk/docs/connectors-doc/ajp/ajpv13a.html
tomcat/site/trunk/docs/connectors-doc/ajp/ajpv13ext.html
tomcat/site/trunk/docs/connectors-doc/ajp/printer/ajpv13a.html
tomcat/site/trunk/docs/connectors-doc/ajp/printer/ajpv13ext.html
tomcat/site/trunk/docs/connectors-doc/common_howto/loadbalancers.html

tomcat/site/trunk/docs/connectors-doc/common_howto/printer/loadbalancers.html
tomcat/site/trunk/docs/connectors-doc/common_howto/printer/proxy.html
tomcat/site/trunk/docs/connectors-doc/common_howto/printer/quick.html
tomcat/site/trunk/docs/connectors-doc/common_howto/printer/timeouts.html
tomcat/site/trunk/docs/connectors-doc/common_howto/printer/workers.html
tomcat/site/trunk/docs/connectors-doc/common_howto/proxy.html
tomcat/site/trunk/docs/connectors-doc/common_howto/quick.html
tomcat/site/trunk/docs/connectors-doc/common_howto/timeouts.html
tomcat/site/trunk/docs/connectors-doc/common_howto/workers.html
tomcat/site/trunk/docs/connectors-doc/index.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/changelog.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/doccontrib.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/faq.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/jkstatustasks.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/changelog.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/doccontrib.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/faq.html

tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/jkstatustasks.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/printer/reporttools.html
tomcat/site/trunk/docs/connectors-doc/miscellaneous/reporttools.html
tomcat/site/trunk/docs/connectors-doc/news/20041100.html
tomcat/site/trunk/docs/connectors-doc/news/20050101.html
tomcat/site/trunk/docs/connectors-doc/news/20060101.html
tomcat/site/trunk/docs/connectors-doc/news/20070301.html
tomcat/site/trunk/docs/connectors-doc/news/20081001.html
tomcat/site/trunk/docs/connectors-doc/news/20090301.html
tomcat/site/trunk/docs/connectors-doc/news/20100101.html
tomcat/site/trunk/docs/connectors-doc/news/20110701.html
tomcat/site/trunk/docs/connectors-doc/news/20120301.html
tomcat/site/trunk/docs/connectors-doc/news/20140201.html
tomcat/site/trunk/docs/connectors-doc/news/20150101.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20041100.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20050101.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20060101.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20070301.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20081001.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20090301.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20100101.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20110701.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20120301.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20140201.html
tomcat/site/trunk/docs/connectors-doc/news/printer/20150101.html
tomcat/site/trunk/docs/connectors-doc/printer/index.html
tomcat/site/trunk/docs/connectors-doc/reference/apache.html
tomcat/site/trunk/docs/connectors-doc/reference/iis.html
tomcat/site/trunk/docs/connectors-doc/reference/printer/apache.html
tomcat/site/trunk/docs/connectors-doc/reference/printer/iis.html
tomcat/site/trunk/docs/connectors-doc/reference/printer/status.html
tomcat/site/trunk/docs/connectors-doc/reference/printer/uriworkermap.html
tomcat/site/trunk/docs/connectors-doc/reference/printer/workers.html
tomcat/site/trunk/docs/connectors-doc/reference/status.html
tomcat/site/trunk/docs/connectors-doc/reference/uriworkermap.html
tomcat/site/trunk/docs/connectors-doc/reference/workers.html
tomcat/site/trunk/docs/connectors-doc/webserver_howto/apache.html
tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html
tomcat/site/trunk/docs/connectors-doc/webserver_howto/nes.html
tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html
tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/iis.html
tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/nes.html

Modified: tomcat/site/trunk/docs/connectors-doc/ajp/ajpv13a.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/ajp/ajpv13a.html?rev=1763527&r1=1763526&r2=1763527&view=diff
===

svn commit: r1763527 [10/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ re

2016-10-06 Thread markt

Modified: tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/webserver_howto/iis.html Thu Oct  6 
09:00:17 2016
@@ -1,12 +1,12 @@
-The Apache Tomcat Connectors - Webserver HowTo - IIS 
HowTohttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">LinksDocs HomeCommon 
HowToFor the 
impatientAll about 
workersTimeoutsLoad BalancingReverse 
ProxyWebserver HowToApache HTTP ServerIISNetscape/SunOne/SunReference
 Guideworkers.propertiesuriworkermap.propertie
 sStatus WorkerApache HTTP ServerIISAJP Protocol 
ReferenceAJPv13AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&email
 
assigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews2014201220112010200920
 082007200620052004The Apache Tomcat 
Connectors - Webserver HowToIIS HowToprint-friendlyversion
+The Apache Tomcat Connectors - Web Server HowTo - 
ISAPI redirector for Micrsoft IIS HowTohttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">LinksDocs 
HomeCommon HowToFor the impatientAll about workersTimeoutsLoad BalancingReverse ProxyWeb 
Server HowToApache HTTP Server 
(mod_jk)Microsoft IIS (ISAPI 
redirector)iPlanet Web 
Server (NSAPI redirector)Reference 
Guideworker
 s.propertiesuriworkermap.propertiesStatus WorkerApache HTTP Server (mod_jk)Microsoft IIS (ISAPI 
redirector)AJP Protocol 
ReferenceAJPv13 
(ajp13)AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&
 
;bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews2014201220112010200920082007200620052004The Apache Tomcat 
Connectors - Web Server HowToISAPI redirector for Micrsoft IIS 
HowToprint-friendlyversion
 Introduction
 
-This document explains how to set up IIS to cooperate with Tomcat. 
+This document explains how to set up the ISAPI redirector for IIS to cooperate 
with Tomcat. 
 
 
 
 Normally IIS can not execute Servlets and Java Server Pages (JSPs), 
-configuring IIS to use the JK ISAPI redirector plugin will let IIS send 
servlet and 
+configuring IIS to use the ISAPI redirector plugin will let IIS send servlet 
and 
 JSP requests to Tomcat (and this way, serve them to clients).
 
 
@@ -47,7 +47,7 @@ A worker is defined to be a tomcat proce
 
 Supported 
Configuration
 
-The IIS-Tomcat redirector works for:
+The IIS to Tomcat redirector works for:
 
 
 WinNT4.0-i386 SP4/SP5/SP6a (should be able to work with other service packs), 
Win98, WinXP, Win2K,
@@ -63,8 +63,8 @@ Tomcat 3.2 to Tomcat 8.
 
 
 
-The redirector uses ajp12 and ajp13 to send requests to the 
Tomcat containers. There is also an option to use Tomcat in process, 
-more about the in-process mode can be found in the in process howto.
+The mod_jk module uses the AJP protocol to send requests to the Tomcat 
containers.
+The AJP version typically used is ajp13.
 
 
 
@@ -92,22 +92,15 @@ because the library is not loadable into
 
 
 
-Who support ajp protocols 
?
+Who supports AJP 
protocols?
 
-The ajp12 protocol is only available in Tomcat 3.2.x and 3.3.x.
+T

svn commit: r1763527 [8/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ ref

2016-10-06 Thread markt

Modified: tomcat/site/trunk/docs/connectors-doc/reference/printer/status.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/printer/status.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/reference/printer/status.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/reference/printer/status.html Thu Oct 
 6 09:00:17 2016
@@ -1,4 +1,4 @@
-The Apache Tomcat Connectors - Reference Guide - 
Status Worker Referencehttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">The Apache Tomcat Connectors - 
Reference GuideStatus Worker ReferenceIntroduction
+The Apache Tomcat Connectors - Reference Guide - 
Status Worker Referencehttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">The Apache Tomcat Connectors - 
Reference GuideStatus Worker ReferenceIntroduction
 
 
 Tomcat Connectors has a special type of worker, the so-called status worker.
@@ -142,7 +142,7 @@ The last three minimisation features hav
 Note: The following restriction has been removed starting with version 
1.2.26.
 
 
-The Apache module mod_jk makes use of the internal Apache httpd infrastructure 
concerning
+The Apache module mod_jk makes use of the internal Apache HTTP Server 
infrastructure concerning
 virtual hosts. The downside of this is, that the status worker can only show 
URL maps, for
 the virtual host it is defined in. It is not able to reach the configuration 
objects
 for other virtual hosts. Of course you can define a status worker in any 
virtual host you
@@ -176,8 +176,8 @@ worker.mystatus.type=status
 Then we define a URL, which should be mapped to this worker, i.e. the URL we 
use
 to reach the functionality of the status worker. You can use any method mod_jk 
supports
 for the web server of your choice. Possibilities are maps inside 
uriworkermap.properties,
-an additional mount attribute in workers.properties, or in Apache JkMount. 
Here's an
-example for a uriworkermap.properties line:
+an additional mount attribute in workers.properties, or JkMount for the Apache 
HTTP Server.
+Here's an example for a uriworkermap.properties line:
 
 /private/admin/mystatus=mystatus
 
@@ -545,5 +545,5 @@ in parameters named "val0", "val1", 
 
 
 
-Copyright © 1999-2015, Apache Software Foundation
+Copyright © 1999-2016, Apache Software Foundation
 
\ No newline at end of file

Modified: 
tomcat/site/trunk/docs/connectors-doc/reference/printer/uriworkermap.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/printer/uriworkermap.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/reference/printer/uriworkermap.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/reference/printer/uriworkermap.html 
Thu Oct  6 09:00:17 2016
@@ -1,4 +1,4 @@
-The Apache Tomcat Connectors - Reference Guide - 
uriworkermap.properties configurationhttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">The Apache 
Tomcat Connectors - Reference Guideuriworkermap.properties 
configurationIntroduction
+The Apache Tomcat Connectors - Reference Guide - 
uriworkermap.properties configurationhttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">The Apache 
Tomcat Connectors - Reference Guideuriworkermap.properties 
configurationIntroduction
 
 
 The forwarding of requests from the web server to tomcat gets configured by 
defining mapping rules.
@@ -156,8 +156,8 @@ rules with equal numbers are sorted by t
 
 
 If both distinctions still do not suffice, then the defining source of the 
rule is considered.
-Rules defined in uriworkermap.properties come first, before rules defined by 
JkMount (Apache)
-and inside workers.properties using the mount attribute.
+Rules defined in uriworkermap.properties come first, before rules defined by 
JkMount
+(for the Apache HTTP Server) and inside workers.properties using the mount 
attribute.
 
 
 All disabled rules are ignored. Exclusion rules are applied after all normal 
rules
@@ -320,10 +320,11 @@ per mount. See their descriptions in the
 Virtual host 
integration
 
 
-IIS
+ISAPI redirector for 
Microsoft IIS
 
 
-When using IIS you can restrict individual rules to special virtual hosts
+When using the ISAPI redirector for Microsoft IIS you can restrict
+individual rules to special virtual hosts
 by prefixing the URI pattern with the virtual host information.
 The rules is that th

svn commit: r1763527 [4/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ ref

2016-10-06 Thread markt

Modified: tomcat/site/trunk/docs/connectors-doc/miscellaneous/faq.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/faq.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/miscellaneous/faq.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/miscellaneous/faq.html Thu Oct  6 
09:00:17 2016
@@ -1,4 +1,4 @@
-The Apache Tomcat Connectors - Miscellaneous 
Documentation - FAQhttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">LinksDocs HomeCommon 
HowToFor the 
impatientAll about 
workersTimeoutsLoad BalancingReverse 
ProxyWebserver HowToApache HTTP ServerIISNetscape/SunOne/SunReference
 Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP ServerIISAJP Protocol 
ReferenceAJPv13AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=N
 
ow&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews2014201220112010200920082007200620052004The Apache Tomcat 
Connectors - Miscellaneous DocumentationFAQprint-friendlyversion
+The Apache Tomcat Connectors - Miscellaneous 
Documentation - FAQhttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">LinksDocs HomeCommon 
HowToFor the 
impatientAll about 
workersTimeoutsLoad BalancingReverse ProxyWeb 
Server HowToApache HTTP Server 
(mod_jk)Microsoft IIS (ISAPI 
redirector)iPlanet Web 
Server (NSAPI redirector)Reference 
Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP Server (mod_jk)Microsoft IIS (ISAPI 
redirector)AJP Protocol 
ReferenceAJPv13 
(ajp13)AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailty
 
pe2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews201620152014201220112010200920082007200620052004The Apache Tomcat 
Connectors - Miscellaneous DocumentationFAQprint-friendlyversion
 General
 
 General Informations and FAQ about JK
@@ -17,7 +17,7 @@ the mail list archive
 before you post questions to the list.  
 If you are unable to locate the answer to your question in the archive, 
 you can post questions about JK to the user list for assistance.  
-Make sure that you include the version of your Webserver, 
+Make sure that you include the version of your web server, 
 that you are using as well as the platform you are running on
 and go 
 http://tomcat.apache.org/lists.html";>
@@ -38,25 +38,28 @@ Tomcat Connectors (mod_jk, mod_jk2) Down
 What's the 
difference between JK and mod_jk 
?
 
 
-JK is a project covering web-servers to Tomcat connectors,
-whereas mod_jk is the Apache 
module developed in JK.
+JK is a project covering web servers to Tomcat connectors.
+
+
+Apache HTTP Server support is 
implemented on JK, using a plugin
+called the mod_jk module.
 
 
 
-IIS webserversupport is implemented 
on JK, using a redirector
-called isapi redirector.
+Microsoft IIS support is implemented 
on JK, using a plugin
+called the ISAPI redirector.
 
 
 
-Netscape/SunONE/Sun 
webserverwebserver support is implemented on JK, using a redirector
-called nsapi redirector.
+iPlanet Web Server support is 
implemented on JK, using a plugin
+called the NSAPI redirector.
 
 
 
 
 Where can I get more 
information ?
 
-For JK 1.2.x, you should read :
+For JK 1.2.x,

svn commit: r1763527 [2/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ ref

2016-10-06 Thread markt

Modified: tomcat/site/trunk/docs/connectors-doc/common_howto/printer/quick.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/common_howto/printer/quick.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/common_howto/printer/quick.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/common_howto/printer/quick.html Thu 
Oct  6 09:00:17 2016
@@ -1,14 +1,15 @@
-The Apache Tomcat Connectors - Common HowTo - Quick 
Start HowTohttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">The Apache Tomcat Connectors - Common 
 >HowToQuick Start HowTonowrap="true">vspace="0" hspace="0" border="0" alt=" ">cellspacing="0" cellpadding="2" width="100%">color="#ff" face="arial,helvetica.sanserif">name="Introduction">Introduction
+The Apache Tomcat Connectors - Common HowTo - Quick 
Start HowTohttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">The Apache Tomcat Connectors - Common 
 >HowToQuick Start HowTonowrap="true">vspace="0" hspace="0" border="0" alt=" ">cellspacing="0" cellpadding="2" width="100%">color="#ff" face="arial,helvetica.sanserif">name="Introduction">Introduction
 
   This document describes the configuration files used by JK on the
-  Web Server side for the 'impatient':
+  web server side for the 'impatient':
 
 
-workers.properties is a mandatory file used by the webserver and 
which
-is the same for all JK implementations (Apache/IIS/NES).
+workers.properties is a mandatory file used by the web server and 
which
+is the same for all JK implementations (mod_jk for the Apache HTTP Server,
+ISAPI for Microsoft IIS, NSAPI for the iPlanet Web Server).
 
 
-web server add-ons to be set on the webserver side. 
+web server add-ons to be set on the web server side. 
 
 
 
@@ -18,7 +19,7 @@
 
 Minimum 
workers.properties
 
-Here is a minimum workers.properties, using just ajp13 to connect 
your Apache webserver
+Here is a minimum workers.properties, using just ajp13 to connect 
your web server
 to the Tomcat engine, complete documentation is available in Workers HowTo. 
 
 
@@ -33,10 +34,10 @@
 
 
 
-Minimum Apache web server 
configuration
+Minimum Apache HTTP Server 
configuration
 
-   Here is a minimum information about Apache configuration, a 
-   more complete separate HowTo 
for Apache is available.
+   Here is some very basic information about Apache configuration, a 
+   more complete HowTo for 
Apache is available.
 
 
   You should first have mod_jk.so (unix) or mod_jk.dll (Windows) 
installed
@@ -48,10 +49,11 @@
   /usr/lib/apache/
   /usr/lib/apache2/
   /usr/local/apache/libexec/
+  /usr/local/apache/modules/
   
 
 
-  Usual locations for modules directory on Windows :
+  Usual locations for modules directory on Windows:
   
   C:\Program Files\Apache Group\Apache\modules\
   C:\Program Files\Apache Group\Apache2\modules\
@@ -74,7 +76,7 @@
   
 
 
-  Usual locations for configuration directory on Windows :
+  Usual locations for configuration directory on Windows:
   
   C:\Program Files\Apache Group\Apache\conf\
   C:\Program Files\Apache Group\Apache2\conf\
@@ -85,8 +87,8 @@
 
   # Load mod_jk module
   # Update this path to match your modules location
-  LoadModulejk_module  libexec/mod_jk.so
-  # Declare the module for  (remove this line on 
Apache 2.x)
+  LoadModulejk_module  modules/mod_jk.so
+  # Declare the module for  (remove this line for 
Apache 2.x)
   AddModule mod_jk.c
   # Where to find workers.properties
   # Update this path to match your conf directory location (put 
workers.properties next to httpd.conf)
@@ -106,16 +108,16 @@
 
 
 
-Minimum IIS web server 
configuration
+Minimum Microsoft IIS 
configuration
 
-  A separate HowTo for the IIS web 
server is available.
+  A separate HowTo for the Microsoft 
IIS web server is available.
 
 
   This paragraph has not been written yet, but you can contribute 
to it.
   
-Minimum NES/iPlanet/Sun web server 
configuration
+Minimum iPlanet Web Server 
configuration
 
-  A separate HowTo for the 
Netscape/iPlanet/Sun web server is available.
+  A separate HowTo for the iPlanet 
Web Server is available.
 
   This paragraph has not been written yet, but you can contribute 
to it.
   
@@ -126,5 +128,5 @@
 
 
 
-Copyright © 1999-2015, Apache Software Foundation
+Copyright © 1999-2016, Apache Software Foundation
 
\ No newline at end of file

Modified: 
tomcat/site/trunk/docs/connectors-doc/common_howto/printer/timeouts.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/common_howto/printer/timeouts.h

svn commit: r1763527 [5/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ ref

2016-10-06 Thread markt

Modified: tomcat/site/trunk/docs/connectors-doc/news/20041100.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/20041100.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/news/20041100.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/news/20041100.html Thu Oct  6 
09:00:17 2016
@@ -1,4 +1,4 @@
-The Apache Tomcat Connectors - News - 2004 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">Links<
 /p>Docs HomeCommon 
HowToFor the 
impatientAll about 
workersTimeoutsLoad BalancingReverse 
ProxyWebserver HowToApache HTTP ServerIISNetscape/SunOne/SunReference
 Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP Server
 IISAJP Protocol 
ReferenceAJPv13AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfi
 
eldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews2014201220112010200920082007200620052004The Apache Tomcat 
Connectors - News2004 News and Statusprint-friendlyversion
+The Apache Tomcat Connectors - News - 2004 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">Links<
 /p>Docs HomeCommon 
HowToFor the 
impatientAll about 
workersTimeoutsLoad BalancingReverse ProxyWeb 
Server HowToApache HTTP Server 
(mod_jk)Microsoft IIS (ISAPI 
redirector)iPlanet Web 
Server (NSAPI redirector)Reference 
Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP Server (mod_jk)Microsoft IIS (ISAPI 
redirector)AJP Protocol 
ReferenceAJPv13 
(ajp13)AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&am
 
p;emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews201620152014201220112010200920082007200620052004The Apache Tomcat 
Connectors - News2004 News and Statusprint-friendlyversion
 2004 News & 
Status
 
 
@@ -122,5 +122,5 @@ planned for the end of November. Lots of
 
 
 
-Copyright © 1999-2015, Apache Software Foundation
+Copyright © 1999-2016, Apache Software Foundation
 
\ No newline at end of file

Modified: tomcat/site/trunk/docs/connectors-doc/news/20050101.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/20050101.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/news/20050101.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/news/20050101.html Thu Oct  6 
09:00:17 2016
@@ -1,4 +1,4 @@
-The Apache Tomcat Connectors - News - 2005 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">Links<
 /p>Docs HomeCommon 
HowToFor the 
impatientAll about 
workersTimeoutsLoad BalancingReverse 
ProxyWebserver HowToApache HTTP ServerIISNetscape/SunOne/SunReference
 Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP Server
 IISAJP Protocol 
ReferenceAJPv13AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&produc

svn commit: r1763527 [6/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ ref

2016-10-06 Thread markt

Modified: tomcat/site/trunk/docs/connectors-doc/news/20120301.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/20120301.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/news/20120301.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/news/20120301.html Thu Oct  6 
09:00:17 2016
@@ -1,4 +1,4 @@
-The Apache Tomcat Connectors - News - 2012 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">LinksDocs 
HomeCommon HowToFor the impatientAll about workersTimeoutsLoad BalancingReverse 
ProxyWebserver HowToApache HTTP ServerIISNetscape/SunOne/SunReference
 Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP ServerIISAJP Protocol 
ReferenceAJPv13AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&am
 
p;chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews2014201220112010200920082007200620052004The Apache Tomcat 
Connectors - News2012 News and Statusprint-friendlyversion
+The Apache Tomcat Connectors - News - 2012 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">LinksDocs 
HomeCommon HowToFor the impatientAll about workersTimeoutsLoad BalancingReverse ProxyWeb 
Server HowToApache HTTP Server 
(mod_jk)Microsoft IIS (ISAPI 
redirector)iPlanet Web 
Server (NSAPI redirector)Reference 
Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP Server (mod_jk)Microsoft IIS (ISAPI 
redirector)AJP Protocol 
ReferenceAJPv13 
(ajp13)AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter
 
2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews201620152014201220112010200920082007200620052004The Apache Tomcat 
Connectors - News2012 News and Statusprint-friendlyversion
 2012 News & 
Status
 
 31 May - JK-1.2.37 
released
@@ -72,5 +72,5 @@
 
 
 
-Copyright © 1999-2015, Apache Software Foundation
+Copyright © 1999-2016, Apache Software Foundation
 
\ No newline at end of file

Modified: tomcat/site/trunk/docs/connectors-doc/news/20140201.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/20140201.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/news/20140201.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/news/20140201.html Thu Oct  6 
09:00:17 2016
@@ -1,4 +1,4 @@
-The Apache Tomcat Connectors - News - 2014 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">LinksDocs 
HomeCommon HowToFor the impatientAll about workersTimeoutsLoad BalancingReverse 
ProxyWebserver HowToApache HTTP ServerIISNetscape/SunOne/SunReference
 Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP ServerIISAJP Protocol 
ReferenceAJPv13AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substrin

svn commit: r1763527 [11/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ re

2016-10-06 Thread markt

Modified: 
tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/apache.html 
Thu Oct  6 09:00:17 2016
@@ -1,7 +1,8 @@
-The Apache Tomcat Connectors - Webserver HowTo - 
Apache HTTP Server HowTohttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">The Apache 
Tomcat Connectors - Webserver HowToApache HTTP Server 
HowToIntroduction
+The Apache Tomcat Connectors - Web Server HowTo - 
Apache HTTP Server HowTohttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">The Apache 
Tomcat Connectors - Web Server HowToApache HTTP Server 
HowToIntroduction
 
-This document explains how to connect Tomcat to the popular open source web 
server, Apache httpd.
-You can use mod_jk, the Tomcat redirector module, with any version of Apache 
starting with 1.3.
+This document explains how to connect Tomcat to the popular open source web 
server, Apache HTTP Server.
+You can use the connection module mod_jk with any version of Apache starting 
with 1.3 and any version
+of Tomcat starting with (at least) 3.2.
 
 
 
@@ -14,12 +15,12 @@ For more detailed configuration informat
 and Apache.
 
 
-Waring: If Apache HTTP Server and Tomcat are configured to serve content 
from
-the same filing system location then care must be taken to ensure that httpd is
+Warning: If Apache and Tomcat are configured to serve content from
+the same file system location then care must be taken to ensure that Apache is
 not able to serve inappropriate content such as the contents of the WEB-INF
-directory or JSP source code. This could occur if the httpd DocumentRoot
+directory or JSP source code. This could occur if the Apache DocumentRoot
 overlaps with a Tomcat Host's appBase or the docBase of any Context. It could
-also occur when using the httpd Alias directive with a Tomcat Host's appBase or
+also occur when using the Apache Alias directive with a Tomcat Host's appBase 
or
 the docBase of any Context.
 
 
@@ -63,7 +64,7 @@ supporting Apache 1.3 and/or 2.x
 WinNT4.0-i386 SP4/SP5/SP6a (should be able to work with other service packs), 
Win2K and WinXP and Win98
 
 
-Cygwin (until you have an apache server and autoconf/automake support tools)
+Cygwin (until you have an Apache server and autoconf/automake support tools)
 
 
 Netware
@@ -78,27 +79,20 @@ Tomcat 3.2 to Tomcat 8.
 
 
 
-The redirector uses ajp12 and ajp13 to send requests to the 
Tomcat containers. There is also an option to use Tomcat in process,
-more about the in-process mode can be found in the in process howto.
+The mod_jk module uses the AJP protocol to send requests to the Tomcat 
containers.
+The AJP version typically used is ajp13.
 
 
 
-Who support ajp protocols 
?
+Who supports AJP 
protocols?
 
-The ajp12 protocol is only available in Tomcat 3.2.x and 3.3.x.
+Tomcat supports ajp13 since Tomcat 3.2.
+Others servlet engines such as Jetty or JBoss also support the 
ajp13 protocol
 
 
 
-The ajp12 has been deprecated with Tomcat 3.3.x and you should 
use instead
-ajp13 which is the only ajp protocol known by Tomcat 4 and above.
-
-
-
-Of course Tomcat 3.2.x and 3.3.x also support ajp13 protocol.
-
-
-
-Others servlet engines such as jetty have support for ajp13 protocol
+The ajp12 protocol has been deprecated and you should no longer 
use it.
+The ajp14 protocol is considered experimental.
 
 
 
@@ -192,8 +186,8 @@ A sample workers.properties can be found
 
 
 
-Also as with other Apache HTTP Server modules, mod_jk should be first 
installed on the modules directory of your
-Apache webserver, ie : /usr/lib/apache and you should update your 
httpd.conf file.
+Also as with other Apache modules, mod_jk should be first installed on the 
modules directory of your
+Apache HTTP Server, ie: /usr/lib/apache and you should update your 
httpd.conf file.
 
 
 
@@ -213,8 +207,9 @@ The mod_jserv configuration directives a
 
 
 Using Tomcat 
auto-configure
+Tomcat auto-configure is deprecated and has been 
removed in Tomcat 7 and later.
 
-The auto-configure works only for a single Tomcat running on the same machine 
where Apache HTTP Server is running.
+The auto-configure works only for a single Tomcat running on the same machine 
where the Apache HTTP Server is running.
 The simplest way to configure Apache HTTP Server to use mod_jk is to turn on 
the Apache HTTP Server auto-configure setting
 in Tomcat and put the following include directive at the end of your Apache 
httpd.conf file

svn commit: r1763527 [7/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ ref

2016-10-06 Thread markt

Added: tomcat/site/trunk/docs/connectors-doc/news/printer/20160901.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/news/printer/20160901.html?rev=1763527&view=auto
==
--- tomcat/site/trunk/docs/connectors-doc/news/printer/20160901.html (added)
+++ tomcat/site/trunk/docs/connectors-doc/news/printer/20160901.html Thu Oct  6 
09:00:17 2016
@@ -0,0 +1,16 @@
+The Apache Tomcat Connectors - News - 2016 News 
& Statushttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">The 
Apache Tomcat Connectors - News2016 News & Status2016 
News & Status
+JK-1.2.42 
released
+The Apache Tomcat team is proud to announce the immediate availability
+   of Tomcat Connectors 1.2.42. This is a maintenance release.
+
+Please see the ChangeLog
+   for a full list of changes.
+
+If you find any bugs while using this release, please fill in the
+https://bz.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors";>Bugzilla
+Bug Report.
+
+
+
+Copyright © 1999-2016, Apache Software Foundation
+
\ No newline at end of file

Propchange: tomcat/site/trunk/docs/connectors-doc/news/printer/20160901.html
--
svn:eol-style = native

Modified: tomcat/site/trunk/docs/connectors-doc/printer/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/printer/index.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/printer/index.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/printer/index.html Thu Oct  6 
09:00:17 2016
@@ -1,21 +1,40 @@
-The Apache Tomcat Connectors / mod_jk - ISAPI 
redirector - NSAPI redirector - Documentation Indexhttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">
 The Apache Tomcat Connectors / mod_jk - ISAPI redirector - 
NSAPI redirectorDocumentation IndexIntroduction
-
-This is the top-level entry point of the documentation bundle for the
-Apache Tomcat Connectors
+The Apache Tomcat Connectors: mod_jk, ISAPI 
redirector, NSAPI redirector - Documentation Overviewhttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">
 The Apache Tomcat Connectors: mod_jk, ISAPI redirector, NSAPI 
redirectorDocumentation OverviewIntroduction
 
+The Apache Tomcat Connectors project is part of the Tomcat 
project
+and provides web server plugins to connect web servers with Tomcat and other 
backends.
 
-Select one of the links from the navigation menu (to the left) to drill
+The supported web servers are:
+
+the Apache HTTP Server with a plugin (module) named 
mod_jk.
+Microsoft IIS with a plugin (extension) named ISAPI 
redirector
+(or simply redirector).
+the iPlanet Web Server with a plugin named NSAPI 
redirector. The
+iPlanet Web Server was previously known under various names, including 
Netscape Enterprise Server,
+SunOne Web Server and Sun Enterprise System web server.
+
+In all cases the plugin uses a special protocol named Apache JServ 
Protocol
+or simply AJP to connect to the backend. Backends known to 
support AJP
+are Apache Tomcat, Jetty and JBoss. Although there exist 3 versions of the 
protocol,
+ajp12, ajp13, ajp14, most 
installations
+only use ajp13. The older ajp12 does not use persistent connections and is 
obsolete, the newer
+version ajp14 is still experimental. Sometimes ajp13 is called AJP 1.3 or 
AJPv13, but we
+will mostly use the name ajp13.
+
+Most features of the plugins are the same for all web servers. Some details 
vary
+on a per web server basis. The documentation and the configuration is split 
into common
+parts and web server specific parts.
+
 down to the more detailed documentation that is available. Each available
 manual is described in more detail below.
 
 Headlines
 
-JK-1.2.41 
released
+JK-1.2.42 
released
 The Apache Tomcat team is proud to announce the immediate availability
-   of Tomcat Connectors 1.2.41 Stable. This release contains a security fix and
-   bug fixes for issues found in previous releases.
+   of Tomcat Connectors 1.2.42 Stable. This release contains bug fixes for
+   issues found in previous releases.

-Download the JK 1.2.41
+Download the JK 1.2.42
release.
 
 
@@ -53,14 +72,14 @@ and can also be used to dynamically reco
 
 
 
-Apache
-This page contains detailed description of all directives related to
-Apache web server.
+Apache HTTP Server (mod_jk)
+This page contains detailed description of all directives of mod_jk for the
+Apache HTTP Server.
 
 
 
-IIS
-This pa

svn commit: r1763527 [9/11] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ ref

2016-10-06 Thread markt

Modified: tomcat/site/trunk/docs/connectors-doc/reference/workers.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/reference/workers.html?rev=1763527&r1=1763526&r2=1763527&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/reference/workers.html (original)
+++ tomcat/site/trunk/docs/connectors-doc/reference/workers.html Thu Oct  6 
09:00:17 2016
@@ -1,10 +1,10 @@
-The Apache Tomcat Connectors - Reference Guide - 
workers.properties configurationhttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">Links<
 li>Docs HomeCommon 
HowToFor the 
impatientAll about 
workersTimeoutsLoad BalancingReverse 
ProxyWebserver HowToApache HTTP ServerIISNetscape/SunOne/SunReference
 Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP ServerIISAJP Protocol 
ReferenceAJPv13AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=
 
&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews201420122011201020092008200720062005
 2004The Apache 
Tomcat Connectors - Reference Guideworkers.properties 
configurationprint-friendlyversion
+The Apache Tomcat Connectors - Reference Guide - 
workers.properties configurationhttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif"; align="right" alt=" :: Apache 
Software Foundation" border="0">Links<
 li>Docs HomeCommon 
HowToFor the 
impatientAll about 
workersTimeoutsLoad BalancingReverse ProxyWeb 
Server HowToApache HTTP Server 
(mod_jk)Microsoft IIS (ISAPI 
redirector)iPlanet Web 
Server (NSAPI redirector)Reference 
Guideworkers.propertiesuriworkermap.propertiesStatus WorkerApache HTTP Server (mod_jk)Microsoft IIS (ISAPI 
redirector)AJP Protocol 
ReferenceAJPv13 
(ajp13)AJPv13 Extension 
ProposalMiscellaneous 
DocumentationFrequently asked questionsChangeloghttp://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailc
 
c2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">Current
 Tomcat Connectors bugsContribute documentationJK Status Ant TasksReporting Toolshttp://tomcat.apache.org/connectors-doc-archive/jk2/index.html";>Old 
JK/JK2 documentationNews20162015201420122011201020092008href="../news/20070301.html">2007href="../news/20060101.html">2006href="../news/20050101.html">2005href="../news/20041100.html">2004width="100%" cellspacing="4">The Apache 
 >Tomcat Connectors - Reference Guideworkers.properties 
 >configurationhref="printer/workers.html">alt="Printer Friendly Version">print-friendlyversion
 Introduction
 
 
 A Tomcat worker is a Tomcat instance that is waiting to execute 
servlets or any other content
 on behalf of some web server. For example, we can have a web server such as
-Apache forwarding servlet requests to a Tomcat process (the worker) running 
behind it.
+the Apache HTTP Server forwarding servlet requests to a Tomcat process (the 
worker) running behind it.
 
 
 The scenario described above is a very simple one;
@@ -109,7 +109,7 @@ Each worker configuration directive cons
 worker..=
 
 The first word is always worker. 
-The second word is the worker name you can choose. In the case of 
load-balancing,
+The second word is the worker name you can choose. In the case of load 
balancing,
 the worker name has an additional meaning. Please consult the
 Load Balancer HowTo.
 
@@ -182,16 +182,19 @@ This feature has been added in jk 1.2
 be unavailable or will misbehave. Those directives will be marked with a 
strong font in the following tables.
 
 DirectiveDefaultDescriptiontypeajp13
-Type of the worker (can be one of ajp13, ajp14,

svn commit: r1763529 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 09:02:54 2016
New Revision: 1763529

URL: http://svn.apache.org/viewvc?rev=1763529&view=rev
Log:
Correct test for default RFC6265 cookie processor

Modified:

tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java?rev=1763529&r1=1763528&r2=1763529&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java 
Thu Oct  6 09:02:54 2016
@@ -53,7 +53,7 @@ public class TestCookiesDefaultSysProps
 res = getUrl("http://localhost:"; + getPort() + "/blank");
 assertEquals("Cookie name fail", res.toString());
 res = getUrl("http://localhost:"; + getPort() + "/invalidFwd");
-assertEquals("Cookie name ok", res.toString());
+assertEquals("Cookie name fail", res.toString());
 res = getUrl("http://localhost:"; + getPort() + "/invalidStrict");
 assertEquals("Cookie name ok", res.toString());
 res = getUrl("http://localhost:"; + getPort() + "/valid");



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

svn commit: r1763530 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 09:03:15 2016
New Revision: 1763530

URL: http://svn.apache.org/viewvc?rev=1763530&view=rev
Log:
Correct test for default RFC6265 cookie processor

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java

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

svn commit: r1763541 - in /tomcat/site/trunk: docs/download-connectors.html docs/index.html docs/oldnews-2015.html xdocs/download-connectors.xml xdocs/index.xml xdocs/oldnews-2015.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 09:08:52 2016
New Revision: 1763541

URL: http://svn.apache.org/viewvc?rev=1763541&view=rev
Log:
Update for JK Connectors 1.2.42 release

Modified:
tomcat/site/trunk/docs/download-connectors.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/oldnews-2015.html
tomcat/site/trunk/xdocs/download-connectors.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/oldnews-2015.xml

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1763541&r1=1763540&r2=1763541&view=diff
==
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Thu Oct  6 09:08:52 2016
@@ -286,15 +286,15 @@
 
 
   
-
-JK 1.2.41 Source Release tar.gz
+
+JK 1.2.42 Source Release tar.gz
(e.g. Unix, Linux, Mac OS)
 
   
 
-[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.tar.gz.asc";>PGP],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.tar.gz.md5";>MD5],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.tar.gz.sha1";>SHA1]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.tar.gz.asc";>PGP],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.tar.gz.md5";>MD5],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.tar.gz.sha1";>SHA1]
   
 
 
@@ -303,15 +303,15 @@
 
 
   
-
-JK 1.2.41 Source Release zip
+
+JK 1.2.42 Source Release zip
(e.g. Windows)
 
   
 
-[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.zip.asc";>PGP],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.zip.md5";>MD5],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.zip.sha1";>SHA1]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.zip.asc";>PGP],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.zip.md5";>MD5],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.42-src.zip.sha1";>SHA1]
   
 
 
@@ -343,7 +343,7 @@
 
 
 
-tomcat-connectors-1.2.41-src.* is signed by Mark Thomas 
(2F6059E7).
+tomcat-connectors-1.2.42-src.* is signed by Mark Thomas 
(2F6059E7).
 
   
 

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1763541&r1=1763540&r2=1763541&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Oct  6 09:08:52 2016
@@ -245,6 +245,24 @@ project logo are trademarks of the Apach
 
 
 
+
+2016-10-05 Tomcat Connectors 1.2.42 
Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 1.2.42 of
+Apache Tomcat Connectors.
+This version fixes a number of bugs found in previous releases.
+
+
+
+
+Download |
+ChangeLog for 1.2.42
+
+
+
+
 
 2016-09-19 Tomcat 7.0.72 Released
 
@@ -481,25 +499,6 @@ using 1.2.x in preference to 1.1.x.
 
 
 
-
-
-2015-08-11 Tomcat Connectors 1.2.41 
Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 1.2.41 of
-Apache Tomcat Connectors.
-This version fixes one security issue (CVE-2014-8111) and a number of bugs
-found in previous releases.
-
-
-
-
-Download |
-ChangeLog for 1.2.41
-
-
-
 
 
 2015-03-17 Apache Standard Taglib 1.2.5 
Released

Modified: tomcat/site/trunk/docs/oldnews-2015.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2015.html?rev=1763541&r1=1763540&r2=1763541&view=diff
==
--- tomcat/site/trunk/docs/oldnews-2015.html (original)
+++ tomcat/site/trunk/docs/oldnews-2015.html Thu Oct  6 09:08:52 2016
@@ -640,6 +640,25 @@ changelog.
 
 
 
+
+2015-08-11 Tomcat Connectors 1.2.41 
Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 1.2.41 of
+Apache Tomcat Connectors.
+This version fixes one security issue (CVE-2014-8111) and a number of bugs
+found in previous releases.
+
+
+
+
+Download |
+ChangeLog for 1.2.41
+
+
+
+
 
 2015-07-06 Tomcat 7.0.63 Released
 

Modified: tomcat/site/trunk/xdocs/download-connectors.xml

svn commit: r16401 - in /release/tomcat/tomcat-connectors/jk: ./ binaries/windows/ binaries/windows/symbols/

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 09:13:16 2016
New Revision: 16401

Log:
Remove old versions now 1.2.42 is on the mirrors

Removed:

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-i386-symbols.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-i386-symbols.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-i386-symbols.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-i386-symbols.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-x86_64-symbols.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-x86_64-symbols.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-x86_64-symbols.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.40-windows-x86_64-symbols.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.0.x.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.0.x.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.0.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.0.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.2.x.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.2.x.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.2.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.2.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.4.x.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.4.x.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.4.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-httpd-2.4.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iis.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iis.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iis.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iis.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iplanet.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iplanet.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iplanet.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-i386-iplanet.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-httpd-2.4.x.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-httpd-2.4.x.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-httpd-2.4.x.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-httpd-2.4.x.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-iis.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-iis.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-iis.zip.md5

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.40-windows-x86_64-iis.zip.sha1
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.tar.gz
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.tar.gz.asc
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.tar.gz.md5
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.tar.gz.sha1
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.zip
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.zip.asc
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.zip.md5
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.41-src.zip.sha1


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apa

buildbot success in on tomcat-trunk

2016-10-06 Thread buildbot

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1763529
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

[Bug 60208] Regression: Cookies whose names match the web application context are now missing from request.getCookies() result

2016-10-06 Thread bugzilla

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

--- Comment #5 from Réda Housni Alaoui  ---
Thank you

-- 
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: r16402 - in /dev/tomcat/tomcat-connectors/jk: ./ binaries/ binaries/windows/ binaries/windows/symbols/

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 10:09:00 2016
New Revision: 16402

Log:
Debug symbols for 1.2.42 Windows binaries

Added:
dev/tomcat/tomcat-connectors/jk/
dev/tomcat/tomcat-connectors/jk/binaries/
dev/tomcat/tomcat-connectors/jk/binaries/windows/
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip
   (with props)

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.md5

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.sha1

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-x86_64-symbols.zip
   (with props)

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-x86_64-symbols.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-x86_64-symbols.zip.md5

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-x86_64-symbols.zip.sha1

Added: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.asc
==
--- 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.asc
 (added)
+++ 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.asc
 Thu Oct  6 10:09:00 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJX9iJVAAoJEBDAHFovYFnnjugP/i9UYnQvaYF9r9ZI7YuMH5zM
+gAs4ecUF6rvWMUk2eeupP3WYQ3OL6IGXzMMPj9nx9NA1SIumLwc8sJqRSWRt//Zn
+oT9x6bl2MJl+z6ezCpg6q2iU7GjdxtWQ0gwPpRe9snVmKelQ6QD4CP7g5zEzM5Ag
+WYajDNY6nuJYeDWoatwLTO/sMq/k/I/mOZFBub+Bb6GDYWoBcv5g/O4qDRqJ30fv
+Fa1GaSp/kquG9eWo0zqH6ZBDTLCCYi0RwmJw0zyumMoKbA8yYymIgJyLi5AX/z0m
+DHfhlmy3DN2NGtThV3y7j1n1kz29FW7abci8GEthN87GAYbxngIU3SrKfaCsvtkY
+4YHb/VVEhhstLNy2GxEoojPSZ87xKkeIjl4oyl32NQiXZe01hXEQ0PZpPj2iifiT
+4xiMbLLnvrsqM72luuKS3PMQ9VOVvNZBjHtk+F2WMz0Mf++RV3hwEk3CIANqL3zo
+DfBNJDmc7g/s52PmqOOJM6mSSFERCR5gGl8OoDvwNyehWr1D8akChR63FMZO5wq4
+TUS0Wt7uUuPkPKx6GpAKmoeUQje8O2rqzuVlRlAgalUWw40AZiiq7wlU/fPS04Tr
+/QSRN5cWTdQqN4TGl++HXigVFXE05rdJaGHVlLIc4zZ52rvzKUJhI9TQWnhrDeqY
+yuyTiY15kj5j05NmzFR1
+=nTD8
+-END PGP SIGNATURE-

Added: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.md5
==
--- 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.md5
 (added)
+++ 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.md5
 Thu Oct  6 10:09:00 2016
@@ -0,0 +1 @@
+a68c2ca8f2ac51ad9bb13c5e7debf917 
*tomcat-connectors-1.2.42-windows-i386-symbols.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.sha1
==
--- 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.sha1
 (added)
+++ 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-i386-symbols.zip.sha1
 Thu Oct  6 10:09:00 2016
@@ -0,0 +1 @@
+54cc96db29a5191803a99f00527511f2a8ad8122 
*tomcat-connectors-1.2.42-windows-i386-symbols.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-x86_64-symbols.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-x86_64-symbols.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.42-windows-x86_64-symbols.zip.asc
==
--- 
dev/tomcat/tomcat-connectors/jk/binaries/wi

[VOTE] JK 1.2.42 windows binaries debug symbols

2016-10-06 Thread Mark Thomas

These were not part of the original release VOTE so I'm calling a
separate VOTE for them here.

Tag:
http://svn.apache.org/viewvc/tomcat/jk/tags/JK_1_2_42/

Source:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/

[ ] -1: Don't release because ...
[ ] +1: Release

Mark

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

Re: [VOTE] JK 1.2.42 windows binaries debug symbols

2016-10-06 Thread Mark Thomas

On 06/10/2016 11:10, Mark Thomas wrote:
> These were not part of the original release VOTE so I'm calling a
> separate VOTE for them here.
> 
> Tag:
> http://svn.apache.org/viewvc/tomcat/jk/tags/JK_1_2_42/
> 
> Source:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/
> 
> [ ] -1: Don't release because ...
> [X] +1: Release

My vote to start things off.

Mark


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

[ANN] Apache Tomcat Connectors 1.2.42 released

2016-10-06 Thread Mark Thomas

The Apache Tomcat Project is proud to announce the release of version
1.2.42 of the Apache Tomcat Connectors.
This version fixes a number of bugs found in previous releases.

Full details of these changes and new features,
are available in the Apache Tomcat Connectors changelog:
http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html

In addition to the usual source release, this release includes Windows
binaries for the JK ISAPI connector for IIS.

Downloads:
http://tomcat.apache.org/download-connectors.cgi

Thank you,
-- 
The Apache Tomcat Team

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

svn commit: r1763552 - in /tomcat/site/trunk: docs/security-jk.html xdocs/security-jk.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 10:42:13 2016
New Revision: 1763552

URL: http://svn.apache.org/viewvc?rev=1763552&view=rev
Log:
Add CVE-2016-6808

Modified:
tomcat/site/trunk/docs/security-jk.html
tomcat/site/trunk/xdocs/security-jk.xml

Modified: tomcat/site/trunk/docs/security-jk.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1763552&r1=1763551&r2=1763552&view=diff
==
--- tomcat/site/trunk/docs/security-jk.html (original)
+++ tomcat/site/trunk/docs/security-jk.html Thu Oct  6 10:42:13 2016
@@ -219,6 +219,9 @@
 Apache Tomcat JK 
Connectors vulnerabilities
 
 
+Fixed in Apache Tomcat 
JK Connector 1.2.42
+
+
 Fixed in Apache Tomcat 
JK Connector 1.2.41
 
 
@@ -255,6 +258,33 @@
 
   
 
+Fixed in Apache Tomcat JK 
Connector 1.2.42
+
+
+
+
+Moderate: Buffer Overflow
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6808"; 
rel="nofollow">CVE-2016-6808
+
+
+
+The IIS/ISAPI specific code implements special handling when a virtual
+   host is present. The virtual host name and the URI are concatenated to
+   create a virtual host mapping rule. The length checks prior to writing
+   to the target buffer for this rule did not take account of the length of
+   the virtual host name, creating the potential for a buffer overflow.
+
+
+It is not known if this overflow is exploitable.
+
+
+This was fixed in http://svn.apache.org/viewvc?view=rev&rev=1762057";>revision 
1762057.
+
+
+Affects: JK 1.2.0-1.2.41
+
+  
+
 Fixed in Apache Tomcat JK 
Connector 1.2.41
 
 

Modified: tomcat/site/trunk/xdocs/security-jk.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-jk.xml?rev=1763552&r1=1763551&r2=1763552&view=diff
==
--- tomcat/site/trunk/xdocs/security-jk.xml (original)
+++ tomcat/site/trunk/xdocs/security-jk.xml Thu Oct  6 10:42:13 2016
@@ -28,6 +28,25 @@
 
   
 
+  
+
+Moderate: Buffer Overflow
+   CVE-2016-6808
+
+The IIS/ISAPI specific code implements special handling when a virtual
+   host is present. The virtual host name and the URI are concatenated to
+   create a virtual host mapping rule. The length checks prior to writing
+   to the target buffer for this rule did not take account of the length of
+   the virtual host name, creating the potential for a buffer overflow.
+
+It is not known if this overflow is exploitable.
+
+This was fixed in revision 1762057.
+
+Affects: JK 1.2.0-1.2.41
+
+  
+
   
 
 Important: Information disclosure



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

svn propchange: r1762057 - svn:log

2016-10-06 Thread markt

Author: markt
Revision: 1762057
Modified property: svn:log

Modified: svn:log at Thu Oct  6 10:42:27 2016
--
--- svn:log (original)
+++ svn:log Thu Oct  6 10:42:27 2016
@@ -1 +1,2 @@
 Minor code clean-up and optimization
+This fixes CVE-2016-6808


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

[SECURITY] CVE-2016-6808 Apache Tomcat JK ISAPI Connector buffer overflow

2016-10-06 Thread Mark Thomas

CVE-2016-6808 Apache Tomcat JK ISAPI Connector buffer overflow

Severity: Moderate

Vendor: The Apache Software Foundation

Versions Affected:
- Apache Tomcat JK ISAPI Connector 1.2.0 to 1.2.41

Description
The IIS/ISAPI specific code implements special handling when a virtual
host is present. The virtual host name and the URI are concatenated to
create a virtual host mapping rule. The length checks prior to writing
to the target buffer for this rule did not take account of the length of
the virtual host name, creating the potential for a buffer overflow.
It is not known if this overflow is exploitable.

Mitigation
Users of affected versions should apply one of the following mitigations
- Upgrade to Apache Tomcat JK ISAPI Connector 1.2.42
- Where available, use IIS configuration to restrict the maximum URI
  length to 4095 - (the length of the longest virtual host name)

Credit:
This issue was discovered by The Apache Tomcat Security Team.


References:
[1] http://tomcat.apache.org/security-jk.html

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

svn commit: r1763554 - in /tomcat/native/trunk/xdocs: index.xml news/2016.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 10:51:22 2016
New Revision: 1763554

URL: http://svn.apache.org/viewvc?rev=1763554&view=rev
Log:
Add details for 1.2.10 release

Modified:
tomcat/native/trunk/xdocs/index.xml
tomcat/native/trunk/xdocs/news/2016.xml

Modified: tomcat/native/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=1763554&r1=1763553&r2=1763554&view=diff
==
--- tomcat/native/trunk/xdocs/index.xml (original)
+++ tomcat/native/trunk/xdocs/index.xml Thu Oct  6 10:51:22 2016
@@ -64,9 +64,10 @@ manual is described in more detail below
 
 
 
-2 July 2016 - TC-Native-1.2.8 
released
+5 October 2016 - TC-Native-1.2.10
+released
 The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.8 Stable.
+Tomcat Native 1.2.10 Stable.
 
 The sources and the binaries for selected platforms are available from the
 Download page.

Modified: tomcat/native/trunk/xdocs/news/2016.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/news/2016.xml?rev=1763554&r1=1763553&r2=1763554&view=diff
==
--- tomcat/native/trunk/xdocs/news/2016.xml (original)
+++ tomcat/native/trunk/xdocs/news/2016.xml Thu Oct  6 10:51:22 2016
@@ -29,6 +29,13 @@
 
 
 
+ 
+  The Apache Tomcat team is proud to announce the immediate availability
+  of Tomcat Native 1.2.10. This is a release to update dependencies for the
+  Windows binaries and includes Windows binaries built with OpenSSL 1.0.2j and
+  APR 1.5.2.
+  
+ 
  
   The Apache Tomcat team is proud to announce the immediate availability
   of Tomcat Native 1.2.8. This is a bug fix release release and includes 
Windows



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

svn commit: r1763555 - in /tomcat/site/trunk/docs/native-doc: index.html miscellaneous/changelog.html news/2016.html

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 10:54:03 2016
New Revision: 1763555

URL: http://svn.apache.org/viewvc?rev=1763555&view=rev
Log:
Update native docs for 1.2.10 release

Modified:
tomcat/site/trunk/docs/native-doc/index.html
tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
tomcat/site/trunk/docs/native-doc/news/2016.html

Modified: tomcat/site/trunk/docs/native-doc/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1763555&r1=1763554&r2=1763555&view=diff
==
--- tomcat/site/trunk/docs/native-doc/index.html (original)
+++ tomcat/site/trunk/docs/native-doc/index.html Thu Oct  6 10:54:03 2016
@@ -32,9 +32,10 @@ manual is described in more detail below
 Headlines
 
 
-2 July 2016 - TC-Native-1.2.8 
released
+5 October 2016 - TC-Native-1.2.10
+released
 The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.8 Stable.
+Tomcat Native 1.2.10 Stable.
 
 The sources and the binaries for selected platforms are available from the
 Download page.

Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1763555&r1=1763554&r2=1763555&view=diff
==
--- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original)
+++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Thu Oct  6 
10:54:03 2016
@@ -3,6 +3,16 @@
   
   This is the Changelog for Tomcat Native 1.2.
   
+Changes in 1.2.10
+  
+  Update minimum recommended OpenSSL version to 1.0.2j. (markt)
+  
+Changes in 1.2.9
+  
+
+  Update minimum recommended OpenSSL version to 1.0.2i. (markt)
+
+  
 Changes in 1.2.8
   
 

Modified: tomcat/site/trunk/docs/native-doc/news/2016.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2016.html?rev=1763555&r1=1763554&r2=1763555&view=diff
==
--- tomcat/site/trunk/docs/native-doc/news/2016.html (original)
+++ tomcat/site/trunk/docs/native-doc/news/2016.html Thu Oct  6 10:54:03 2016
@@ -1,5 +1,12 @@
 
 The Apache Tomcat Native - News - 2016 News and 
Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - 
NewsLinksDocs Home
 Miscellaneous 
DocumentationChangelogNews2016201520142013201220112010200920082016 News and Status2016 News & Status
+ 5 October 2016 - TC-Native-1.2.10 
released
+  The Apache Tomcat team is proud to announce the immediate availability
+  of Tomcat Native 1.2.10. This is a release to update dependencies for the
+  Windows binaries and includes Windows binaries built with OpenSSL 1.0.2j and
+  APR 1.5.2.
+  
+ 
  2 July 2016 - TC-Native-1.2.8 
released
   The Apache Tomcat team is proud to announce the immediate availability
   of Tomcat Native 1.2.8. This is a bug fix release release and includes 
Windows



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

svn commit: r1763556 - in /tomcat/site/trunk: docs/download-native.html docs/index.html docs/oldnews.html xdocs/download-native.xml xdocs/index.xml xdocs/oldnews.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 10:57:20 2016
New Revision: 1763556

URL: http://svn.apache.org/viewvc?rev=1763556&view=rev
Log:
Update site for Tomcat Native 1.2.10 release

Modified:
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/xdocs/download-native.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/oldnews.xml

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1763556&r1=1763555&r2=1763556&view=diff
==
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Thu Oct  6 10:57:20 2016
@@ -285,14 +285,14 @@
 
 
   
-
-Native 1.2.8 Source Release tar.gz (e.g. Unix, Linux, Mac 
OS)
+
+Native 1.2.10 Source Release tar.gz (e.g. Unix, Linux, Mac 
OS)
 
   
 
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/source/tomcat-native-1.2.8-src.tar.gz.asc";>PGP],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/source/tomcat-native-1.2.8-src.tar.gz.md5";>MD5],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/source/tomcat-native-1.2.8-src.tar.gz.sha1";>SHA1]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.10/source/tomcat-native-1.2.10-src.tar.gz.asc";>PGP],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.10/source/tomcat-native-1.2.10-src.tar.gz.md5";>MD5],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.10/source/tomcat-native-1.2.10-src.tar.gz.sha1";>SHA1]
   
 
 
@@ -301,14 +301,14 @@
 
 
   
-
-Native 1.2.8 Source Release zip (e.g. Windows)
+
+Native 1.2.10 Source Release zip (e.g. Windows)
 
   
 
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/source/tomcat-native-1.2.8-win32-src.zip.asc";>PGP],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/source/tomcat-native-1.2.8-win32-src.zip.md5";>MD5],
-[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/source/tomcat-native-1.2.8-win32-src.zip.sha1";>SHA1]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.10/source/tomcat-native-1.2.10-win32-src.zip.asc";>PGP],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.10/source/tomcat-native-1.2.10-win32-src.zip.md5";>MD5],
+[https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.10/source/tomcat-native-1.2.10-win32-src.zip.sha1";>SHA1]
   
 
 
@@ -323,7 +323,7 @@
 
 You can find binaries release too.
 You may download them from
-  HERE
+  HERE
 
 
 
@@ -352,14 +352,14 @@
   
 
 
-
-  Native 1.2.8 Windows Binaries zip (recommended)
+
+  Native 1.2.10 Windows Binaries zip (recommended)
   
 
 
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/binaries/tomcat-native-1.2.8-win32-bin.zip.asc";>PGP],
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/binaries/tomcat-native-1.2.8-win32-bin.zip.md5";>MD5],
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/binaries/tomcat-native-1.2.8-win32-bin.zip.sha1";>SHA1]
+  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.10/binaries/tomcat-native-1.2.10-win32-bin.zip.asc";>PGP],
+  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.10/binaries/tomcat-native-1.2.10-win32-bin.zip.md5";>MD5],
+  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.10/binaries/tomcat-native-1.2.10-win32-bin.zip.sha1";>SHA1]
 
   
 
@@ -368,15 +368,15 @@
   
 
 
-
-  Native 1.2.8 Windows OCSP-enabled Binaries zip
+
+  Native 1.2.10 Windows OCSP-enabled Binaries zip
   
 
 
 
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/binaries/tomcat-native-1.2.8-ocsp-win32-bin.zip.asc";>PGP],
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/binaries/tomcat-native-1.2.8-ocsp-win32-bin.zip.md5";>MD5],
-  [https://www.apache.org/dist/tomcat/tomcat-connectors/native/1.2.8/binaries/tomcat-native-1.2.8-ocsp-win32-bin.zip.sha1";>SHA1]
+  [https://www.apache.org/dist

[ANN] Apache Tomcat Native 1.2.10 released

2016-10-06 Thread Mark Thomas

The Apache Tomcat team announces the immediate availability of Apache
Tomcat Native 1.2.10 stable.

The key features of this release are:
- Windows binaries built with APR 1.5.2 and OpenSSL 1.0.2j.


Note that users should now be using 1.2.x in preference to 1.1.x.

Please refer to the change log for the complete list of changes:
http://tomcat.apache.org/native-doc/miscellaneous/changelog.html

Downloads:
http://tomcat.apache.org/download-native.cgi

The Apache Tomcat Native Library provides portable API for features
not found in contemporary JDK's. It uses Apache Portable Runtime as
operating system abstraction layer and OpenSSL for SSL networking and
allows optimal performance in production environments.


Thank you,
-- 
The Apache Tomcat Team

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

svn commit: r1763559 - in /tomcat/trunk/java/org/apache: catalina/connector/ coyote/ coyote/ajp/ coyote/http11/ coyote/http11/filters/ coyote/http2/ tomcat/util/net/

2016-10-06 Thread violetagg

Author: violetagg
Date: Thu Oct  6 11:30:44 2016
New Revision: 1763559

URL: http://svn.apache.org/viewvc?rev=1763559&view=rev
Log:
Introduce a new method o.a.coyote.InputBuffer.doRead(ApplicationBufferHandler)

Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/coyote/InputBuffer.java
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java

tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/trunk/java/org/apache/tomcat/util/net/ApplicationBufferHandler.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1763559&r1=1763558&r2=1763559&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Thu Oct  6 
11:30:44 2016
@@ -36,6 +36,7 @@ import org.apache.tomcat.util.buf.B2CCon
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.collections.SynchronizedStack;
+import org.apache.tomcat.util.net.ApplicationBufferHandler;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
@@ -48,7 +49,7 @@ import org.apache.tomcat.util.res.String
  */
 public class InputBuffer extends Reader
 implements ByteChunk.ByteInputChannel, CharChunk.CharInputChannel,
-   CharChunk.CharOutputChannel {
+   CharChunk.CharOutputChannel, ApplicationBufferHandler {
 
 /**
  * The string manager for this package.
@@ -75,6 +76,7 @@ public class InputBuffer extends Reader
  * The byte buffer.
  */
 private final ByteChunk bb;
+private ByteBuffer tempRead;
 
 
 /**
@@ -146,6 +148,8 @@ public class InputBuffer extends Reader
 public InputBuffer(int size) {
 
 this.size = size;
+tempRead = ByteBuffer.allocate(size);
+tempRead.flip();
 bb = new ByteChunk(size);
 bb.setLimit(size);
 bb.setByteInputChannel(this);
@@ -314,8 +318,10 @@ public class InputBuffer extends Reader
 state = BYTE_STATE;
 }
 
-int result = coyoteRequest.doRead(bb);
-
+int result = coyoteRequest.doRead(this);
+bb.setBytes(tempRead.array(), tempRead.arrayOffset() + 
tempRead.position(),
+tempRead.remaining());
+tempRead.position(0).limit(0);
 return result;
 }
 
@@ -594,4 +600,22 @@ public class InputBuffer extends Reader
 }
 
 }
+
+
+@Override
+public void setByteBuffer(ByteBuffer buffer) {
+tempRead = buffer;
+}
+
+
+@Override
+public ByteBuffer getByteBuffer() {
+return tempRead;
+}
+
+
+@Override
+public void expand(int size) {
+// no-op
+}
 }

Modified: tomcat/trunk/java/org/apache/coyote/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/InputBuffer.java?rev=1763559&r1=1763558&r2=1763559&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/InputBuffer.java Thu Oct  6 11:30:44 
2016
@@ -19,6 +19,7 @@ package org.apache.coyote;
 import java.io.IOException;
 
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.net.ApplicationBufferHandler;
 
 /**
  * This class is only for internal use in the protocol implementation. All
@@ -40,4 +41,20 @@ public interface InputBuffer {
  * @throws IOException If an I/O error occurs reading from the input stream
  */
 public int doRead(ByteChunk chunk) throws IOException;
+
+/**
+ * Read from the input stream into the ByteBuffer provided by the
+ * ApplicaitonBufferHandler.
+ * IMPORTANT: the current model assumes that the protocol will 'own' the
+ * ByteBuffer and return a pointer to it.
+ *
+ * @param handler ApplicaitonBufferHandler that provides the buffer to read
+ *data into.
+ *
+ * @return The number of bytes that have been added to the buffer or -1 for
+ * end of stream
+ *
+ * @throws IOException If an I/O error occurs reading from the input stream
+ */
+public int doRead(ApplicationBufferHandler handler) th

svn commit: r1763565 - /tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java

2016-10-06 Thread violetagg

Author: violetagg
Date: Thu Oct  6 11:49:10 2016
New Revision: 1763565

URL: http://svn.apache.org/viewvc?rev=1763565&view=rev
Log:
Use ByteBuffer instead of ByteChunk. This is in a preparation for removing 
o.a.coyote.InputBuffer.doRead(ByteChunk).

Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java?rev=1763565&r1=1763564&r2=1763565&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java 
Thu Oct  6 11:49:10 2016
@@ -18,6 +18,7 @@
 package org.apache.coyote.http11.filters;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.coyote.InputBuffer;
@@ -32,7 +33,7 @@ import org.apache.tomcat.util.res.String
  *
  * @author Remy Maucherat
  */
-public class IdentityInputFilter implements InputFilter {
+public class IdentityInputFilter implements InputFilter, 
ApplicationBufferHandler {
 
 private static final StringManager sm = StringManager.getManager(
 IdentityInputFilter.class.getPackage().getName());
@@ -76,9 +77,9 @@ public class IdentityInputFilter impleme
 
 
 /**
- * Chunk used to read leftover bytes.
+ * ByteBuffer used to read leftover bytes.
  */
-protected final ByteChunk endChunk = new ByteChunk();
+protected ByteBuffer tempRead;
 
 
 private final int maxSwallowSize;
@@ -181,7 +182,8 @@ public class IdentityInputFilter impleme
 // Consume extra bytes.
 while (remaining > 0) {
 
-int nread = buffer.doRead(endChunk);
+int nread = buffer.doRead(this);
+tempRead = null;
 if (nread > 0 ) {
 swallowed += nread;
 remaining = remaining - nread;
@@ -227,7 +229,6 @@ public class IdentityInputFilter impleme
 public void recycle() {
 contentLength = -1;
 remaining = 0;
-endChunk.recycle();
 }
 
 
@@ -247,4 +248,22 @@ public class IdentityInputFilter impleme
 // remaining
 return contentLength > -1 && remaining <= 0;
 }
+
+
+@Override
+public void setByteBuffer(ByteBuffer buffer) {
+tempRead = buffer;
+}
+
+
+@Override
+public ByteBuffer getByteBuffer() {
+return tempRead;
+}
+
+
+@Override
+public void expand(int size) {
+// no-op
+}
 }



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

svn commit: r1763568 - in /tomcat/trunk/java/org/apache/coyote: ./ ajp/ http11/ http11/filters/ http2/

2016-10-06 Thread violetagg

Author: violetagg
Date: Thu Oct  6 12:02:46 2016
New Revision: 1763568

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

Modified:
tomcat/trunk/java/org/apache/coyote/InputBuffer.java
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java

tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/coyote/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/InputBuffer.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/InputBuffer.java Thu Oct  6 12:02:46 
2016
@@ -39,6 +39,9 @@ public interface InputBuffer {
  * end of stream
  *
  * @throws IOException If an I/O error occurs reading from the input stream
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
  */
 public int doRead(ByteChunk chunk) throws IOException;
 

Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Thu Oct  6 12:02:46 2016
@@ -507,6 +507,9 @@ public final class Request {
  * @return The number of bytes copied
  *
  * @throws IOException If an I/O error occurs during the copy
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
  */
 public int doRead(ByteChunk chunk) throws IOException {
 int n = inputBuffer.doRead(chunk);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Oct  6 
12:02:46 2016
@@ -1352,6 +1352,10 @@ public class AjpProcessor extends Abstra
  */
 protected class SocketInputBuffer implements InputBuffer {
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
 @Override
 public int doRead(ByteChunk chunk) throws IOException {
 

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=1763568&r1=1763567&r2=1763568&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Thu Oct  
6 12:02:46 2016
@@ -282,6 +282,10 @@ public class Http11InputBuffer implement
 
 //  InputBuffer Methods
 
+/**
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
 @Override
 public int doRead(ByteChunk chunk) throws IOException {
 
@@ -1067,6 +1071,11 @@ public class Http11InputBuffer implement
  */
 private class SocketInputBuffer implements InputBuffer {
 
+/**
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9. Use
+ * {@link #doRead(ApplicationBufferHandler)}
+ */
 @Override
 public int doRead(ByteChunk chunk) throws IOException {
 

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java?rev=1763568&r1=1763567&r2=1763568&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/coyot

svn commit: r1763571 - in /tomcat/trunk/java/org/apache/coyote: ./ ajp/ http11/ http11/filters/ http2/

2016-10-06 Thread violetagg

Author: violetagg
Date: Thu Oct  6 12:18:01 2016
New Revision: 1763571

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

Modified:
tomcat/trunk/java/org/apache/coyote/InputBuffer.java
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/IdentityInputFilter.java

tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
tomcat/trunk/java/org/apache/coyote/http2/Stream.java

Modified: tomcat/trunk/java/org/apache/coyote/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/InputBuffer.java?rev=1763571&r1=1763570&r2=1763571&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/InputBuffer.java Thu Oct  6 12:18:01 
2016
@@ -18,7 +18,6 @@ package org.apache.coyote;
 
 import java.io.IOException;
 
-import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.net.ApplicationBufferHandler;
 
 /**
@@ -28,24 +27,6 @@ import org.apache.tomcat.util.net.Applic
 public interface InputBuffer {
 
 /**
- * Read from the input stream into the given buffer.
- * IMPORTANT: the current model assumes that the protocol will 'own' the
- * buffer and return a pointer to it in ByteChunk (i.e. the param will
- * have chunk.getBytes()==null before call, and the result after the call).
- *
- * @param chunk The buffer to read data into.
- *
- * @return The number of bytes that have been added to the buffer or -1 for
- * end of stream
- *
- * @throws IOException If an I/O error occurs reading from the input stream
- *
- * @deprecated Unused. Will be removed in Tomcat 9. Use
- * {@link #doRead(ApplicationBufferHandler)}
- */
-public int doRead(ByteChunk chunk) throws IOException;
-
-/**
  * Read from the input stream into the ByteBuffer provided by the
  * ApplicaitonBufferHandler.
  * IMPORTANT: the current model assumes that the protocol will 'own' the

Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1763571&r1=1763570&r2=1763571&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Thu Oct  6 12:18:01 2016
@@ -23,7 +23,6 @@ import java.util.concurrent.atomic.Atomi
 
 import javax.servlet.ReadListener;
 
-import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.buf.UDecoder;
 import org.apache.tomcat.util.http.MimeHeaders;
@@ -492,34 +491,6 @@ public final class Request {
 }
 
 
-/**
- * Read data from the input buffer and put it into a byte chunk.
- *
- * The buffer is owned by the protocol implementation - it will be reused 
on
- * the next read. The Adapter must either process the data in place or copy
- * it to a separate buffer if it needs to hold it. In most cases this is
- * done during byte->char conversions or via InputStream. Unlike
- * InputStream, this interface allows the app to process data in place,
- * without copy.
- *
- * @param chunk The destination to which to copy the data
- *
- * @return The number of bytes copied
- *
- * @throws IOException If an I/O error occurs during the copy
- *
- * @deprecated Unused. Will be removed in Tomcat 9. Use
- * {@link #doRead(ApplicationBufferHandler)}
- */
-public int doRead(ByteChunk chunk) throws IOException {
-int n = inputBuffer.doRead(chunk);
-if (n > 0) {
-bytesRead+=n;
-}
-return n;
-}
-
-
 /**
  * Read data from the input buffer and put it into 
ApplicationBufferHandler.
  *

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1763571&r1=1763570&r2=1763571&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Oct  6 
12:18:01 2016
@@ -1352,27 +1352,6 @@ public class AjpProcessor extends Abstra
  */
 protected class SocketInputBuffer implements Inpu

svn commit: r1763574 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 12:34:01 2016
New Revision: 1763574

URL: http://svn.apache.org/viewvc?rev=1763574&view=rev
Log:
Update Tomcat Native to 1.2.10

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

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1763574&r1=1763573&r2=1763574&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Oct  6 12:34:01 2016
@@ -118,7 +118,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
 
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
 
 # - Tomcat native library -
-tomcat-native.version=1.2.8
+tomcat-native.version=1.2.10
 tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
 
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763574&r1=1763573&r2=1763574&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  6 12:34:01 2016
@@ -224,6 +224,10 @@
 run as a Windows Service. Based upon a documentation patch by
 James H.H. Lampert. (schultz)
   
+  
+Update the packaged version of the Tomcat Native Library to 1.2.10 to
+pick up the latest Windows binaries built with OpenSSL 1.0.2j. (markt)
+  
 
   
 



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

svn commit: r1763578 - in /tomcat/tc8.5.x/trunk: ./ build.properties.default webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 12:39:21 2016
New Revision: 1763578

URL: http://svn.apache.org/viewvc?rev=1763578&view=rev
Log:
Update Tomcat Native to 1.2.10

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

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

svn commit: r1763579 - in /tomcat/tc8.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 12:39:46 2016
New Revision: 1763579

URL: http://svn.apache.org/viewvc?rev=1763579&view=rev
Log:
Update Tomcat Native to 1.2.10

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

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

svn commit: r1763580 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 12:40:31 2016
New Revision: 1763580

URL: http://svn.apache.org/viewvc?rev=1763580&view=rev
Log:
Update Tomcat Native to 1.2.10

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct  6 12:40:31 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,1681703,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,1702
 
742,1702744,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,1
 
726171-1726173,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,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206
-/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,1746940,1748548,1748716,1749288,1749375,1749668-1749669,1750016,1750057,1750976,1751000,1751062,1751098,1754112,1754144,1754282,1754312,1754614,1754726,1754806,1754878,1754889,1754894,1754900,1754945,1754954,1754958,1755891,1755944,1756040,1756412,1756940,1757134,1757176,1757203,1757272,1757282,1757348,1757355,1757423,1757501,1757535,1758488,1758493,1758500,1758589,1759275,1761629,1761741,1762124,1762297,1

svn commit: r1763581 - in /tomcat/tc6.0.x/trunk: ./ build.properties.default webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 12:46:04 2016
New Revision: 1763581

URL: http://svn.apache.org/viewvc?rev=1763581&view=rev
Log:
Update Tomcat Native to 1.2.10

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

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

Missing replication of Tomcat 9 svn repo to github

2016-10-06 Thread Violeta Georgieva

Hi,

There is not replication of Tomcat 9 svn repo to github since 26.09.
All other repos are ok (Tomcat7/8/8.5).
Should I create an infra issue?

Thanks,
Violeta

Re: Time for 6.0.x?

2016-10-06 Thread Violeta Georgieva

Hi,

2016-09-30 14:20 GMT+03:00 Violeta Georgieva :
>
>
>
> 2016-09-30 10:23 GMT+03:00 Mark Thomas :
> >
> > On 29/09/2016 15:38, Violeta Georgieva wrote:
> > > Hi,
> > >
> > > 2016-09-29 17:02 GMT+03:00 Mark Thomas :
> > >>
> > >> On 20/09/2016 20:07, Mark Thomas wrote:
> > >>> All,
> > >>>
> > >>> It has been a while since 6.0.x and the changelog is looking a tad
long.
> > >>> Any takers for RM'ing a release?
> > >>
> > >> Ping. Anyone?
> > >
> > > I can help with Tomcat 6 release.
> >
> > Thanks.
> >
> > I think the only thing we are waiting on is the 1.2.10 Tomcat Native
> > release.
>
> Ok
>

I can start preparing Tomcat 6.0.46 for voting if everything is in.

Violeta

> >
> > I'll try and run the TCK with the APR/Native connector and 1.2.10 to
> > check everything is OK with 1.2.x (it should be but a check won't hurt).
>
> Thanks,
> Violeta
>
> >
> > Mark
> >
> >
> > >
> > > Regards,
> > > Violeta
> > >
> > >> I'm going to have my hands full with 8.0.x/8.5.x and 9.0.x releases
> > > shortly.
> > >>
> > >> Mark
> > >>
> > >>
> > >> -
> > >> 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: Missing replication of Tomcat 9 svn repo to github

2016-10-06 Thread Felix Schumacher



Am 6. Oktober 2016 15:40:31 MESZ, schrieb Violeta Georgieva 
:
>Hi,
>
>There is not replication of Tomcat 9 svn repo to github since 26.09.
>All other repos are ok (Tomcat7/8/8.5).
>Should I create an infra issue?

Infra-12645 has a comment from me about the sync problem.

But maybe it is better to have one for ourselves. JMeter is affected as well.

And at least for JMeter the Apache git repo is not in sync, too.

Regards,
Felix

>
>Thanks,
>Violeta

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

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

[Bug 60202] Failed LDAP connection triggers lockout realm

2016-10-06 Thread bugzilla

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

--- Comment #6 from Ben  ---
I agree with Christopher here. Possibly this is a two-part fix, one to adjust
the LDAPRealm to treat connection failures differently than authentication
failures, and one to allow the LockoutRealm to know the difference.

-- 
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 60202] Failed LDAP connection triggers lockout realm

2016-10-06 Thread bugzilla

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

--- Comment #7 from Remy Maucherat  ---
This is not useful, we can understand all you care about is having your issue
fixed, regardless of the collateral damage. Exception propagation is clearly
not the right way to do it, since the request should go on without an
authenticated user and then generate a response according to the security
constraints (if any).

Something that could be possible: return a singleton token principal in case of
some failure that is not an auth failure. The downside is that it's a hack that
is risky, and I'm not convinced it is worth trying.

-- 
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 60202] Failed LDAP connection triggers lockout realm

2016-10-06 Thread bugzilla

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

--- Comment #8 from Ben  ---
I'm not asking for a hack fix and I'm not asking for a fix that might break
something down the line. I'm asking for an improvement that will make the
application work better implemented in whatever way the development community
decides is best for the project.

-- 
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: r1763619 - /tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java

2016-10-06 Thread violetagg

Author: violetagg
Date: Thu Oct  6 15:57:32 2016
New Revision: 1763619

URL: http://svn.apache.org/viewvc?rev=1763619&view=rev
Log:
Remove duplications

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

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1763619&r1=1763618&r2=1763619&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu Oct  
6 15:57:32 2016
@@ -331,41 +331,6 @@ public class OutputBuffer extends Writer
  * Sends the buffer data to the client output, checking the
  * state of Response and calling the right interceptors.
  *
- * @param buf Byte buffer to be written to the response
- * @param off Offset
- * @param cnt Length
- *
- * @throws IOException An underlying IOException occurred
- */
-public void realWriteBytes(byte buf[], int off, int cnt) throws 
IOException {
-
-if (closed) {
-return;
-}
-if (coyoteResponse == null) {
-return;
-}
-
-// If we really have something to write
-if (cnt > 0) {
-// real write to the adapter
-try {
-coyoteResponse.doWrite(ByteBuffer.wrap(buf, off, cnt));
-} catch (IOException e) {
-// An IOException on a write is almost always due to
-// the remote client aborting the request. Wrap this
-// so that it can be handled better by the error dispatcher.
-throw new ClientAbortException(e);
-}
-}
-
-}
-
-
-/**
- * Sends the buffer data to the client output, checking the
- * state of Response and calling the right interceptors.
- *
  * @param buf the ByteBuffer to be written to the response
  *
  * @throws IOException An underlying IOException occurred
@@ -383,7 +348,7 @@ public class OutputBuffer extends Writer
 if (buf.remaining() > 0) {
 // real write to the adapter
 try {
-coyoteResponse.doWrite(buf.slice());
+coyoteResponse.doWrite(buf);
 } catch (IOException e) {
 // An IOException on a write is almost always due to
 // the remote client aborting the request. Wrap this
@@ -475,38 +440,19 @@ public class OutputBuffer extends Writer
 /**
  * Convert the chars to bytes, then send the data to the client.
  *
- * @param buf Char buffer to be written to the response
- * @param off Offset
- * @param len Length
+ * @param from Char buffer to be written to the response
  *
  * @throws IOException An underlying IOException occurred
  */
-public void realWriteChars(char buf[], int off, int len) throws 
IOException {
-
-CharBuffer outputCharChunk = CharBuffer.wrap(buf, off, len);
-while (outputCharChunk.remaining() > 0) {
-conv.convert(outputCharChunk, bb);
-if (bb.remaining() == 0) {
-// Break out of the loop if more chars are needed to produce 
any output
-break;
-}
-if (outputCharChunk.remaining() > 0) {
-flushByteBuffer();
-}
-}
-
-}
-
 public void realWriteChars(CharBuffer from) throws IOException {
 
-CharBuffer outputCharBuffer = from.slice();
-while (outputCharBuffer.remaining() > 0) {
-conv.convert(outputCharBuffer, bb);
+while (from.remaining() > 0) {
+conv.convert(from, bb);
 if (bb.remaining() == 0) {
 // Break out of the loop if more chars are needed to produce 
any output
 break;
 }
-if (outputCharBuffer.remaining() > 0) {
+if (from.remaining() > 0) {
 flushByteBuffer();
 }
 }
@@ -805,7 +751,7 @@ public class OutputBuffer extends Writer
 // directly from source
 flushCharBuffer();
 
-realWriteChars(src, off, len);
+realWriteChars(CharBuffer.wrap(src, off, len));
 }
 }
 
@@ -829,7 +775,7 @@ public class OutputBuffer extends Writer
 
 int limit = bb.capacity();
 while (len >= limit) {
-realWriteBytes(src, off, limit);
+realWriteBytes(ByteBuffer.wrap(src, off, limit));
 len = len - limit;
 off = off + limit;
 }
@@ -848,7 +794,7 @@ public class OutputBuffer extends Writer
 int fromLimit = from.limit();
 while (from.remaining() >= limit) {
 from.limit(from.position() + limit);
-realWriteBytes(from);
+realWriteBytes(f

[Bug 60202] Failed LDAP connection triggers lockout realm

2016-10-06 Thread bugzilla

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

--- Comment #9 from Remy Maucherat  ---
It's not magical and at this point the thinking is that we have to change
something and it would be problematic.

Something that could work better is having a "Realm.isUp" method or something
like this. That's not quite the way this realm is designed to work with its
connection at the moment.

-- 
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: r1763634 - /tomcat/trunk/webapps/docs/changelog.xml

2016-10-06 Thread fschumacher

Author: fschumacher
Date: Thu Oct  6 17:12:40 2016
New Revision: 1763634

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

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763634&r1=1763633&r2=1763634&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  6 17:12:40 2016
@@ -54,7 +54,7 @@
   
   
 60013: Refactor the previous fix to align the behaviour of
-the Rewrite Valve with mod_rewite. As part of this, provide an
+the Rewrite Valve with mod_rewrite. As part of this, provide an
 implementation for the B and NE flags and
 improve the handling for the QSA flag. Includes multiple
 test cases by Santhana Preethiand a patch by Tiago Oliveira. (markt)



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

Re: Missing replication of Tomcat 9 svn repo to github

2016-10-06 Thread Felix Schumacher


Am 06.10.2016 um 16:21 schrieb Felix Schumacher:


Am 6. Oktober 2016 15:40:31 MESZ, schrieb Violeta Georgieva 
:

Hi,

There is not replication of Tomcat 9 svn repo to github since 26.09.
All other repos are ok (Tomcat7/8/8.5).
Should I create an infra issue?

Infra-12645 has a comment from me about the sync problem.

But maybe it is better to have one for ourselves. JMeter is affected as well.

And at least for JMeter the Apache git repo is not in sync, too.

JMeter is in sync after I did a commit a few minutes ago.
Same for tomcat.

Regards,
 Felix



Regards,
Felix


Thanks,
Violeta




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

Re: Missing replication of Tomcat 9 svn repo to github

2016-10-06 Thread Violeta Georgieva

2016-10-06 20:13 GMT+03:00 Felix Schumacher <
felix.schumac...@internetallee.de>:
>
> Am 06.10.2016 um 16:21 schrieb Felix Schumacher:
>>
>>
>> Am 6. Oktober 2016 15:40:31 MESZ, schrieb Violeta Georgieva <
violet...@apache.org>:
>>>
>>> Hi,
>>>
>>> There is not replication of Tomcat 9 svn repo to github since 26.09.
>>> All other repos are ok (Tomcat7/8/8.5).
>>> Should I create an infra issue?
>>
>> Infra-12645 has a comment from me about the sync problem.
>>
>> But maybe it is better to have one for ourselves. JMeter is affected as
well.
>>
>> And at least for JMeter the Apache git repo is not in sync, too.
>
> JMeter is in sync after I did a commit a few minutes ago.
> Same for tomcat.

That's great.

Thanks

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

[Bug 60211] New: windows style %JAVA_OPTS% variable used in catalina.sh

2016-10-06 Thread bugzilla

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

Bug ID: 60211
   Summary: windows style %JAVA_OPTS% variable used in catalina.sh
   Product: Tomcat 8
   Version: 8.5.x-trunk
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Meta
  Assignee: dev@tomcat.apache.org
  Reporter: carl.ber...@posteo.de

Created attachment 34330
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=34330&action=edit
changes %JAVA_OPTS% to $JAVA_OPTS in bin/catalina.sh

The windows style variable %JAVA_OPTS% is used in bin/catalina.sh  instead of
$JAVA_OPTS

Same patch can be applied to http://svn.apache.org/repos/asf/tomcat/trunk ,
r1763634

-- 
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: r1763635 - /tomcat/trunk/bin/catalina.sh

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 18:48:28 2016
New Revision: 1763635

URL: http://svn.apache.org/viewvc?rev=1763635&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60211
Fix wrong env var style
Patch by Carl Berger

Modified:
tomcat/trunk/bin/catalina.sh

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1763635&r1=1763634&r2=1763635&view=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Thu Oct  6 18:48:28 2016
@@ -242,7 +242,7 @@ JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
 
 # Register custom URL handlers
 # Do this here so custom URL handles (specifically 'war:...') can be used in 
the security policy
-JAVA_OPTS="%JAVA_OPTS% 
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
+JAVA_OPTS="$JAVA_OPTS 
-Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
 
 # Set juli LogManager config file if it is present and an override has not 
been issued
 if [ -z "$LOGGING_CONFIG" ]; then



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

svn commit: r1763636 - in /tomcat/tc8.5.x/trunk: ./ bin/catalina.sh

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 18:49:02 2016
New Revision: 1763636

URL: http://svn.apache.org/viewvc?rev=1763636&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60211
Fix wrong env var style
Patch by Carl Berger

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/bin/catalina.sh

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

svn commit: r1763637 - in /tomcat/tc8.0.x/trunk: ./ bin/catalina.sh

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 18:49:33 2016
New Revision: 1763637

URL: http://svn.apache.org/viewvc?rev=1763637&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60211
Fix wrong env var style
Patch by Carl Berger

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/bin/catalina.sh

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

[Bug 60211] windows style %JAVA_OPTS% variable used in catalina.sh

2016-10-06 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
Whoops. Thanks for catching that.

This has been fixed in the following branches:
- 9.0.x for 9.0.0.M11 onwards
- 8.5.x for 8.5.6 onwards
- 8.0.x for 8.0.38 onwards

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

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

svn commit: r1763638 - in /tomcat/tags/TOMCAT_9_0_0_M11: ./ build.properties.default webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 18:53:03 2016
New Revision: 1763638

URL: http://svn.apache.org/viewvc?rev=1763638&view=rev
Log:
Tag 9.0.0.M11

Added:
tomcat/tags/TOMCAT_9_0_0_M11/
  - copied from r1763637, tomcat/trunk/
Modified:
tomcat/tags/TOMCAT_9_0_0_M11/build.properties.default
tomcat/tags/TOMCAT_9_0_0_M11/webapps/docs/changelog.xml

Modified: tomcat/tags/TOMCAT_9_0_0_M11/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M11/build.properties.default?rev=1763638&r1=1763637&r2=1763638&view=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M11/build.properties.default (original)
+++ tomcat/tags/TOMCAT_9_0_0_M11/build.properties.default Thu Oct  6 18:53:03 
2016
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M11-dev
+version.suffix=.M11
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/tags/TOMCAT_9_0_0_M11/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M11/webapps/docs/changelog.xml?rev=1763638&r1=1763637&r2=1763638&view=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M11/webapps/docs/changelog.xml (original)
+++ tomcat/tags/TOMCAT_9_0_0_M11/webapps/docs/changelog.xml Thu Oct  6 18:53:03 
2016
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   



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

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

2016-10-06 Thread markt

Added: dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.asc
==
--- dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.asc 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.asc 
Thu Oct  6 19:17:20 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJX9p8vAAoJEBDAHFovYFnn2loP/2LVOGdnqO+Yubzm6ln2JvgS
+Mc8ZwfIf3kZI7fhynrZqkc2CIkq2ZlfXpvmlV1iSKeSoG1LkR31+VYUJqIwiRVkQ
+sNFnmConOdrMtU28vh1qwSkeHxTzvSp6qEO/pVaAk5TRxt6d4s4hV4BLNo6bDlOu
+SoxffrP5KbTqnb7oGpvVsXIrf3UNEB7ebfyJ+TTeCzi6YM71E1p2+875Kd2py16u
+BEJCEScKhi5C6g287fNMVSBkyILhJlulfeJUDcEEdJT3tjmSfbLJ5pd1wXZPqVZy
+0lLa/b/8u2P7Q6pBEIUE2JvJhWIbk9n7ywz/iVNOyR1tPDSdqJ8CehASljx8lLdm
+QF4/n2yvr3lkqGF+yakV8HfdRJiOsbS120E5Sy28XVSW9vHa4N7Mb5TLCX8LLJ4z
++ldjcNKip6240Q5Bj2WJArdL/FFx0VK3B5rRrAQLnJnW6jZmtJXug1692zE+x5JS
+2dvCfkbD32GNzgoHgnC9fpfgQh/pZTuPjN20zJz9172k/29Rb9Cy11oaDhUl+JvW
+CfPqEbgQUsInPLT8DlEv8fpobCm5xlw1s5m+hYtyarUq7QyILq0Etkplsc58d1P5
+1qwFxPu+/04ZNWXjxutnEoQgJixrd55mScGX6lNV0t6dihaiCsAJj29LsjqbgBll
+mzK9Z5ZstQHfxpI/Wm3M
+=etWK
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.md5
==
--- dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.md5 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.md5 
Thu Oct  6 19:17:20 2016
@@ -0,0 +1 @@
+a386357f5c9ee2067c3add6de5016e6f *apache-tomcat-9.0.0.M11-src.tar.gz
\ No newline at end of file

Added: 
dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.sha1
==
--- dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.sha1 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.sha1 
Thu Oct  6 19:17:20 2016
@@ -0,0 +1 @@
+e7a759207ea4001aea2c94e2fb83af67b2dc87c0 *apache-tomcat-9.0.0.M11-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip.asc
==
--- dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip.asc 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip.asc Thu 
Oct  6 19:17:20 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJX9p8CAAoJEBDAHFovYFnn3SkP/2phrU2CK69fwuOQmE4/uTcC
++PAnjwKg+10YOq2WfFl8f+g3CQ5fWtq6LTtRgh73yM9uzmvH9CFDl8plPxFOJw6z
+V/U3VBLrMvxuMdc1FwNL8ZQatF3KWwx2vW4zCAlS/RI8J49j+RwYE7zG2GyLyK2I
+puLieTIz7x5FGcm3BZYzNWjW7I+p6xpSrhqI7McsZM5gZqUHIYoZlpGx8ufAy+3I
+PZZ2R4Hu++AKEMj2wooUnHYHJMsFeO8s39ugNirMoimPDF651NNW5+nGK+XzJ0YS
+V26ZElNXrGePZ08sxViAMgCLTBXOAy4K1ZcxaqFjpeT+YLXR5LNwDtfcCM7wmkpd
+Zqj20bbIpR3DEQWOV/ZPyp3g2Pjzyq6gvaproYPVbVMDdIm3Gdfh1YE1vqQIq/c7
+Q2uGseN6V91SAjlXzzANeT6Rzj0JEMRBHjSSJBb0jobsTyNKXNcKxkHjHnnpwNxD
+t0N/YbwSICX/zAbhaVs5UEf9f+FLC8fnMZnWAUmF+0z/wknBQ+JbXFx+1IuZURPU
+7a0jroWWDX9Fhux3G2f96vliaMUcwPRYllEKsumg3x6PRblCP6qheMcv+CATWLED
+uHfSwycxzYj8fQ9pv+JctJfoQw+eFxTOEi/WGfW0be7KAKgZK6gTBeIM2QFpcARj
+VQ7Ja9toLSTMoe0w2NG+
+=7/In
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip.md5
==
--- dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip.md5 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip.md5 Thu 
Oct  6 19:17:20 2016
@@ -0,0 +1 @@
+c106a102e491490804240d1fa5f9eca8 *apache-tomcat-9.0.0.M11-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip.sha1
==
--- dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip.sha1 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip.sha1 Thu 
Oct  6 19:17:20 2016
@@ -0,0 +1 @@
+91d13dff85d9bf8cf93065a273840bc1bad1cd1d *apache-tomcat-9.0.0.M11-src.zip
\ No newline at end of file



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

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

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 19:17:20 2016
New Revision: 16405

Log:
Upload 9.0.0.M11 for voting

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

dev/tomcat/tomcat-9/v9.0.0.M11/bin/apache-tomcat-9.0.0.M11-deployer.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M11/bin/apache-tomcat-9.0.0.M11-deployer.tar.gz.md5

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

dev/tomcat/tomcat-9/v9.0.0.M11/bin/apache-tomcat-9.0.0.M11-fulldocs.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M11/bin/apache-tomcat-9.0.0.M11-fulldocs.tar.gz.md5

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

dev/tomcat/tomcat-9/v9.0.0.M11/bin/apache-tomcat-9.0.0.M11-windows-x64.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M11/bin/apache-tomcat-9.0.0.M11-windows-x64.zip.md5

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

dev/tomcat/tomcat-9/v9.0.0.M11/bin/apache-tomcat-9.0.0.M11-windows-x86.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M11/bin/apache-tomcat-9.0.0.M11-windows-x86.zip.md5

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

dev/tomcat/tomcat-9/v9.0.0.M11/bin/embed/apache-tomcat-9.0.0.M11-embed.tar.gz   
(with props)

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

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

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

dev/tomcat/tomcat-9/v9.0.0.M11/bin/embed/apache-tomcat-9.0.0.M11-embed.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M11/bin/embed/apache-tomcat-9.0.0.M11-embed.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M11/bin/embed/apache-tomcat-9.0.0.M11-embed.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M11/bin/extras/
dev/tomcat/tomcat-9/v9.0.0.M11/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M11/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M11/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M11/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M11/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-9/v9.0.0.M11/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M11/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M11/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M11/src/
dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M11/src/apache-tomcat-9.0.0.M11-src.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M11/src/apa

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

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 19:39:12 2016
New Revision: 1763645

URL: http://svn.apache.org/viewvc?rev=1763645&view=rev
Log:
Typo

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763645&r1=1763644&r2=1763645&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  6 19:39:12 2016
@@ -150,7 +150,7 @@
   
   
 60123: Avoid potential threading issues that could cause
-excessively large vales to be returned for the processing time of
+excessively large values to be returned for the processing time of
 a current request. (markt)
   
   



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

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

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 19:40:57 2016
New Revision: 1763646

URL: http://svn.apache.org/viewvc?rev=1763646&view=rev
Log:
Increment version ready for next development cycle

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

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1763646&r1=1763645&r2=1763646&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Oct  6 19:40:57 2016
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M11-dev
+version.suffix=.M12-dev
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1763646&r1=1763645&r2=1763646&view=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Thu Oct  6 19:40:57 2016
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=9.0.0.M11
+maven.asf.release.deploy.version=9.0.0.M12
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1763646&r1=1763645&r2=1763646&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  6 19:40:57 2016
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   



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

[VOTE] Release Apache Tomcat 9.0.0.M11

2016-10-06 Thread Mark Thomas

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

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

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

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

- Update the packaged version of the Tomcat Native Library to
  1.2.10 to pick up the latest Windows binaries built with
  OpenSSL 1.0.2j

- Improved UTF-8 handling for the RewriteValve

Along with lots of other bug fixes and improvements

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

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

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

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

svn commit: r1763654 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_6: ./ build.properties.default webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 20:11:18 2016
New Revision: 1763654

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

Added:
tomcat/tc8.5.x/tags/TOMCAT_8_5_6/   (props changed)
  - copied from r1763653, tomcat/tc8.5.x/trunk/
Modified:
tomcat/tc8.5.x/tags/TOMCAT_8_5_6/build.properties.default
tomcat/tc8.5.x/tags/TOMCAT_8_5_6/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
--
bugtraq:append = false

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Thu Oct  6 20:11:18 2016
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct  6 20:11:18 2016
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_6/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct  6 20:11:18 2016
@@ -0,0 +1 @@
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,17

[VOTE] Release Apache Tomcat 8.5.6

2016-10-06 Thread Mark Thomas

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

The major changes compared to the 8.5.5 release are:

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

- Update the packaged version of the Tomcat Native Library to
  1.2.10 to pick up the latest Windows binaries built with
  OpenSSL 1.0.2j

- Improved UTF-8 handling for the RewriteValve


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

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

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

svn commit: r16407 [2/2] - in /dev/tomcat/tomcat-8/v8.5.6: ./ bin/ bin/embed/ bin/extras/ src/

2016-10-06 Thread markt

Propchange: dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.asc Thu Oct  6 
20:39:12 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJX9rITAAoJEBDAHFovYFnnay4QAL2GtuCU2QF8y/PuP7z6DAmv
+14S9Icz93CbT6vyCoTFMMNNfEc1xobOB787Ssfdau/WBO3JoYCmJftFcXppmrQgM
+NtfsW8SMfssMSDjLCdHiCWIr5RiwlG4jqjRhqQfneOEHo6OdmzfSjgoPOUiXWXY8
+YZFc6u5GxjY9m43eEWWmeIKLUm1hqWNCikeLPG2sSYLaUAjVwaIpZknncTHfsiTw
+QuxVaCP/bHkR8iX4YS3z5i7LgP6NV1DTicUW986k+2g1mEH671U0Ck+ArA20zZ2w
+hC0Wu9FVx+bdwl55WL9XuHQNWAJ6FGQSp6TbqUkHAl3Vs3IEMfdP0lkNGAEckAwA
+za+sKNJc2pPnjCxVtO16Zteg/G7+B/f/cBXoAY7lfLChcTJJvacxVtCbIyy5CLRK
+V1KciOcdr9EgYh9ln41TjKuaprLflRVqdNFamdz0pBanp55FYZDBPWLDNrg69+gZ
+/SWICUBuy+xo4jklNYWsBWSjYNTSEx8dLcWoEg69aYIbn07V9NKUdKrQsCqJPVRV
++hDDmCFq6XiJunNIywF+hA6j8ArtNy+Oz5F9ZkzPjGSCqY6w8bI+pK64J5+RCjCS
+arUB0xyultFHnA8FIB6rZhxEcryxkOp5q56lTJgtcfETUOCDEgwvbmvZYs342Qwe
+Oq+gt5yATPwQ3z7ATbKs
+=pgVU
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.md5
==
--- dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.md5 (added)
+++ dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.md5 Thu Oct  6 
20:39:12 2016
@@ -0,0 +1 @@
+986c6721a70c6abbb32b092f0d1ef98a *apache-tomcat-8.5.6-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.sha1
==
--- dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.sha1 (added)
+++ dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.sha1 Thu Oct  6 
20:39:12 2016
@@ -0,0 +1 @@
+286592b36f28086a9be317e2270fe49ace9c0ab2 *apache-tomcat-8.5.6-src.zip
\ No newline at end of file



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

svn commit: r1763655 - in /tomcat/tc8.0.x/tags/TOMCAT_8_0_38: ./ build.properties.default webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 20:38:59 2016
New Revision: 1763655

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

Added:
tomcat/tc8.0.x/tags/TOMCAT_8_0_38/   (props changed)
  - copied from r1763654, tomcat/tc8.0.x/trunk/
Modified:
tomcat/tc8.0.x/tags/TOMCAT_8_0_38/build.properties.default
tomcat/tc8.0.x/tags/TOMCAT_8_0_38/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
bugtraq:append = false

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Thu Oct  6 20:38:59 2016
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct  6 20:38:59 2016
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct  6 20:38:59 2016
@@ -0,0 +1,2 @@
+/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1

svn commit: r16407 [1/2] - in /dev/tomcat/tomcat-8/v8.5.6: ./ bin/ bin/embed/ bin/extras/ src/

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 20:39:12 2016
New Revision: 16407

Log:
Upload 8.5.6 for voting

Added:
dev/tomcat/tomcat-8/v8.5.6/
dev/tomcat/tomcat-8/v8.5.6/KEYS   (with props)
dev/tomcat/tomcat-8/v8.5.6/README.html   (with props)
dev/tomcat/tomcat-8/v8.5.6/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.6/bin/
dev/tomcat/tomcat-8/v8.5.6/bin/README.html   (with props)
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-deployer.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-deployer.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-deployer.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-deployer.zip.md5
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-deployer.zip.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-fulldocs.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-fulldocs.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-windows-x64.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-windows-x64.zip.md5
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-windows-x64.zip.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-windows-x86.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-windows-x86.zip.md5
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6-windows-x86.zip.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.exe   (with props)
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.exe.asc
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.exe.md5
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.exe.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.zip   (with props)
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.zip.asc
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.zip.md5
dev/tomcat/tomcat-8/v8.5.6/bin/apache-tomcat-8.5.6.zip.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/embed/
dev/tomcat/tomcat-8/v8.5.6/bin/embed/apache-tomcat-8.5.6-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.6/bin/embed/apache-tomcat-8.5.6-embed.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.6/bin/embed/apache-tomcat-8.5.6-embed.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.6/bin/embed/apache-tomcat-8.5.6-embed.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/embed/apache-tomcat-8.5.6-embed.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.6/bin/embed/apache-tomcat-8.5.6-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.6/bin/embed/apache-tomcat-8.5.6-embed.zip.md5
dev/tomcat/tomcat-8/v8.5.6/bin/embed/apache-tomcat-8.5.6-embed.zip.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/extras/
dev/tomcat/tomcat-8/v8.5.6/bin/extras/catalina-jmx-remote.jar   (with props)
dev/tomcat/tomcat-8/v8.5.6/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.6/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-8/v8.5.6/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-8/v8.5.6/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.6/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.6/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-8/v8.5.6/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-8/v8.5.6/src/
dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.asc
dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.md5
dev/tomcat/tomcat-8/v8.5.6/src/apache-tomcat-8.5.6-src.zip.sha1

Added: dev/tomcat/tomcat-8/v8.5.6/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.6/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.6/KEYS Thu Oct  6 20:39:12 2016
@@ -0,0 +1,616 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main

svn commit: r1763659 - /tomcat/tc8.0.x/tags/TOMCAT_8_0_38/

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 20:48:20 2016
New Revision: 1763659

URL: http://svn.apache.org/viewvc?rev=1763659&view=rev
Log:
Need to re-tag

Removed:
tomcat/tc8.0.x/tags/TOMCAT_8_0_38/


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

svn commit: r1763660 - in /tomcat/tc8.0.x/trunk: build.properties.default res/maven/mvn.properties.default

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 20:49:47 2016
New Revision: 1763660

URL: http://svn.apache.org/viewvc?rev=1763660&view=rev
Log:
Bump versions ready for tagging

Modified:
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default

Modified: tomcat/tc8.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.properties.default?rev=1763660&r1=1763659&r2=1763660&view=diff
==
--- tomcat/tc8.0.x/trunk/build.properties.default (original)
+++ tomcat/tc8.0.x/trunk/build.properties.default Thu Oct  6 20:49:47 2016
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=0
-version.build=37
+version.build=38
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default?rev=1763660&r1=1763659&r2=1763660&view=diff
==
--- tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default Thu Oct  6 20:49:47 
2016
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=8.0.37
+maven.asf.release.deploy.version=8.0.38
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib



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

svn commit: r1763661 - in /tomcat/tc8.0.x/tags/TOMCAT_8_0_38: ./ build.properties.default webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 20:50:08 2016
New Revision: 1763661

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

Added:
tomcat/tc8.0.x/tags/TOMCAT_8_0_38/   (props changed)
  - copied from r1763660, tomcat/tc8.0.x/trunk/
Modified:
tomcat/tc8.0.x/tags/TOMCAT_8_0_38/build.properties.default
tomcat/tc8.0.x/tags/TOMCAT_8_0_38/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
bugtraq:append = false

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Thu Oct  6 20:50:08 2016
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct  6 20:50:08 2016
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc8.0.x/tags/TOMCAT_8_0_38/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct  6 20:50:08 2016
@@ -0,0 +1,2 @@
+/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1

svn commit: r1763662 - in /tomcat/tc8.5.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 20:56:36 2016
New Revision: 1763662

URL: http://svn.apache.org/viewvc?rev=1763662&view=rev
Log:
Increment version ready for next development cycle

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

Modified: tomcat/tc8.5.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1763662&r1=1763661&r2=1763662&view=diff
==
--- tomcat/tc8.5.x/trunk/build.properties.default (original)
+++ tomcat/tc8.5.x/trunk/build.properties.default Thu Oct  6 20:56:36 2016
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=6
+version.build=7
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default?rev=1763662&r1=1763661&r2=1763662&view=diff
==
--- tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Thu Oct  6 20:56:36 
2016
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=8.5.6
+maven.asf.release.deploy.version=8.5.7
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

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=1763662&r1=1763661&r2=1763662&view=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Oct  6 20:56:36 2016
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   



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

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

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 21:04:40 2016
New Revision: 1763663

URL: http://svn.apache.org/viewvc?rev=1763663&view=rev
Log:
Increment version ready for next development cycle

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

Modified: tomcat/tc8.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.properties.default?rev=1763663&r1=1763662&r2=1763663&view=diff
==
--- tomcat/tc8.0.x/trunk/build.properties.default (original)
+++ tomcat/tc8.0.x/trunk/build.properties.default Thu Oct  6 21:04:40 2016
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=0
-version.build=38
+version.build=39
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default?rev=1763663&r1=1763662&r2=1763663&view=diff
==
--- tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default Thu Oct  6 21:04:40 
2016
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=8.0.38
+maven.asf.release.deploy.version=8.0.39
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1763663&r1=1763662&r2=1763663&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Oct  6 21:04:40 2016
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   



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

svn commit: r1763664 - in /tomcat/tc8.0.x/trunk: build.properties.default res/maven/tomcat-jasper.pom webapps/docs/changelog.xml

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 21:08:30 2016
New Revision: 1763664

URL: http://svn.apache.org/viewvc?rev=1763664&view=rev
Log:
Update ECJ to 4.5.1 to align with 8.5.x/9.0.x

Modified:
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.properties.default?rev=1763664&r1=1763663&r2=1763664&view=diff
==
--- tomcat/tc8.0.x/trunk/build.properties.default (original)
+++ tomcat/tc8.0.x/trunk/build.properties.default Thu Oct  6 21:08:30 2016
@@ -148,8 +148,8 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j
 
 # - Eclipse JDT, version 4.5 or later -#
 # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
-jdt.version=4.5
-jdt.release=R-4.5-201506032000
+jdt.version=4.5.1
+jdt.release=R-4.5.1-201509040015
 jdt.home=${base.path}/ecj-${jdt.version}
 jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
 # The download will be moved to the archive area eventually. We are taking 
care of that in advance.

Modified: tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom?rev=1763664&r1=1763663&r2=1763664&view=diff
==
--- tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom Thu Oct  6 21:08:30 2016
@@ -57,7 +57,7 @@
 
   org.eclipse.jdt.core.compiler
   ecj
-  4.5
+  4.5.1
 
 
   org.apache.tomcat

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1763664&r1=1763663&r2=1763664&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Oct  6 21:08:30 2016
@@ -45,6 +45,13 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Update the ECJ compiler to version 4.5.1. (markt)
+  
+
+  
 
 
   



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

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

2016-10-06 Thread markt

Author: markt
Date: Thu Oct  6 21:12:46 2016
New Revision: 16408

Log:
Upload 8.5.38 for voting

Added:
dev/tomcat/tomcat-8/v8.0.38/
dev/tomcat/tomcat-8/v8.0.38/KEYS   (with props)
dev/tomcat/tomcat-8/v8.0.38/README.html   (with props)
dev/tomcat/tomcat-8/v8.0.38/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.0.38/bin/
dev/tomcat/tomcat-8/v8.0.38/bin/README.html   (with props)
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.tar.gz.md5
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.tar.gz.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.zip.md5
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-deployer.zip.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-fulldocs.tar.gz.md5
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-windows-x64.zip.md5
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-windows-x64.zip.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-windows-x86.zip.md5
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38-windows-x86.zip.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.exe   (with props)
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.exe.md5
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.exe.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.tar.gz.md5
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.tar.gz.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.zip   (with props)
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.zip.md5
dev/tomcat/tomcat-8/v8.0.38/bin/apache-tomcat-8.0.38.zip.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/embed/
dev/tomcat/tomcat-8/v8.0.38/bin/embed/apache-tomcat-8.0.38-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.0.38/bin/embed/apache-tomcat-8.0.38-embed.tar.gz.md5
dev/tomcat/tomcat-8/v8.0.38/bin/embed/apache-tomcat-8.0.38-embed.tar.gz.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/embed/apache-tomcat-8.0.38-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.0.38/bin/embed/apache-tomcat-8.0.38-embed.zip.md5
dev/tomcat/tomcat-8/v8.0.38/bin/embed/apache-tomcat-8.0.38-embed.zip.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/extras/
dev/tomcat/tomcat-8/v8.0.38/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.0.38/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-8/v8.0.38/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.0.38/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-8/v8.0.38/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-8/v8.0.38/bin/extras/tomcat-juli-adapters.jar.md5
dev/tomcat/tomcat-8/v8.0.38/bin/extras/tomcat-juli-adapters.jar.sha1
dev/tomcat/tomcat-8/v8.0.38/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-8/v8.0.38/bin/extras/tomcat-juli.jar.md5
dev/tomcat/tomcat-8/v8.0.38/bin/extras/tomcat-juli.jar.sha1
dev/tomcat/tomcat-8/v8.0.38/src/
dev/tomcat/tomcat-8/v8.0.38/src/apache-tomcat-8.0.38-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.0.38/src/apache-tomcat-8.0.38-src.tar.gz.md5
dev/tomcat/tomcat-8/v8.0.38/src/apache-tomcat-8.0.38-src.tar.gz.sha1
dev/tomcat/tomcat-8/v8.0.38/src/apache-tomcat-8.0.38-src.zip   (with props)
dev/tomcat/tomcat-8/v8.0.38/src/apache-tomcat-8.0.38-src.zip.md5
dev/tomcat/tomcat-8/v8.0.38/src/apache-tomcat-8.0.38-src.zip.sha1

Added: dev/tomcat/tomcat-8/v8.0.38/KEYS
==
--- dev/tomcat/tomcat-8/v8.0.38/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.0.38/KEYS Thu Oct  6 21:12:46 2016
@@ -0,0 +1,616 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC K

[VOTE] Release Apache Tomcat 8.0.38

2016-10-06 Thread Mark Thomas

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

The main changes since 8.0.37 are:

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

- Update the packaged version of the Tomcat Native Library to
  1.2.10 to pick up the latest Windows binaries built with
  OpenSSL 1.0.2j

- Improved UTF-8 handling for the RewriteValve


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

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

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

1 2 >

1 - 100 of 107 matches

Mail list logo