date:20150204

Tomcat 7.0.55 System Down

2015-02-04 Thread 토로치

Hello.


I am a PLM system developers.


We PLM system operates by JAVA.


We are using the Tomcat version 7.0.55.


The system Down occurs when we are using a PLM system.


The hs-err_pid5684.mdmp file over 20GB is created in the Tomcat root folder.


When the contents of the hs_err_pid5512.log file shown that a JVM bug.


There are logs that appear whenever an error occurs in common.

==ERROR=

com.dassault_systemes.platform.ipmodeling.jni.EnoviaKernel.statelessDispatch
com/dassault_systemes/platform/ipmodeling/jni/EnoviaSessionWrapper;Ljava/lang/String;Ljava/lang/String

==


How ho we fix this?


Below is the full text of hs_err_pid5512.log.


---  SYSTEM  ---

OS: Windows NT 6.1 , 64 bit Build 7601 Service Pack 1

CPU : total 12 (6 cores per cpu, 2 threads per core) family 6 model 44
stepping 2, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2,
popcnt, ht

Memory: 4k page, physical 50318424k(17358476k free), swap
100634984k(73454820k free)

vm_info: Java HotSpot(TM) 64-Bit Server VM (22.1-b02) for windows-amd64 JRE
(1.7.0_03-b05), built on Feb  3 2012 20:43:56 by "java_re" with unknown MS
VC++:1600

time: Wed Feb 04 13:39:01 2015
elapsed time: 407758 seconds


==  hs_err_pid5512.log
 =

#
# A fatal error has been detected by the Java Runtime Environment:
#
#  EXCEPTION_ACCESS_VIOLATION (0xc005) at pc=0x7737e4e4,
pid=5512, tid=18668
#
# JRE version: 7.0_03-b05
# Java VM: Java HotSpot(TM) 64-Bit Server VM (22.1-b02 mixed mode
windows-amd64 )
# Problematic frame:
# C  [ntdll.dll+0x4e4e4]
#
# Core dump written. Default location:
D:\apache-tomcat-7.0.55\hs_err_pid5512.mdmp
#
# If you would like to submit a bug report, please visit:
#   http://bugreport.sun.com/bugreport/crash.jsp
# The crash happened outside the Java Virtual Machine in native code.
# See problematic frame for where to report the bug.
#

---  T H R E A D  ---

Current thread (0x384c9800):  JavaThread "http-apr-9500-exec-226"
daemon [_thread_in_native, id=18668,
stack(0x5a63,0x5a73)]

siginfo: ExceptionCode=0xc005, writing address 0x0024

Registers:
RAX=0x, RBX=0x796d5ed8, RCX=0xfffc,
RDX=0x00015fe0
RSP=0x5a724b80, RBP=0x, RSI=0x00015fe0,
RDI=0x
R8 =0x5a724b38, R9 =0x0004, R10=0x,
R11=0x0246
R12=0x, R13=0x, R14=0x07efe000,
R15=0x
RIP=0x7737e4e4, EFLAGS=0x00010213

Top of Stack: (sp=0x5a724b80)
0x5a724b80:   5063b620 00015fe0
0x5a724b90:   3bf60080 3bf60190
0x5a724ba0:   5063b620 3c15
0x5a724bb0:   fffe 
0x5a724bc0:   3c15b3a0 00399c13
0x5a724bd0:   3b1fcb20 0050
0x5a724be0:    001f
0x5a724bf0:   0218 46edc360
0x5a724c00:   5a727b20 
0x5a724c10:   0004 0001
0x5a724c20:   ff00 7737e40b
0x5a724c30:    001f
0x5a724c40:    796d5ed8
0x5a724c50:   796d5ed0 00399c13
0x5a724c60:   80017660 
0x5a724c70:   48ec 001f

Instructions: (pc=0x7737e4e4)
0x7737e4c4:   0f b1 4b 08 0f 85 9b 47 fd ff 48 8b 03 4c 89 ac
0x7737e4d4:   24 c0 00 00 00 33 ed 45 33 ed 48 83 f8 ff 74 03
0x7737e4e4:   ff 40 24 ba 22 17 00 00 48 8d 3d 9d 8f 0e 00 80
0x7737e4f4:   3c 25 82 03 fe 7f 00 0f 85 b3 bd 01 00 48 83 fe


Register to memory mapping:

RAX=0x is an unknown value
RBX=0x796d5ed8 is an unknown value
RCX=0xfffc is an unknown value
RDX=0x00015fe0 is an unknown value
RSP=0x5a724b80 is pointing into the stack for thread:
0x384c9800
RBP=0x is an unknown value
RSI=0x00015fe0 is an unknown value
RDI=0x is an unknown value
R8 =0x5a724b38 is pointing into the stack for thread:
0x384c9800
R9 =0x0004 is an unknown value
R10=0x is an unknown value
R11=0x0246 is an unknown value
R12=0x is an unknown value
R13=0x is an unknown value
R14=0x07efe000 is an unknown value
R15=0x is an unknown value


Stack:
[0x5a63,0x5a73],

[Bug 57509] maxHttpHeaderSize maybe case ArrayIndexOutOfBoundsException

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57509

Konstantin Kolinko  changed:

   What|Removed |Added

 Resolution|WONTFIX |FIXED

--- Comment #5 from Konstantin Kolinko  ---
Fixed in trunk and Tomcat 8 (r1657460), will be in 8.0.19 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: r1657460 - in /tomcat/tc8.0.x/trunk: java/org/apache/coyote/http11/AbstractOutputBuffer.java webapps/docs/changelog.xml

2015-02-04 Thread kkolinko

Author: kkolinko
Date: Thu Feb  5 03:15:23 2015
New Revision: 1657460

