Author: remm
Date: Tue Dec 16 00:38:02 2014
New Revision: 1645800
URL: http://svn.apache.org/r1645800
Log:
- Port websocket patches from Tomcat 8.
- Correctly implement headers case insensitivity.
- Allow optional use of user extensions.
- Allow using partial binary message handlers.
- Limit ping
Author: remm
Date: Tue Dec 16 00:39:29 2014
New Revision: 1645802
URL: http://svn.apache.org/r1645802
Log:
EOL property.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java
(props changed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat
Author: remm
Date: Tue Dec 16 00:40:16 2014
New Revision: 1645803
URL: http://svn.apache.org/r1645803
Log:
EOL property.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java
(props changed)
Propchange:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat
Author: remm
Date: Fri Feb 6 09:25:46 2015
New Revision: 1657764
URL: http://svn.apache.org/r1657764
Log:
Related to BZ57528: improve the algorithm to handle an exception or null return
value in getContent and avoid NPE or returning corrupted data.
Modified:
tomcat/trunk/java/org/apache
Author: remm
Date: Fri Feb 6 13:37:54 2015
New Revision: 1657806
URL: http://svn.apache.org/r1657806
Log:
Related to BZ57528: improve the algorithm to handle an exception or null return
value in getContent and avoid NPE or returning corrupted data.
Modified:
tomcat/tc8.0.x/trunk/java/org
Author: remm
Date: Thu Jan 15 15:41:02 2015
New Revision: 1652139
URL: http://svn.apache.org/r1652139
Log:
Fix SSL NIO2 tests (and a glitch with non blocking probably), no idea how this
happened since there's the same isEmpty for the write buffer.
Modified:
tomcat/trunk/java/org/apache
Author: remm
Date: Fri Jan 16 17:32:18 2015
New Revision: 1652468
URL: http://svn.apache.org/r1652468
Log:
- Initially after accept, do regular processing rather than awaitBytes, since
awaitBytes is not as light as it used to be and the bytes could be there. Maybe
it could be configurable
Author: remm
Date: Thu Jan 15 14:28:13 2015
New Revision: 1652108
URL: http://svn.apache.org/r1652108
Log:
Fix use of the semaphore (it seems equivalent to not using it). This fixes the
ab corruption I was experiencing.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net
Author: remm
Date: Tue Feb 10 18:04:17 2015
New Revision: 1658771
URL: http://svn.apache.org/r1658771
Log:
Drop unused throws clause.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/Processor.java
tomcat/trunk/java/org/apache
Author: remm
Date: Wed Feb 18 09:25:30 2015
New Revision: 1660582
URL: http://svn.apache.org/r1660582
Log:
- Add debugging of my own (sorry), on socket close.
- Try dropping the direct socket close from the upgraded streams (the sockets
seem to still be closed and the ws tests pass with NIO1+2
Author: remm
Date: Fri Feb 13 10:13:04 2015
New Revision: 1659491
URL: http://svn.apache.org/r1659491
Log:
Votes
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1659491r1=1659490r2
Author: remm
Date: Wed Jan 28 12:11:54 2015
New Revision: 1655272
URL: http://svn.apache.org/r1655272
Log:
Cleanup and simplify.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat
Author: remm
Date: Fri Jan 9 17:31:41 2015
New Revision: 1650606
URL: http://svn.apache.org/r1650606
Log:
Port fix from NIO2.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http
Author: remm
Date: Fri Jan 9 14:04:43 2015
New Revision: 1650535
URL: http://svn.apache.org/r1650535
Log:
Fix NPE that was swallowed.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http
Author: remm
Date: Fri Feb 13 15:18:49 2015
New Revision: 1659579
URL: http://svn.apache.org/r1659579
Log:
Votes
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1659579r1=1659578r2
Author: remm
Date: Thu Feb 12 16:10:31 2015
New Revision: 1659299
URL: http://svn.apache.org/r1659299
Log:
Guard against a NPE I see in the test CI logs.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11
Author: remm
Date: Wed Jan 7 16:42:26 2015
New Revision: 1650114
URL: http://svn.apache.org/r1650114
Log:
Add flush to send ack in the NIO2 connector, and enable the test which now
passes.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
tomcat/trunk
Author: remm
Date: Wed Jan 7 16:43:20 2015
New Revision: 1650115
URL: http://svn.apache.org/r1650115
Log:
Port: Add flush to send ack in the NIO2 connector.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
tomcat/tc8.0.x/trunk/webapps/docs
Author: remm
Date: Wed Mar 18 08:28:30 2015
New Revision: 1667468
URL: http://svn.apache.org/r1667468
Log:
Votes
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1667468r1=1667467r2
Author: remm
Date: Fri Mar 20 18:47:03 2015
New Revision: 1668116
URL: http://svn.apache.org/r1668116
Log:
57732: Add encoder/decoder module to support the HPACK specification (
http://http2.github.io/http2-spec/compression.html ).
Code contributed by Stuart Douglas, with some adaptations
Author: remm
Date: Wed Apr 1 14:24:04 2015
New Revision: 1670657
URL: http://svn.apache.org/r1670657
Log:
Add pom for storeconfig JAR and update version numbers.
Added:
tomcat/trunk/res/maven/tomcat-storeconfig.pom (with props)
Modified:
tomcat/trunk/res/maven/mvn-pub.xml
tomcat
Author: remm
Date: Wed Apr 1 14:45:19 2015
New Revision: 1670663
URL: http://svn.apache.org/r1670663
Log:
Add pom for storeconfig JAR.
Added:
tomcat/tc8.0.x/trunk/res/maven/tomcat-storeconfig.pom (with props)
Modified:
tomcat/tc8.0.x/trunk/res/maven/mvn-pub.xml
tomcat/tc8.0.x
Author: remm
Date: Wed Apr 1 14:47:46 2015
New Revision: 1670664
URL: http://svn.apache.org/r1670664
Log:
Revert version number (no need to change) and add svn property.
Modified:
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/res/maven/tomcat-storeconfig.pom (props changed
Author: remm
Date: Wed Apr 1 15:19:38 2015
New Revision: 1670669
URL: http://svn.apache.org/r1670669
Log:
Fix svn property (second attempt).
Modified:
tomcat/trunk/res/maven/tomcat-storeconfig.pom (props changed)
Propchange: tomcat/trunk/res/maven/tomcat-storeconfig.pom
Author: remm
Date: Wed Apr 1 15:29:06 2015
New Revision: 1670675
URL: http://svn.apache.org/r1670675
Log:
Since the NB test is one of those having the most issues, add a keepalive
variant I used to validate that the state is right after a request.
Modified:
tomcat/trunk/test/org/apache
Author: remm
Date: Sat Feb 28 09:18:57 2015
New Revision: 1662913
URL: http://svn.apache.org/r1662913
Log:
Fix JSTL related test (already in skip list).
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
Modified:
tomcat/tc7.0.x/trunk/test/org
Author: remm
Date: Sat Feb 28 09:18:35 2015
New Revision: 1662912
URL: http://svn.apache.org/r1662912
Log:
Fix JSTL related test and add to skip list.
Modified:
tomcat/tc8.0.x/trunk/conf/catalina.properties
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core
Author: remm
Date: Fri Feb 27 16:51:20 2015
New Revision: 1662748
URL: http://svn.apache.org/r1662748
Log:
Drop use of a complex recycling structure which saved allocation of a very
simple object at the likely cost of significant syncing. Will revert if it is
believed it actually had some sort
Author: remm
Date: Fri Feb 27 17:34:53 2015
New Revision: 1662759
URL: http://svn.apache.org/r1662759
Log:
Use SocketTimeoutException for the IO timeout (other instances).
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk
Author: remm
Date: Fri Feb 27 16:04:58 2015
New Revision: 1662734
URL: http://svn.apache.org/r1662734
Log:
Use SocketTimeoutException for the IO timeout.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Modified:
tomcat/trunk/java/org/apache/tomcat
Author: remm
Date: Fri Feb 27 15:53:48 2015
New Revision: 1662731
URL: http://svn.apache.org/r1662731
Log:
Restore NPE check as I got a NPE on:
org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer.onWritePossible(WsRemoteEndpointImplServer.java:125)
Modified:
tomcat/trunk/java/org
Author: remm
Date: Fri Feb 27 22:53:00 2015
New Revision: 1662843
URL: http://svn.apache.org/r1662843
Log:
Avoid NPE and fix JAR names.
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java
Modified:
tomcat/trunk/test/org/apache/catalina/core
Author: remm
Date: Wed Mar 4 16:07:26 2015
New Revision: 1664065
URL: http://svn.apache.org/r1664065
Log:
Create sometimes missing marker parent file (META-INF) that caused testsuite
failures.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java
Modified: tomcat
Author: remm
Date: Wed Mar 4 16:06:57 2015
New Revision: 1664064
URL: http://svn.apache.org/r1664064
Log:
Create sometimes missing marker parent file (META-INF) that caused testsuite
failures.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
Modified: tomcat/trunk
Author: remm
Date: Fri Feb 27 23:01:00 2015
New Revision: 1662850
URL: http://svn.apache.org/r1662850
Log:
Add the new JSTL API JAR to the skip JARs list.
Modified:
tomcat/trunk/conf/catalina.properties
Modified: tomcat/trunk/conf/catalina.properties
URL:
http://svn.apache.org/viewvc
Author: remm
Date: Mon Feb 23 12:09:10 2015
New Revision: 1661652
URL: http://svn.apache.org/r1661652
Log:
I don't really see a justification for doing a blocking write on close. The
upgrade app should be responsible of the state when it closes.
Modified:
tomcat/trunk/java/org/apache
Author: remm
Date: Wed Feb 25 14:34:47 2015
New Revision: 1662226
URL: http://svn.apache.org/r1662226
Log:
Add a hack to skip the initial write event since it is not really useful for
websockets. Looking at the CI history and the concurrency results for write,
the problems
Author: remm
Date: Tue Feb 24 10:11:21 2015
New Revision: 1661879
URL: http://svn.apache.org/r1661879
Log:
Use the write listener to decide between a blocking and a non blocking flush on
close.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
Author: remm
Date: Tue Feb 24 16:45:34 2015
New Revision: 1662018
URL: http://svn.apache.org/r1662018
Log:
Add NPE avoidance code from NIO2 when a socket is concurrently closed. Maybe it
could be logged for debugging (same in NIO2).
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net
Author: remm
Date: Tue Feb 24 16:44:05 2015
New Revision: 1662014
URL: http://svn.apache.org/r1662014
Log:
Catch ISE thrown by the closed IS for a rare but possibly legitimate scenario.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Modified
Author: remm
Date: Thu Feb 26 09:14:49 2015
New Revision: 1662396
URL: http://svn.apache.org/r1662396
Log:
Revert after CI test run.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket
Author: remm
Date: Thu Feb 26 00:18:20 2015
New Revision: 1662339
URL: http://svn.apache.org/r1662339
Log:
Revert 1662226 and try a CI run with a simple sync (will revert after that).
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified
Author: remm
Date: Thu Mar 26 15:28:55 2015
New Revision: 1669353
URL: http://svn.apache.org/r1669353
Log:
57761: Avoid using an empty path in the HTTP request when the websocket client
connects to a server root.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket
Author: remm
Date: Mon Apr 13 17:22:05 2015
New Revision: 1673242
URL: http://svn.apache.org/r1673242
Log:
- Cleanup and simplify NIO2 SSL code.
- Use the scatter/gather variants of SSL engine.
- Remove the loop for the gather write (since the non SSL code will not always
write everything
Author: remm
Date: Wed Apr 29 11:58:09 2015
New Revision: 1676722
URL: http://svn.apache.org/r1676722
Log:
Allow using SSLImplementationName configuration option with JSSE, since it
turns out SSLContext cannot be extended except by using JCE. In practical
terms, this allows using an alternate
Author: remm
Date: Thu May 7 13:54:58 2015
New Revision: 1678210
URL: http://svn.apache.org/r1678210
Log:
This was at some point an abstract class, so cleanup.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLContext.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net
Author: remm
Date: Sun May 3 17:35:31 2015
New Revision: 1677456
URL: http://svn.apache.org/r1677456
Log:
Port r1677450
Follow up on r1672297 which did fix the byte counter infinite loop but
corrupted data. Now handle with a recursion the situation where bytes remain in
the buffer but they do
Author: remm
Date: Sun May 3 16:47:26 2015
New Revision: 1677450
URL: http://svn.apache.org/r1677450
Log:
Follow up on r1672297 which did fix the byte counter infinite loop but
corrupted data. Now handle with a recursion the situation where bytes remain in
the buffer but they do not produce
Author: remm
Date: Thu Apr 16 13:37:05 2015
New Revision: 1674070
URL: http://svn.apache.org/r1674070
Log:
Since nobody seems to object for now, pull up NIO2 style API and add stubs for
APR and NIO.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk
Author: remm
Date: Fri Apr 17 14:37:31 2015
New Revision: 1674329
URL: http://svn.apache.org/r1674329
Log:
Add a very simple test that uses the new NIO 2 style IO calls.
Added:
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Added:
tomcat/trunk/test/org
Author: remm
Date: Fri Apr 17 14:40:22 2015
New Revision: 1674330
URL: http://svn.apache.org/r1674330
Log:
Cleanup
Modified:
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
(contents, props changed)
Modified:
tomcat/trunk/test/org/apache/coyote/http11
Author: remm
Date: Mon Apr 13 12:22:56 2015
New Revision: 1673169
URL: http://svn.apache.org/r1673169
Log:
Merge r1672628
57788: Avoid NPE if nothing is found after going through the whole class
hierarchy.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java
Author: remm
Date: Thu Apr 9 11:45:56 2015
New Revision: 1672297
URL: http://svn.apache.org/r1672297
Log:
Investigating 57799 I found some issues in the SSL impl:
- Possibly incomplete writes.
- After some errors (which shouldn't happen however), the pending flag could
still be set.
- A bad
Author: remm
Date: Tue Apr 14 20:58:24 2015
New Revision: 1673555
URL: http://svn.apache.org/r1673555
Log:
- Remove read/write pending flags since they don't really add anything, use a
lot of finally and are still slightly incorrect without additional finally (or
similar).
- Simplify, harmonize
Author: remm
Date: Tue Apr 7 16:43:58 2015
New Revision: 1671886
URL: http://svn.apache.org/r1671886
Log:
- Start experimenting with a state wrapper over NIO2 for scatter/gather
operations.
- This effectively bypasses the processor (the completion handler would get to
call it if it wants
Author: remm
Date: Tue Apr 7 20:07:36 2015
New Revision: 1671937
URL: http://svn.apache.org/r1671937
Log:
Javadoc improvement (fix warning, in particular).
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net
Author: remm
Date: Wed Apr 8 10:30:22 2015
New Revision: 1672057
URL: http://svn.apache.org/r1672057
Log:
Improve comments.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Modified: tomcat
Author: remm
Date: Wed Apr 8 09:53:45 2015
New Revision: 1672050
URL: http://svn.apache.org/r1672050
Log:
Add read, fixes and cleanups.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk
Author: remm
Date: Wed Apr 8 15:14:43 2015
New Revision: 1672100
URL: http://svn.apache.org/r1672100
Log:
- Add a vararg variant since it is probably nicer to use in a lot of cases (but
keep the NIO2 variant as well since it is more flexible for array reuse).
- Add a block mode since
Author: remm
Date: Wed May 20 07:29:38 2015
New Revision: 1680470
URL: http://svn.apache.org/r1680470
Log:
57936: Improve robustness of accept thread count for NIO2, since it has to be
1. Submitted by Oliver Kant.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net
Author: remm
Date: Wed May 20 07:24:41 2015
New Revision: 1680467
URL: http://svn.apache.org/r1680467
Log:
57936: Improve robustness of accept thread count for NIO2, since it has to be
1. Submitted by Oliver Kant.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: remm
Date: Wed Jun 3 09:39:06 2015
New Revision: 1683260
URL: http://svn.apache.org/r1683260
Log:
The JSSE support class contains only generic code that uses a standard SSL
session, so it is normally possible to reuse it. Make constructor public.
Modified:
tomcat/trunk/java/org
Author: remm
Date: Wed Jun 10 12:45:26 2015
New Revision: 1684663
URL: http://svn.apache.org/r1684663
Log:
Direct buffers need explicit cleanup to ensure complete reliability without
OOMs.
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/java
Author: remm
Date: Thu Jun 18 12:57:13 2015
New Revision: 1686209
URL: http://svn.apache.org/r1686209
Log:
Make sslImplementationName a special attribute (like protocol) so that it is
set before any other and can be used to validate.
Modified:
tomcat/trunk/java/org/apache/catalina/startup
Author: remm
Date: Fri Jun 26 08:45:09 2015
New Revision: 1687715
URL: http://svn.apache.org/r1687715
Log:
Port r1607309 and followups to add header configuration for the SSLValve.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
tomcat/tc7.0.x/trunk/webapps
Author: remm
Date: Wed Jun 24 12:34:07 2015
New Revision: 1687251
URL: http://svn.apache.org/r1687251
Log:
Port 58052: Clarify that some newer additions from the mod_rewrite
documentation are not supported in Tomcat.
Modified:
tomcat/tc8.0.x/trunk/webapps/docs/rewrite.xml
Modified: tomcat
Author: remm
Date: Wed Jun 24 12:33:24 2015
New Revision: 1687250
URL: http://svn.apache.org/r1687250
Log:
58052: Clarify that some newer additions from the mod_rewrite documentation are
not supported in Tomcat.
Modified:
tomcat/trunk/webapps/docs/rewrite.xml
Modified: tomcat/trunk/webapps
Author: remm
Date: Thu Jun 18 17:13:40 2015
New Revision: 1686279
URL: http://svn.apache.org/r1686279
Log:
Add SSL engine backed by OpenSSL, based on code from Nume de Montmollin and
derived from work done by Netty and Twitter.
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl
Added: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java?rev=1686279view=auto
==
---
Author: remm
Date: Thu Jun 18 17:15:51 2015
New Revision: 1686281
URL: http://svn.apache.org/r1686281
Log:
- When using the OpenSSL SSL engine, use the OpenSSL style configuration.
- Add some documentation that says the APR SSL configuration should be used
when using the OpenSSL
Author: remm
Date: Thu Jun 18 17:10:08 2015
New Revision: 1686276
URL: http://svn.apache.org/r1686276
Log:
- Add JNI API updates from Netty and Twitter. jni.socket.* is not useful to
Tomcat at the moment, but is a NIO2 style API on top of APR.
- Update recommended native library version to 1.2
Added: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java?rev=1686276view=auto
==
---
Author: remm
Date: Thu Jun 18 17:10:30 2015
New Revision: 1686277
URL: http://svn.apache.org/r1686277
Log:
Remove extra space.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL
Author: remm
Date: Fri Jun 19 07:12:34 2015
New Revision: 1686370
URL: http://svn.apache.org/r1686370
Log:
Votes
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1686370r1=1686369r2
Author: remm
Date: Fri Jun 19 15:16:51 2015
New Revision: 1686432
URL: http://svn.apache.org/r1686432
Log:
Remove unused shared formats.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http
Author: remm
Date: Fri Jun 19 16:37:49 2015
New Revision: 1686445
URL: http://svn.apache.org/r1686445
Log:
Cleanup.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
URL:
http
Author: remm
Date: Fri Jun 19 16:06:55 2015
New Revision: 1686442
URL: http://svn.apache.org/r1686442
Log:
Add IAE, although it cannot happen.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http
Author: remm
Date: Tue Jun 23 07:33:23 2015
New Revision: 1686979
URL: http://svn.apache.org/r1686979
Log:
Harmonize, null the SSL engine as well.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net
Author: remm
Date: Thu Jun 11 16:49:56 2015
New Revision: 1684943
URL: http://svn.apache.org/r1684943
Log:
Fix loop that occurred with NIO (and could cause issues with APR as well) with
a closed connection during keepalive.
Modified:
tomcat/trunk/java/org/apache/coyote/http11
Author: remm
Date: Thu Jun 11 17:04:37 2015
New Revision: 1684947
URL: http://svn.apache.org/r1684947
Log:
Read the algorithm, and look at the callers, AJP could be affected as well.
Elsewhere there are checks for -1. It is a bit risky to check only on -1
though, but it should work.
Modified
Author: remm
Date: Mon Jun 15 12:04:06 2015
New Revision: 1685562
URL: http://svn.apache.org/r1685562
Log:
Port fix for 57974: Key the open session map on the endpoint instance rather
than endpoint class.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
Author: remm
Date: Mon Jun 15 12:33:59 2015
New Revision: 1685570
URL: http://svn.apache.org/r1685570
Log:
Port r1685562 57974: Key the open session map on the endpoint instance rather
than endpoint class.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
Author: remm
Date: Sat Jun 13 07:22:09 2015
New Revision: 1685215
URL: http://svn.apache.org/r1685215
Log:
58004: Follow up for AJP buffering: the HTTP connector clears the structure (it
could probably remain full if there's an error in non blocking mode).
Modified:
tomcat/tc8.0.x/trunk
Author: remm
Date: Sat Jun 13 07:32:46 2015
New Revision: 1685216
URL: http://svn.apache.org/r1685216
Log:
Disable three WS tests for now: the assume session visibility on the client
that shouldn't exist.
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Author: remm
Date: Sat Jun 13 08:28:13 2015
New Revision: 1685219
URL: http://svn.apache.org/r1685219
Log:
57974: Fix associated tests by making the client tests share endpoint instances.
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Modified:
tomcat
Author: remm
Date: Fri Jun 12 15:43:16 2015
New Revision: 1685108
URL: http://svn.apache.org/r1685108
Log:
58004: AJP would buffer data even in blocking mode, leading to leaking. Should
not affect trunk from what I can see.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp
Author: remm
Date: Fri Jun 12 16:44:24 2015
New Revision: 1685129
URL: http://svn.apache.org/r1685129
Log:
57974: Key the open session map on the endpoint instance rather than endpoint
class. Will backport if it doesn't cause issues. [forgot unregister ...]
Modified:
tomcat/trunk/java/org
Author: remm
Date: Fri Jun 12 16:42:31 2015
New Revision: 1685128
URL: http://svn.apache.org/r1685128
Log:
57974: Key the open session map on the endpoint instance rather than endpoint
class. Will backport if it doesn't cause issues.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket
Author: remm
Date: Wed May 27 08:17:00 2015
New Revision: 1681930
URL: http://svn.apache.org/r1681930
Log:
Revert since the test is now running.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11
Author: remm
Date: Wed May 27 19:25:15 2015
New Revision: 1682102
URL: http://svn.apache.org/r1682102
Log:
Revert r1682087: likely unneeded.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: remm
Date: Wed May 27 17:45:31 2015
New Revision: 1682087
URL: http://svn.apache.org/r1682087
Log:
Avoid IO peeking with NIO2 to read the request line (introduced in r1681742),
as the processor and its buffer is no longer associated and may not be the one
processing the request
Author: remm
Date: Wed May 27 07:52:49 2015
New Revision: 1681925
URL: http://svn.apache.org/r1681925
Log:
Try reverting r1681794
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL
Author: remm
Date: Wed Jul 1 08:33:20 2015
New Revision: 1688586
URL: http://svn.apache.org/r1688586
Log:
Fix old cut paste names.
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig
Author: remm
Date: Wed Jul 1 08:21:17 2015
New Revision: 1688583
URL: http://svn.apache.org/r1688583
Log:
sslImplementationName is now handled in the connector create, so no need to do
it again (although it is harmless).
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Author: remm
Date: Wed Jul 1 08:22:46 2015
New Revision: 1688584
URL: http://svn.apache.org/r1688584
Log:
Unless there's a strong objection, using a fake default messes up storeconfig,
so change to 1.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Modified
Author: remm
Date: Wed Jul 1 08:40:12 2015
New Revision: 1688590
URL: http://svn.apache.org/r1688590
Log:
Add credential handler and upgrade protocol to the interface list.
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java
tomcat/trunk/java/org/apache
Author: remm
Date: Wed Jul 1 11:09:24 2015
New Revision: 1688618
URL: http://svn.apache.org/r1688618
Log:
Port r1688590 and r1688617 for CredentialHandler handling in storeconfig.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java
tomcat/tc8.0.x
Author: remm
Date: Wed Jul 1 11:05:11 2015
New Revision: 1688617
URL: http://svn.apache.org/r1688617
Log:
Fix children flag for CredentialHandler.
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig
Author: remm
Date: Mon Jul 6 13:53:07 2015
New Revision: 1689401
URL: http://svn.apache.org/r1689401
Log:
58103: closeSocket already does a countdown as long as the socket is not null,
so remove two instances of extra countdown.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net
Author: remm
Date: Mon Jul 6 13:59:24 2015
New Revision: 1689403
URL: http://svn.apache.org/r1689403
Log:
Revert r1689401: actually calling another closeSocket method, so no issue there.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java
801 - 900 of 4315 matches
Mail list logo