URL: http://svn.apache.org/r1657460
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57509
Improve length check in OutputBuffer.write() to account for 4 extra bytes that 
are needed to terminates the headers.

Backport of r1657459 from trunk. (Code is the same, class names differ)

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1657460&r1=1657459&r2=1657460&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java 
Thu Feb  5 03:15:23 2015
@@ -594,7 +594,9 @@ public abstract class AbstractOutputBuff
  * requested number of bytes.
  */
 private void checkLengthBeforeWrite(int length) {
-if (pos + length > headerBuffer.length) {
+// "+ 4": BZ 57509. Reserve space for CR/LF/COLON/SP characters that
+// are put directly into the buffer following this write operation.
+if (pos + length + 4 > headerBuffer.length) {
 throw new HeadersTooLargeException(
 sm.getString("iob.responseheadertoolarge.error"));
 }

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=1657460&r1=1657459&r2=1657460&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Feb  5 03:15:23 2015
@@ -72,6 +72,10 @@
 side effects of these mutltiple registrations would be exceptions
 appearing in the logs. (markt)
   
+  
+57509: Improve length check when writing HTTP/1.1
+response headers: reserve space for 4 extra bytes. (kkolinko)
+  
 
   
   



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

svn commit: r1657459 - /tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java

2015-02-04 Thread kkolinko

Author: kkolinko
Date: Thu Feb  5 02:57:13 2015
New Revision: 1657459

URL: http://svn.apache.org/r1657459
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57509
Improve length check in OutputBuffer.write() to account for 4 extra bytes that 
are needed to terminates the headers.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1657459&r1=1657458&r2=1657459&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Thu Feb  
5 02:57:13 2015
@@ -539,7 +539,9 @@ public class Http11OutputBuffer implemen
  * requested number of bytes.
  */
 private void checkLengthBeforeWrite(int length) {
-if (pos + length > headerBuffer.length) {
+// "+ 4": BZ 57509. Reserve space for CR/LF/COLON/SP characters that
+// are put directly into the buffer following this write operation.
+if (pos + length + 4 > headerBuffer.length) {
 throw new HeadersTooLargeException(
 sm.getString("iob.responseheadertoolarge.error"));
 }



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

[Bug 57509] maxHttpHeaderSize maybe case ArrayIndexOutOfBoundsException

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57509

--- Comment #4 from Konstantin Kolinko  ---
(In reply to yangkun from comment #3)

Your diagnosis is wrong. We are not talking about request here. It is response
(the status line of a HTTP response) that does not fit the buffer used by
status line and HTTP headers.

Generally, AbstractOutputBuffer.write(..) methods do perform a length check,
but numerous  headerBuffer[pos++] = (COLON|SP|CR|LF)  do not.

A simple fix may be to change AOB.checkLengthBeforeWrite(int length) method to
assume that the usable buffer length is less by 4 bytes. There are no more than
4 bytes added directly to the buffer after the write.

(4 = 2 bytes for CR-LF + 2 bytes for CR-LF added by AOB.endHeaders())


The result will be that the checkLengthBeforeWrite() method will throw a
org.apache.coyote.http11.HeadersTooLargeException  (a subclass of an
IllegalStateException), essentially resulting in the same server-side error.

-- 
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 57509] maxHttpHeaderSize maybe case ArrayIndexOutOfBoundsException

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57509

--- Comment #3 from yangkun  ---
  If check the maxHttpHeaderSize careful, the error may be subdivide the
following cases:

  1. the request uri more than maxHttpHeaderSize, it should be a 414-request
url too long
  2. the request entity more than maxHttpHeaderSize, it should be a 413-request
entity too large

  I think in this respect, Tomcat can be do better, :)

-- 
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: r1657442 - in /tomcat/trunk/java/org/apache/coyote/http11/upgrade: UpgradeProcessor.java UpgradeServletOutputStream.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 23:18:45 2015
New Revision: 1657442

URL: http://svn.apache.org/r1657442
Log:
Re-work multiple-write registration fix.

Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1657442&r1=1657441&r2=1657442&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java 
Wed Feb  4 23:18:45 2015
@@ -99,6 +99,7 @@ public class UpgradeProcessor implements
 public final SocketState upgradeDispatch(SocketStatus status) throws 
IOException {
 if (status == SocketStatus.OPEN_READ) {
 upgradeServletInputStream.onDataAvailable();
+upgradeServletOutputStream.checkWriteDispatch();
 } else if (status == SocketStatus.OPEN_WRITE) {
 upgradeServletOutputStream.onWritePossible();
 } else if (status == SocketStatus.STOP) {

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java?rev=1657442&r1=1657441&r2=1657442&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 Wed Feb  4 23:18:45 2015
@@ -34,9 +34,8 @@ public class UpgradeServletOutputStream
 protected final SocketWrapperBase socketWrapper;
 
 // Used to ensure that isReady() and onWritePossible() have a consistent
-// view of buffer and fireListener when determining if the listener should
-// fire.
-private final Object fireListenerLock = new Object();
+// view of buffer and registered.
+private final Object registeredLock = new Object();
 
 // Used to ensure that only one thread writes to the socket at a time and
 // that buffer is consistently updated with any unwritten data after the
@@ -52,8 +51,13 @@ public class UpgradeServletOutputStream
 // Start in blocking-mode
 private volatile WriteListener listener = null;
 
-// Guarded by fireListenerLock
-private volatile boolean fireListener = false;
+// Guarded by registeredLock
+private volatile boolean registered = false;
+
+// Use to track if a dispatch needs to be arranged to trigger the first 
call
+// to onWritePossible. If the socket gets registered for write while this 
is
+// set then this will be ignored.
+private volatile boolean writeDispatchRequired = false;
 
 private volatile ClassLoader applicationLoader = null;
 
@@ -72,20 +76,19 @@ public class UpgradeServletOutputStream
 
 // Make sure isReady() and onWritePossible() have a consistent view of
 // fireListener when determining if the listener should fire
-synchronized (fireListenerLock) {
+synchronized (registeredLock) {
 if (flushing) {
 // Since flushing is true the socket must already be registered
 // for write and multiple registrations will cause problems.
-fireListener = true;
+registered = true;
 return false;
-} else if (fireListener){
-// If the listener is configured to fire then the socket must
-// already be registered for write and multiple registrations
-// will cause problems.
+} else if (registered){
+// The socket is already registered for write and multiple
+// registrations will cause problems.
 return false;
 } else {
 boolean result = socketWrapper.isReadyForWrite();
-fireListener = !result;
+registered = !result;
 return result;
 }
 }
@@ -104,10 +107,8 @@ public class UpgradeServletOutputStream
 }
 // Container is responsible for first call to onWritePossible() but 
only
 // need to do this if setting the listener for the first time.
-synchronized (fireListenerLock) {
-fireListener = true;
-}
-socketWrapper.addDispatch(DispatchType.NON_BLOCKING_WRITE);
+writeDispatchRequired = true;
+
 this.listener = listener;
 this.applicationLoader = 
Thread.currentThread().getContextClassLoader();
 }
@@ -199,6 +200,9 @@ public class UpgradeServletOutputStream
 re

[Bug 57489] java.util.concurrent.ExecutionException: java.io.IOException: Key must be cancelled

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57489

--- Comment #7 from wodenc...@gmail.com ---
Hi Mark,

I am fine with building SVN, as long as I am doing it correctly :)

What I did today was I went into the directory where I had Tomcat trunk checked
out, I ran "svn update", then "ant", and finally copied the built libs into my
Tomcat 8 server for testing.

This is the correct process, right?

Let me know when to test again.

Thank you,

Chris Boyd

-- 
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 57489] java.util.concurrent.ExecutionException: java.io.IOException: Key must be cancelled

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57489

--- Comment #6 from Mark Thomas  ---
Thanks for the feedback.

The CI system has highlighted a couple of issues with these fixes in place.
I've just found what I think is another instance of multiple write
registrations in trunk.

My plan is to get the CI system building trunk cleanly, port the fixes back to
8.0.x and then get the CI system for 8.0.x running cleanly. I don't think there
is much benefit in you testing any more until the CI system says the build is
clean. I'll ping this ticket when that is done.

Do you need me to build 8.0.x for you to test or are you happy building from
svn?

-- 
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: r1657406 - /tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 21:35:47 2015
New Revision: 1657406

URL: http://svn.apache.org/r1657406
Log:
Fix another source of multiple write registrations.

Modified:

tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java?rev=1657406&r1=1657405&r2=1657406&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 (original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
 Wed Feb  4 21:35:47 2015
@@ -74,9 +74,15 @@ public class UpgradeServletOutputStream
 // fireListener when determining if the listener should fire
 synchronized (fireListenerLock) {
 if (flushing) {
-socketWrapper.registerWriteInterest();
+// Since flushing is true the socket must already be registered
+// for write and multiple registrations will cause problems.
 fireListener = true;
 return false;
+} else if (fireListener){
+// If the listener is configured to fire then the socket must
+// already be registered for write and multiple registrations
+// will cause problems.
+return false;
 } else {
 boolean result = socketWrapper.isReadyForWrite();
 fireListener = !result;
@@ -141,6 +147,9 @@ public class UpgradeServletOutputStream
 synchronized (writeLock) {
 if (updateFlushing) {
 flushing = socketWrapper.flush(block);
+if (flushing) {
+socketWrapper.registerWriteInterest();
+}
 } else {
 socketWrapper.flush(block);
 }
@@ -187,7 +196,6 @@ public class UpgradeServletOutputStream
 if (flushing) {
 flushInternal(false, true);
 if (flushing) {
-socketWrapper.registerWriteInterest();
 return;
 }
 } else {



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

[Bug 57536] New: configurable source ip

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57536

Bug ID: 57536
   Summary: configurable source ip
   Product: Tomcat Connectors
   Version: 1.2.40
  Hardware: PC
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: mod_jk
  Assignee: dev@tomcat.apache.org
  Reporter: aogb...@redhat.com

Could a feature be implemented to make the source ip configurable for mod_jk
connections?  For instance, if you have a secondary ip that httpd listens on,
the connections that mod_jk makes still come from the default primary ip.  It
may be preferable if they could come from the secondaryip.

-- 
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 57489] java.util.concurrent.ExecutionException: java.io.IOException: Key must be cancelled

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57489

--- Comment #5 from wodenc...@gmail.com ---
Hi Mark,

I have been testing with the latest Trunk of 8.0.19, and verified that is the
case with this line in the logs:

2015-02-04 15:06:02,796 CST INFO  [null] - Atmosphere is using async support:
org.atmosphere.container.JSR356AsyncSupport running under container: Apache
Tomcat/8.0.19-dev using javax.servlet/3.0 using javax.servlet/3.0 and
jsr356/WebSocket API

Unfortunately, after interacting with the application for a brief amount of
time, it hangs and we see the same exception:

2015-02-04 15:07:01,691 CST ERROR [null] - java.io.IOException: 
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessageBlock(WsRemoteEndpointImplBase.java:282)
at
org.apache.tomcat.websocket.WsSession.sendCloseMessage(WsSession.java:570)
at org.apache.tomcat.websocket.WsSession.doClose(WsSession.java:478)
at org.apache.tomcat.websocket.WsSession.close(WsSession.java:445)
at org.apache.tomcat.websocket.WsSession.close(WsSession.java:439)
at
org.atmosphere.container.version.JSR356WebSocket.close(JSR356WebSocket.java:104)
at org.atmosphere.websocket.WebSocket.close(WebSocket.java:264)
at org.atmosphere.cpr.AtmosphereResponse.close(AtmosphereResponse.java:836)
at
org.atmosphere.cpr.AtmosphereResourceImpl.cancel(AtmosphereResourceImpl.java:720)
at
org.atmosphere.cpr.AtmosphereResourceImpl.close(AtmosphereResourceImpl.java:785)
at
com.vaadin.server.communication.AtmospherePushConnection.disconnect(AtmospherePushConnection.java:294)
at
com.vaadin.server.communication.AtmospherePushConnection.connect(AtmospherePushConnection.java:232)
at com.vaadin.server.communication.PushHandler$2.run(PushHandler.java:135)
at
com.vaadin.server.communication.PushHandler.callWithUi(PushHandler.java:253)
at
com.vaadin.server.communication.PushHandler.access$200(PushHandler.java:56)
at
com.vaadin.server.communication.PushHandler$1.onRequest(PushHandler.java:74)
at
org.atmosphere.cpr.AsynchronousProcessor.action(AsynchronousProcessor.java:174)
at
org.atmosphere.cpr.AsynchronousProcessor.suspended(AsynchronousProcessor.java:95)
at
org.atmosphere.container.Servlet30CometSupport.service(Servlet30CometSupport.java:66)
at
org.atmosphere.cpr.AtmosphereFramework.doCometSupport(AtmosphereFramework.java:1802)
at
org.atmosphere.websocket.DefaultWebSocketProcessor.dispatch(DefaultWebSocketProcessor.java:432)
at
org.atmosphere.websocket.DefaultWebSocketProcessor.open(DefaultWebSocketProcessor.java:186)
at org.atmosphere.container.JSR356Endpoint.onOpen(JSR356Endpoint.java:160)
at
org.apache.tomcat.websocket.server.WsHttpUpgradeHandler.init(WsHttpUpgradeHandler.java:138)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:687)
at
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:223)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1558)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1515)
at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Unknown Source)
Caused by: java.util.concurrent.ExecutionException: java.io.IOException: Key
must be cancelled
at
org.apache.tomcat.websocket.FutureToSendHandler.get(FutureToSendHandler.java:102)
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessageBlock(WsRemoteEndpointImplBase.java:275)
... 31 more
Caused by: java.io.IOException: Key must be cancelled
at
org.apache.coyote.http11.upgrade.NioServletOutputStream.doWriteInternal(NioServletOutputStream.java:84)
at
org.apache.coyote.http11.upgrade.NioServletOutputStream.doWrite(NioServletOutputStream.java:61)
at
org.apache.coyote.http11.upgrade.AbstractServletOutputStream.writeInternal(AbstractServletOutputStream.java:162)
at
org.apache.coyote.http11.upgrade.AbstractServletOutputStream.write(AbstractServletOutputStream.java:129)
at
org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.onWritePossible(WsRemoteEndpointImplServer.java:99)
at
org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.doWrite(WsRemoteEndpointImplServer.java:81)
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.writeMessagePart(WsRemoteEndpointImplBase.java:450)
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessage(WsRemoteEndpointImplBase.java:338)
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.startMessageBlock(WsRemoteEndpointImplBase.java:270)
... 31 more
Caused by: java.util.concurrent.ExecutionException:
at
org.apache.tomcat.websocket.FutureToSendHandler.get(FutureToSendHandler.java:102)
at
org.apache.t

svn commit: r1657389 - /tomcat/tc7.0.x/trunk/STATUS.txt

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 19:41:41 2015
New Revision: 1657389

URL: http://svn.apache.org/r1657389
Log:
Record +1 from Filip via BZ

Modified:
tomcat/tc7.0.x/trunk/STATUS.txt

Modified: tomcat/tc7.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/STATUS.txt?rev=1657389&r1=1657388&r2=1657389&view=diff
==
--- tomcat/tc7.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc7.0.x/trunk/STATUS.txt Wed Feb  4 19:41:41 2015
@@ -36,7 +36,7 @@ PATCHES PROPOSED TO BACKPORT:
   believe there is any harm in this - the interface isn't really usable prior 
to
   this patch - but I'd prefer this change to be RTC.
   http://svn.apache.org/viewvc?rev=1430602&view=rev
-  +1: markt
+  +1: markt, fhanik
   -1:
 
 * Back-port r1437083 from trunk.



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

[Bug 57532] Session expire message sent to cluster nodes even with DeltaSession configuration not to

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57532

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #1 from Mark Thomas  ---
StandardManager should be irrelevant since it isn't used for clustered web
applications. The web application should be using DeltaManager.

On shutdown DeltaManager calls to two argument version of Session.expire() with
the second argument set depending on expireSessionsOnShutdown.

I'd like to see a stack trace that shows where the call to
DeltaSession.expire() is coming from.

-- 
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 57528] Random NPE when sending multipart content

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57528

--- Comment #3 from Mark Thomas  ---
Enable debug logging for org.apache.catalina.webresources.JarResource  and
org.apache.catalina.webresources.JarWarResource

That will tell you if there is an IOException causing the null.

-- 
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: r1657381 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 19:19:06 2015
New Revision: 1657381

URL: http://svn.apache.org/r1657381
Log:
Fix broken non-blocking unit test on Linux.

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

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  4 19:19:06 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1657381&r1=1657380&r2=1657381&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
Wed Feb  4 19:19:06 2015
@@ -1659,9 +1659,14 @@ public abstract class AbstractHttp11Proc
 
 if (outputBuffer.hasDataToWrite()) {
 if (outputBuffer.flushBuf

svn commit: r1657374 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11OutputBuffer.java Http11Processor.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 19:06:26 2015
New Revision: 1657374

URL: http://svn.apache.org/r1657374
Log:
Fix broken non-blocking unit test on Linux.

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

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java?rev=1657374&r1=1657373&r2=1657374&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11OutputBuffer.java Wed Feb  
4 19:06:26 2015
@@ -583,6 +583,11 @@ public class Http11OutputBuffer implemen
 }
 
 
+public void registerWriteInterest() {
+socketWrapper.registerWriteInterest();
+}
+
+
 // -- SocketOutputBuffer Inner 
Class
 
 /**

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1657374&r1=1657373&r2=1657374&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Feb  4 
19:06:26 2015
@@ -1737,9 +1737,14 @@ public class Http11Processor extends Abs
 
 if (outputBuffer.hasDataToWrite()) {
 if (outputBuffer.flushBuffer(false)) {
-// There is data to write but go via Response to
-// maintain a consistent view of non-blocking state
-response.checkRegisterForWrite();
+// The buffer wasn't fully flushed so re-register the
+// socket for write. Note this does not go via the
+// Response since the write registration state at
+// that level should remain unchanged. Once the buffer
+// has been emptied then the code below will call
+// Adaptor.asyncDispatch() which will enable the
+// Response to respond to this event.
+outputBuffer.registerWriteInterest();
 return SocketState.LONG;
 }
 }



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

svn commit: r1657370 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java webapps/docs/changelog.xml

2015-02-04 Thread fschumacher

Author: fschumacher
Date: Wed Feb  4 18:49:18 2015
New Revision: 1657370

URL: http://svn.apache.org/r1657370
Log:
Guard the digester with its own lock object. Otherwise two threads could create
two digester instances, lock on them and then use still the same one at the
same time. Remove the now unneeded volatile marker from digester. Issue
reported by Coverity Scan.

Merged r1656319 from /tomcat/trunk

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

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  4 18:49:18 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java?rev=1657370&r1=1657369&r2=1657370&view=diff
==
--- 
tomcat/tc8.0.x

Re: svn commit: r1657125 - /tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java

2015-02-04 Thread Mark Thomas

On 04/02/2015 13:08, Mark Thomas wrote:
> On 04/02/2015 12:55, Konstantin Kolinko wrote:



>> Recent Buildbot build are hanging and are killed after a timeout,
>> before they start running this test. (No recent test results for this
>> test exist at buildbot) Thus I do not see what the error is. Older
>> runs are OK,
> 
> I think that is related to my recent "avoid multiple write registration"
> changes. The issue occurs on Linux but not Windows or OSX. Debugging a
> failing unit test remotely is a pain so I am just finishing off setting
> up a Linux dev environment in a VM so I can debug this directly in Eclipse.

It is related to http://svn.apache.org/r1656655

There are cases when what used to be called an 'internal' write
registration are required. I'm looking into a better way of doing this
that avoids the multiple registrations.

Mark

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

svn commit: r1657360 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java

2015-02-04 Thread fschumacher

Author: fschumacher
Date: Wed Feb  4 18:14:57 2015
New Revision: 1657360

URL: http://svn.apache.org/r1657360
Log:
We know, that we only store String[] instances as
values in parameters-map, so no need to check for other types.

Merged r1656331 from /tomcat/trunk

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

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  4 18:14:57 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1657360&r1=1657359&r2=1657360&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
Wed Feb  4 18:14:57 2015
@@ -366,15 +366,11 @@ class ApplicationHttpRequest extends Htt
 
 parseParameters();

svn commit: r1657356 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/LocalStrings.properties java/org/apache/catalina/core/StandardHost.java webapps/docs/changelog.xml

2015-02-04 Thread fschumacher

Author: fschumacher
Date: Wed Feb  4 18:10:48 2015
New Revision: 1657356

URL: http://svn.apache.org/r1657356
Log:
Warn about a problematic appBase setting on StandardHost.

Merged r1656345 from /tomcat/trunk

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  4 18:10:48 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656350,1656590,1656648-1656650,1656657,1657041,1657054
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1657356&r1=1657355&r2=1657356&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties 
Wed Feb  4 18:10:48 2015
@@ -166,6 +166,7 @@ standardHost.invalidErrorReportValveClas

svn commit: r1657246 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 14:23:22 2015
New Revision: 1657246

URL: http://svn.apache.org/r1657246
Log:
Add check to avoid triggering an error if complete() is called during 
onWritePossible()

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

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1657246&r1=1657245&r2=1657246&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Feb  4 
14:23:22 2015
@@ -1730,7 +1730,8 @@ public class Http11Processor extends Abs
 @Override
 public SocketState asyncDispatch(SocketStatus status) {
 
-if (status == SocketStatus.OPEN_WRITE) {
+if (status == SocketStatus.OPEN_WRITE &&
+response.getWriteListener() != null) {
 try {
 asyncStateMachine.asyncOperation();
 



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

[Bug 57534] New: CorsFilter.SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES check shall ignore content-type parameters

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57534

Bug ID: 57534
   Summary: CorsFilter.SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES
check shall ignore content-type parameters
   Product: Tomcat 7
   Version: 7.0.59
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com

In CorsFilter of trunk

starting with line 1030:
[[[
/**
 * {@link Collection} of Simple HTTP request headers. Case in-sensitive.
 *
 * @see  http://www.w3.org/TR/cors/#terminology";
 *   >http://www.w3.org/TR/cors/#terminology
 */
public static final Collection
SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES =
new HashSet<>(Arrays.asList("application/x-www-form-urlencoded",
"multipart/form-data", "text/plain"));
]]]

starting with line 641:
[[[
} else if ("POST".equals(method)) {
String contentType = request.getContentType();
if (contentType != null) {
contentType = contentType.toLowerCase().trim();
if (SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES
.contains(contentType)) {
requestType = CORSRequestType.SIMPLE;
} else {
requestType = CORSRequestType.ACTUAL;
}
}
} else {
]]]

According to w3.org "Terminology" link above,
1) Javadoc for SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES is a bit off
(copy-pasted from another field). It is actually a collection of mime-type
values for Content-Type header so that this header is treated as a "simple
header"

2) The check using SIMPLE_HTTP_REQUEST_CONTENT_TYPE_VALUES shall ignore any
parameters that may be present in Content-Type header value.

E.g. "Content-Type: application/x-www-form-urlencoded; charset=UTF-8"  shall
match successfully.

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

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

Re: svn commit: r1657125 - /tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java

2015-02-04 Thread Mark Thomas

On 04/02/2015 12:55, Konstantin Kolinko wrote:
> 2015-02-04 14:45 GMT+03:00  :
>> Author: markt
>> Date: Wed Feb  4 11:45:39 2015
>> New Revision: 1657125
>>
>> URL: http://svn.apache.org/r1657125
>> Log:
>> Fix failing NIO2 unit test.
>> Response body may not be chunked so doing a line-by-line read will fail 
>> unless the client is explicitly told to use the content length.
>>
>> Modified:
>> tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
>>
>> Modified: 
>> tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java?rev=1657125&r1=1657124&r2=1657125&view=diff
>> ==
>> --- tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java 
>> (original)
>> +++ tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java 
>> Wed Feb  4 11:45:39 2015
>> @@ -41,6 +41,10 @@ public class TestInternalOutputBuffer ex
>>  ExpectationClient client = new ExpectationClient();
>>
>>  client.setPort(tomcat.getConnector().getLocalPort());
>> +// Expected content doesn't end with a CR-LF so if it isn't chunked 
>> make
>> +// sure the content length is used as reading it line-by-line will 
>> fail
>> +// since there is no "line".
>> +client.setUseContentLength(true);
>>
>>  client.connect();
> 
> 
> The change is OK but the explanation & comment is odd to me.
> 
> I think the reason for this change is that now we are not waiting for
> end-of-stream on a connection that is in keep-alive state (wasting our
> time waiting for a timeout), but use the response content length to
> stop reading earlier.

Yes, but...

The dropping of the connection was triggering an error that meant that
the reading of the line was failing. Not sure why this was an NIO2 only
issue. Since this looked like an issue with the test I didn't dig further.



> Recent Buildbot build are hanging and are killed after a timeout,
> before they start running this test. (No recent test results for this
> test exist at buildbot) Thus I do not see what the error is. Older
> runs are OK,

I think that is related to my recent "avoid multiple write registration"
changes. The issue occurs on Linux but not Windows or OSX. Debugging a
failing unit test remotely is a pain so I am just finishing off setting
up a Linux dev environment in a VM so I can debug this directly in Eclipse.

I hope to have a fix later today although with this type of I/O issue it
can take a while to track down exactly what is going wrong.

Mark

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

Re: svn commit: r1657125 - /tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java

2015-02-04 Thread Konstantin Kolinko

2015-02-04 14:45 GMT+03:00  :
> Author: markt
> Date: Wed Feb  4 11:45:39 2015
> New Revision: 1657125
>
> URL: http://svn.apache.org/r1657125
> Log:
> Fix failing NIO2 unit test.
> Response body may not be chunked so doing a line-by-line read will fail 
> unless the client is explicitly told to use the content length.
>
> Modified:
> tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
>
> Modified: 
> tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java?rev=1657125&r1=1657124&r2=1657125&view=diff
> ==
> --- tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java 
> (original)
> +++ tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java 
> Wed Feb  4 11:45:39 2015
> @@ -41,6 +41,10 @@ public class TestInternalOutputBuffer ex
>  ExpectationClient client = new ExpectationClient();
>
>  client.setPort(tomcat.getConnector().getLocalPort());
> +// Expected content doesn't end with a CR-LF so if it isn't chunked 
> make
> +// sure the content length is used as reading it line-by-line will 
> fail
> +// since there is no "line".
> +client.setUseContentLength(true);
>
>  client.connect();


The change is OK but the explanation & comment is odd to me.

I think the reason for this change is that now we are not waiting for
end-of-stream on a connection that is in keep-alive state (wasting our
time waiting for a timeout), but use the response content length to
stop reading earlier.

SimpleHttpClient.processBody(boolean)
[[[
// not using content length, so just read it line by line
String line = null;
while ((line = readLine()) != null) {
builder.append(line);
}
]]]


The readLine() loop in SimpleHttpClient.processBody()  terminates when
line = readLine() returns null. This happens on end-of-stream.
Whether the last character in the stream is a LF / CR-LF / CR does not
matter.

By the way,
BufferedReader.readLine() documentation says that the method returns
"A String containing the contents of the line, not including any
line-termination characters",  thus reconstructing the response body
by concatenating those lines as done by SimpleHttpClient will miss any
[CR]-LFs.


Recent Buildbot build are hanging and are killed after a timeout,
before they start running this test. (No recent test results for this
test exist at buildbot) Thus I do not see what the error is. Older
runs are OK,

http://ci.apache.org/projects/tomcat/tomcat9/logs/1656590/TEST-org.apache.coyote.http11.TestInternalOutputBuffer.NIO2.txt


Best regards,
Konstantin Kolinko

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

svn commit: r1657125 - /tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 11:45:39 2015
New Revision: 1657125

URL: http://svn.apache.org/r1657125
Log:
Fix failing NIO2 unit test.
Response body may not be chunked so doing a line-by-line read will fail unless 
the client is explicitly told to use the content length.

Modified:
tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java

Modified: 
tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java?rev=1657125&r1=1657124&r2=1657125&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestInternalOutputBuffer.java 
Wed Feb  4 11:45:39 2015
@@ -41,6 +41,10 @@ public class TestInternalOutputBuffer ex
 ExpectationClient client = new ExpectationClient();
 
 client.setPort(tomcat.getConnector().getLocalPort());
+// Expected content doesn't end with a CR-LF so if it isn't chunked 
make
+// sure the content length is used as reading it line-by-line will fail
+// since there is no "line".
+client.setUseContentLength(true);
 
 client.connect();
 



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

svn commit: r1657059 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/CorsFilter.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 09:46:33 2015
New Revision: 1657059

URL: http://svn.apache.org/r1657059
Log:
Deprecated unused code.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  4 09:46:33 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656350,1656590,1656648-1656650,1656657,1657041
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656350,1656590,1656648-1656650,1656657,1657041,1657054

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1657059&r1=1657058&r2=1657059&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java Wed 
Feb  4 09:46:33 2015
@@ -1050,7 +1050,10 @@ public final class CorsFilter implements
  *
  * @see  http://www.w3.org/TR/cors/#terminology";
  *   >http://www.w3.org/TR/cors/#terminology
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
  */
+@Deprecated
 public static f

svn commit: r1657055 - /tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 09:45:56 2015
New Revision: 1657055

URL: http://svn.apache.org/r1657055
Log:
Remove unused code.

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

Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1657055&r1=1657054&r2=1657055&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Wed Feb  4 
09:45:56 2015
@@ -1028,44 +1028,6 @@ public final class CorsFilter implements
 }
 
 /**
- * {@link Collection} of Simple HTTP methods. Case sensitive.
- *
- * @see  http://www.w3.org/TR/cors/#terminology";
- *   >http://www.w3.org/TR/cors/#terminology
- *
- * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
- */
-@Deprecated
-public static final Collection SIMPLE_HTTP_METHODS =
-new HashSet<>(Arrays.asList("GET", "POST", "HEAD"));
-
-/**
- * {@link Collection} of Simple HTTP request headers. Case in-sensitive.
- *
- * @see  http://www.w3.org/TR/cors/#terminology";
- *   >http://www.w3.org/TR/cors/#terminology
- *
- * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
- */
-@Deprecated
-public static final Collection SIMPLE_HTTP_REQUEST_HEADERS =
-new HashSet<>(Arrays.asList("Accept", "Accept-Language",
-"Content-Language"));
-
-/**
- * {@link Collection} of Simple HTTP request headers. Case in-sensitive.
- *
- * @see  http://www.w3.org/TR/cors/#terminology";
- *   >http://www.w3.org/TR/cors/#terminology
- *
- * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
- */
-@Deprecated
-public static final Collection SIMPLE_HTTP_RESPONSE_HEADERS =
-new HashSet<>(Arrays.asList("Cache-Control", "Content-Language",
-"Content-Type", "Expires", "Last-Modified", "Pragma"));
-
-/**
  * {@link Collection} of Simple HTTP request headers. Case in-sensitive.
  *
  * @see  http://www.w3.org/TR/cors/#terminology";



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

svn commit: r1657054 - /tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 09:45:13 2015
New Revision: 1657054

URL: http://svn.apache.org/r1657054
Log:
Deprecated unused code.

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

Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1657054&r1=1657053&r2=1657054&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Wed Feb  4 
09:45:13 2015
@@ -1032,7 +1032,10 @@ public final class CorsFilter implements
  *
  * @see  http://www.w3.org/TR/cors/#terminology";
  *   >http://www.w3.org/TR/cors/#terminology
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
  */
+@Deprecated
 public static final Collection SIMPLE_HTTP_METHODS =
 new HashSet<>(Arrays.asList("GET", "POST", "HEAD"));
 
@@ -1041,7 +1044,10 @@ public final class CorsFilter implements
  *
  * @see  http://www.w3.org/TR/cors/#terminology";
  *   >http://www.w3.org/TR/cors/#terminology
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
  */
+@Deprecated
 public static final Collection SIMPLE_HTTP_REQUEST_HEADERS =
 new HashSet<>(Arrays.asList("Accept", "Accept-Language",
 "Content-Language"));
@@ -1051,7 +1057,10 @@ public final class CorsFilter implements
  *
  * @see  http://www.w3.org/TR/cors/#terminology";
  *   >http://www.w3.org/TR/cors/#terminology
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9.0.x onwards.
  */
+@Deprecated
 public static final Collection SIMPLE_HTTP_RESPONSE_HEADERS =
 new HashSet<>(Arrays.asList("Cache-Control", "Content-Language",
 "Content-Type", "Expires", "Last-Modified", "Pragma"));



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

[Bug 57180] CorsFilter does not support PATCH method

2015-02-04 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=57180

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #6 from Mark Thomas  ---
Additional fix applied to trunk, 8.0.x (for 8.0.19 onwards) and 7.0.x (for
7.0.60 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: r1657053 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/CorsFilter.java webapps/docs/changelog.xml

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 09:40:43 2015
New Revision: 1657053

URL: http://svn.apache.org/r1657053
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57180
Additional fix. Do not attempt to enumerate valid HTTP methods.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  4 09:40:43 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953

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

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 09:38:34 2015
New Revision: 1657049

URL: http://svn.apache.org/r1657049
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57180
Additional fix. Do not attempt to enumerate valid HTTP methods.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  4 09:38:34 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656350,1656590,1656648-1656650,1656657
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656350,1656590,1656648-1656650,1656657,1657041

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1657049&r1=1657048&r2=1657049&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java Wed 
Feb  4 09:38:34 2015
@@ -338,8 +338,7 @@ public final class CorsFilter implements
 // Section 6.2.3
 String accessControlRequestMethod = request.getHeader(

svn commit: r1657045 - /tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 09:33:40 2015
New Revision: 1657045

URL: http://svn.apache.org/r1657045
Log:
Remove deprecated code

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

Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1657045&r1=1657044&r2=1657045&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Wed Feb  4 
09:33:40 2015
@@ -1028,15 +1028,6 @@ public final class CorsFilter implements
 }
 
 /**
- * {@link Collection} of HTTP methods. Case sensitive.
- * @deprecated Not used. Will be removed in Tomcat 9.0.x onwards.
- */
-@Deprecated
-public static final Collection HTTP_METHODS =
-new HashSet<>(Arrays.asList("OPTIONS", "GET", "HEAD", "POST", 
"PUT",
-"DELETE", "TRACE", "CONNECT"));
-
-/**
  * {@link Collection} of Simple HTTP methods. Case sensitive.
  *
  * @see  http://www.w3.org/TR/cors/#terminology";



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

svn commit: r1657041 - /tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 09:31:02 2015
New Revision: 1657041

URL: http://svn.apache.org/r1657041
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57180
Additional fix. Do not attempt to enumerate valid HTTP methods.

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

Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1657041&r1=1657040&r2=1657041&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Wed Feb  4 
09:31:02 2015
@@ -338,8 +338,7 @@ public final class CorsFilter implements
 // Section 6.2.3
 String accessControlRequestMethod = request.getHeader(
 CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
-if (accessControlRequestMethod == null ||
-!HTTP_METHODS.contains(accessControlRequestMethod.trim())) {
+if (accessControlRequestMethod == null) {
 handleInvalidCORS(request, response, filterChain);
 return;
 } else {
@@ -623,7 +622,7 @@ public final class CorsFilter implements
 requestType = CORSRequestType.INVALID_CORS;
 } else {
 String method = request.getMethod();
-if (method != null && HTTP_METHODS.contains(method)) {
+if (method != null) {
 if ("OPTIONS".equals(method)) {
 String accessControlRequestMethodHeader =
 request.getHeader(
@@ -1030,14 +1029,13 @@ public final class CorsFilter implements
 
 /**
  * {@link Collection} of HTTP methods. Case sensitive.
- *
- * @see  http://tools.ietf.org/html/rfc2616#section-5.1.1";
- *   >http://tools.ietf.org/html/rfc2616#section-5.1.1
- *
+ * @deprecated Not used. Will be removed in Tomcat 9.0.x onwards.
  */
+@Deprecated
 public static final Collection HTTP_METHODS =
 new HashSet<>(Arrays.asList("OPTIONS", "GET", "HEAD", "POST", 
"PUT",
 "DELETE", "TRACE", "CONNECT"));
+
 /**
  * {@link Collection} of Simple HTTP methods. Case sensitive.
  *



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

svn commit: r1657032 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2015-02-04 Thread violetagg

Author: violetagg
Date: Wed Feb  4 09:20:04 2015
New Revision: 1657032

URL: http://svn.apache.org/r1657032
Log:
Update the release date.

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

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1657032&r1=1657031&r2=1657032&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Feb  4 09:20:04 2015
@@ -90,7 +90,7 @@
 
   
 
-
+
   
 
   



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

svn commit: r7938 - /dev/tomcat/tomcat-7/v7.0.59/ /release/tomcat/tomcat-7/v7.0.59/

2015-02-04 Thread violetagg

Author: violetagg
Date: Wed Feb  4 09:15:47 2015
New Revision: 7938

Log:
Release Tomcat 7.0.59

Added:
release/tomcat/tomcat-7/v7.0.59/
  - copied from r7937, dev/tomcat/tomcat-7/v7.0.59/
Removed:
dev/tomcat/tomcat-7/v7.0.59/


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

Re: [VOTE][RESULT] Release Apache Tomcat 7.0.59

2015-02-04 Thread Violeta Georgieva

Hi,

2015-01-28 21:35 GMT+02:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 7.0.59 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.59/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1033/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_59/
>
> The proposed 7.0.59 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 7.0.59 Stable

The votes cast were

+1 (binding): remm, schultz, kkolinko, kfujino, violetagg
+1 (non-binding): fschumacher, Ognjen Blagojevic

No other votes were cast.

With five binding and two non-binding +1 votes this vote passes.

I'll upload the release to the mirrors and announce it once the mirrors are
OK.

> Regards,
> Violeta

Re: [VOTE] Release Apache Tomcat 7.0.59

2015-02-04 Thread Violeta Georgieva

2015-01-28 21:35 GMT+02:00 Violeta Georgieva :
>
> The proposed Apache Tomcat 7.0.59 release is now available for voting.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.59/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1033/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_59/
>
> The proposed 7.0.59 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 7.0.59 Stable

+1

> Regards,
> Violeta

svn commit: r1657029 - /tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java

2015-02-04 Thread markt

Author: markt
Date: Wed Feb  4 08:53:57 2015
New Revision: 1657029

URL: http://svn.apache.org/r1657029
Log:
Remove duplicate start call

Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java?rev=1657029&r1=1657028&r2=1657029&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java 
Wed Feb  4 08:53:57 2015
@@ -58,8 +58,6 @@ public class TestWsPingPongMessages exte
 WebSocketContainer wsContainer = ContainerProvider
 .getWebSocketContainer();
 
-tomcat.start();
-
 Session wsSession = wsContainer.connectToServer(
 TesterProgrammaticEndpoint.class, ClientEndpointConfig.Builder
 .create().build(), new URI("ws://localhost:"



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

39 matches

Mail list logo