Re: WebSocket progress report

2012-02-07 Thread Mark Thomas
On 07/02/2012 02:23, Jonathan Drake wrote:
> I'm one the three CS grad students working on WebSocket (along with Petr
> Praus).
> 
> Just wanted to give an update on our progress, to let you know what we're
> working on:
> 
> Adding support for fragmented payloads:

Excellent. That and handling control frames are the biggest gaps right
now in my view.

> Right now, after receiving a frame, StreamInbound unmasks the payload in a
> WsInputStream and passes it up to the servlet via
> onBinaryData()/onTextData().
> To support fragmented frames, we add an intermediate step: after unmasking
> the payload, write it to a PipedOutputStream connected to a
> PipedInputStream that we pass upward via onBinaryData()/onTextData(). When
> the next fragment arrives, keep streaming data through the pipe.

Piped[Input|Output]Stream are intended to be used with a separate thread
at each end. There is currently only a single thread processing the
incoming data. How do you propose to provide the additional thread?

> This has the advantage of also allowing us to stream huge payloads (RFC
> 6455 allows for a 64-bit extended length field---way too much data to
> buffer in memory all at once).

That is certainly a requirement. However, there is more than one way to
meet that requirement.

> It has the minor disadvantage of breaking the ByteBuffer wrappers from
> MessageInbound (we can still use them for small payloads if we buffer
> fragments in memory)

Could you clarify what is broken in what circumstances please.
MessageInbound is expected to work providing that the message
(regardless of how many fragments it is spread across) is smaller than
the available buffer size.

My expectation is that the current echo example would continue to work
regardless of whether or not the messages were in a single fragment or
multiple fragments.

> I'm working on a patch that implements this...maybe a day or two.
> 
> I'd appreciate any early criticism you may have---otherwise I mainly just
> want to prevent duplicate work by explaining what we're up to.

Thanks for the heads up.

The approach you describe isn't the one I had in mind, but that is a
good thing. It provides an opportunity to compare and to take the best
from both.

It would be nice to have a test case or an example client for this.
Unless there is an easy way to force a browser to fragment packets, I
suspect a test case will be required.

Given that the implementation currently uses blocking IO, my approach
was going to be something along the lines of:
a) read the headers
b) call onBinaryData() / onTextData()
c) make the payload available via WsInputStream until the end of the
fragment
d) read the headers for the next fragment
e) make the payload available via WsInputStream until the end of the
fragment
f) repeat d) & e) until the final fragment is processed
g) return EOF on the next read

This would mean moving most of the code currently in
StreamInBound.onData() to WsInputStream

I haven't tried coding this up or anything so there is no guarantee it
would actually work.

Cheers,

Mark

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



DO NOT REPLY [Bug 52615] Daemon thread is terminated unexpectedly when uncaught exceptions is thrown from the other thread

2012-02-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52615

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID
 OS/Version||All

--- Comment #1 from Mark Thomas  2012-02-07 09:49:58 UTC ---
There is nothing in that stack trace that indicates any Tomcat code is
involved.

Tomcat does nothing when an application thread terminates or an uncaught
exception occurs on an application thread.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 52611] CometProcessor throws lots of NPEs

2012-02-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=52611

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #2 from Mark Thomas  2012-02-07 09:58:18 UTC ---
The NPE is triggered by the socket being null which only happens after the
output buffer has been recycled. That suggests the response object is being
retained and used after it is no longer valid.

The odds are that this is an application bug so please follow up on the users
mailing list. If the conclusion of that discussion is that there is a Tomcat
biug here then fell free to re-open this issue and provide the exact details of
how to reproduce it and/or a detailed explanation of why there is a bug.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1241406 - /tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java

2012-02-07 Thread markt
Author: markt
Date: Tue Feb  7 10:08:02 2012
New Revision: 1241406

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

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java   (props changed)

Propchange: tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java
--
svn:eol-style = native



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



svn commit: r1241407 - in /tomcat/trunk/java/org/apache/tomcat/jni: Poll.java SSL.java SSLExt.java

2012-02-07 Thread markt
Author: markt
Date: Tue Feb  7 10:09:44 2012
New Revision: 1241407

URL: http://svn.apache.org/viewvc?rev=1241407&view=rev
Log:
Remove whitespace from the ends of the lines

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/Poll.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Poll.java?rev=1241407&r1=1241406&r2=1241407&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Poll.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Poll.java Tue Feb  7 10:09:44 2012
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.jni;
 
 /** Poll
@@ -22,7 +21,6 @@ package org.apache.tomcat.jni;
  * @author Mladen Turk
  * @version $Id$
  */
-
 public class Poll {
 
 /**
@@ -155,16 +153,16 @@ public class Poll {
 public static native int pollset(long pollset, long [] descriptors);
 
 /**
- * Make poll() return. 
- * 
+ * Make poll() return.
+ *
  * @param pollset
  * @return
  */
 public static native int interrupt(long pollset);
-
+
 /**
  * Check if interrupt() is allowed.
- * 
+ *
  * @param pollset
  * @return
  */

Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1241407&r1=1241406&r2=1241407&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Tue Feb  7 10:09:44 2012
@@ -14,7 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.jni;
 
 /** SSL
@@ -22,7 +21,6 @@ package org.apache.tomcat.jni;
  * @author Mladen Turk
  * @version $Id$
  */
-
 public final class SSL {
 
 /*
@@ -137,7 +135,7 @@ public final class SSL {
 public static final int SSL_OP_NO_SSLv3 = 
0x0200;
 public static final int SSL_OP_NO_TLSv1 = 
0x0400;
 public static final int SSL_OP_NO_TICKET= 
0x4000;
-
+
 /* The next flag deliberately changes the ciphertest, this is a check
  * for the PKCS#1 attack */
 public static final int SSL_OP_PKCS1_CHECK_1= 
0x0800;

Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java?rev=1241407&r1=1241406&r2=1241407&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java Tue Feb  7 10:09:44 2012
@@ -14,43 +14,42 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-
 package org.apache.tomcat.jni;
 
-/** 
- * Support TLS extensions and extra methods. 
- * 
- * The methods are separated to make it easier for java code to 
- * support existing native library - it can check if this class can 
+/**
+ * Support TLS extensions and extra methods.
+ *
+ * The methods are separated to make it easier for java code to
+ * support existing native library - it can check if this class can
  * be loaded in order to use the exensions.
  *
  * @author Costin Manolache
  */
 public final class SSLExt {
 
-
+
 /**
- * Set advertised NPN protocol. 
+ * Set advertised NPN protocol.
  * This is only available for recent or patched openssl.
- * 
+ *
  * Example: "\x06spdy/2"
- * 
+ *
  * Works with TLS1, doesn't with SSL2/SSL3
- * 
- * Servers sends list in ServerHelo, client selects it and 
+ *
+ * Servers sends list in ServerHelo, client selects it and
  * sends it back after ChangeChipher
- * 
+ *
  * Not supported in 1.0.0, seems to be in 1.0.1 and after
  */
 public static native int setNPN(long tcctx, byte[] proto, int len);
-
+
 /**
- * Get other side's advertised protocols. 
+ * Get other side's advertised protocols.
  * Only works after handshake.
  */
 public static native int getNPN(long tcsock, byte[] proto);
 
-/** 
+/**
  * Enabling dump/debugging on the socket. Both raw and decrypted
  * packets will be logged.
  */
@@ -61,15 +60,15 @@ public final class SSLExt {
  * Must be saved, keyed by session ID.
  */
 public static native byte[] getSessionData(long tcsock);
-
+
 /**
  * Server: Set the session data for a socket

Re: svn commit: r1241356 - in /tomcat/trunk/java/org/apache/tomcat/jni: Poll.java SSL.java SSLExt.java

2012-02-07 Thread Mark Thomas
On 07/02/2012 06:13, cos...@apache.org wrote:
> Author: costin
> Date: Tue Feb  7 06:13:36 2012
> New Revision: 1241356
> 
> URL: http://svn.apache.org/viewvc?rev=1241356&view=rev
> Log:
> Add the new ssl methods from tomcat-native ( and few poll methods that seemed 
> to be missing ).
> 
> APR connector will not work unless you recompile tomcat-native ! ( it is ok 
> to use the current version of 
> openssl, but npn methods will not work )

Could you clarify this please. I just tested the latest trunk with my
existing Win x64 1.1.22 native dll and it all appears to be OK.

Mark

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



svn commit: r1241410 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/websocket/ coyote/ coyote/ajp/ coyote/http11/ coyote/http11/upgrade/ tomcat/util/net/

2012-02-07 Thread markt
Author: markt
Date: Tue Feb  7 10:18:10 2012
New Revision: 1241410

URL: http://svn.apache.org/viewvc?rev=1241410&view=rev
Log:
Use a lighter weight processor for upgrades.
Note that extending the Http11 processors is a hack that I think can be removed 
with some further refactoring of the connectors.

Added:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java
  - copied, changed from r1241407, 
tomcat/trunk/java/org/apache/coyote/http11/UpgradeInbound.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java
  - copied, changed from r1241407, 
tomcat/trunk/java/org/apache/coyote/http11/UpgradeOutbound.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Removed:
tomcat/trunk/java/org/apache/coyote/http11/UpgradeInbound.java
tomcat/trunk/java/org/apache/coyote/http11/UpgradeInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/UpgradeOutbound.java
tomcat/trunk/java/org/apache/coyote/http11/UpgradeOutputStream.java
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/trunk/java/org/apache/catalina/websocket/WsInputStream.java
tomcat/trunk/java/org/apache/catalina/websocket/WsOutbound.java
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1241410&r1=1241409&r2=1241410&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Feb  7 
10:18:10 2012
@@ -74,7 +74,7 @@ import org.apache.catalina.core.AsyncCon
 import org.apache.catalina.util.ParameterMap;
 import org.apache.catalina.util.StringParser;
 import org.apache.coyote.ActionCode;
-import org.apache.coyote.http11.UpgradeInbound;
+import org.apache.coyote.http11.upgrade.UpgradeInbound;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.ExceptionUtils;

Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=1241410&r1=1241409&r2=1241410&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java Tue Feb  
7 10:18:10 2012
@@ -41,7 +41,7 @@ import javax.servlet.http.Part;
 
 import org.apache.catalina.Globals;
 import org.apache.catalina.security.SecurityUtil;
-import org.apache.coyote.http11.UpgradeInbound;
+import org.apache.coyote.http11.upgrade.UpgradeInbound;
 import org.apache.tomcat.util.res.StringManager;
 
 /**

Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1241410&r1=1241409&r2=1241410&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamInbound.java Tue Feb  
7 10:18:10 2012
@@ -22,8 +22,9 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 
 import org.apache.catalina.util.Conversions;
-import org.apache.coyote.http11.UpgradeInbound;
-import org.apache.coyote.http11.UpgradeOutbound;
+import org.apache.coyote.http11.upgrade.Upgr

svn commit: r1241411 - in /tomcat/trunk/java/org/apache/coyote/http11/upgrade: UpgradeAprProcessor.java UpgradeBioProcessor.java UpgradeNioProcessor.java UpgradeProcessor.java

2012-02-07 Thread markt
Author: markt
Date: Tue Feb  7 10:19:51 2012
New Revision: 1241411

URL: http://svn.apache.org/viewvc?rev=1241411&view=rev
Log:
eol

Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java 
  (contents, props changed)
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java 
  (contents, props changed)
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java 
  (contents, props changed)
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java   
(contents, props changed)

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java?rev=1241411&r1=1241410&r2=1241411&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java 
Tue Feb  7 10:19:51 2012
@@ -1,123 +1,123 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.coyote.http11.upgrade;
-
-import java.io.IOException;
-
-import org.apache.coyote.http11.Http11AprProcessor;
-import org.apache.tomcat.jni.Socket;
-import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
-import org.apache.tomcat.util.net.SocketStatus;
-import org.apache.tomcat.util.net.SocketWrapper;
-
-/**
- * Implementation note: The need to extend Http11Processor could probably be
- * removed if the Processor interface was expanded to cover all of the methods
- * required by the AbstractProtocol. That would simplify the code and further
- * reduce the size of instances of this class.
- */
-public class UpgradeAprProcessor extends Http11AprProcessor
-implements UpgradeProcessor {
-
-long socket;
-
-public UpgradeAprProcessor(SocketWrapper wrapper,
-UpgradeInbound inbound) {
-this.socket = wrapper.getSocket().longValue();
-
-this.upgradeInbound = inbound;
-upgradeInbound.setUpgradeProcessor(this);
-upgradeInbound.setUpgradeOutbound(new UpgradeOutbound(this));
-// Remove the default - no need for it here
-this.compressableMimeTypes = null;
-}
-
-
-@Override
-public SocketState upgradeDispatch() throws IOException {
-return upgradeInbound.onData();
-}
-
-
-/*
- * Output methods
- */
-@Override
-public void flush() throws IOException {
-// NOOP
-}
-
-
-@Override
-public void write(int b) throws IOException {
-Socket.send(socket, new byte[] {(byte) b}, 0, 1);
-}
-
-
-/*
- * Input methods
- */
-@Override
-public int read() throws IOException {
-byte[] bytes = new byte[1];
-Socket.recv(socket, bytes, 0, 1);
-return bytes[0];
-}
-
-
-@Override
-public int read(byte[] bytes) throws IOException {
-return Socket.recv(socket, bytes, 0, bytes.length);
-}
-
-
-/*
- * None of the following NO-OP methods are strictly necessary - assuming 
the
- * there are no bugs in the connector code that cause upgraded connections
- * to be treated as Http11, Comet or Async. These NO-OP methods are here 
for
- * safety and to aid debugging during development.
- */
-
-@Override
-public SocketState event(SocketStatus status) throws IOException {
-// TODO Log an error
-return SocketState.CLOSED;
-}
-
-
-@Override
-public SocketState process(SocketWrapper socketWrapper)
-throws IOException {
-// TODO Log an error
-return SocketState.CLOSED;
-}
-
-
-@Override
-public SocketState asyncDispatch(SocketStatus status) {
-// TODO Log an error
-return SocketState.CLOSED;
-}
-
-
-@Override
-public SocketState asyncPostProcess() {
-// TODO Log an error
-return SocketState.CLOSED;
-}
-
-}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  t

Re: svn commit: r1241441 - in /tomcat/trunk/java/org/apache/coyote: ./ ajp/ http11/ http11/upgrade/

2012-02-07 Thread Konstantin Kolinko
2012/2/7  :
> Author: markt
> Date: Tue Feb  7 12:25:57 2012
> New Revision: 1241441
>
> URL: http://svn.apache.org/viewvc?rev=1241441&view=rev
> Log:
> Refactor the connectors to allow lighter weight UpgradeProcessor
> implementations that do not depend on Http11Processors.
> The main change is the expansion of the Processor interface and the
> use of that interface rather than the AbstractProcessor.
>
> Added:
>    tomcat/trunk/java/org/apache/coyote/http11/upgrade/Constants.java
>      - copied, changed from r1241411, 
> tomcat/trunk/java/org/apache/coyote/Processor.java
>    tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties

svn:eol-style

> Modified:
>    tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
>    tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
>    tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java
>    tomcat/trunk/java/org/apache/coyote/Processor.java
>    tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
>    tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
>    tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
>    tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
>    tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
>    tomcat/trunk/java/org/apache/coyote/ajp/LocalStrings.properties
>    tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
>    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
>    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
>    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
>    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
>    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
>    tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
>    tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
>    tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
>    tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
>    tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
>
(...)

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: r1241443 - /tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties

2012-02-07 Thread markt
Author: markt
Date: Tue Feb  7 12:29:27 2012
New Revision: 1241443

URL: http://svn.apache.org/viewvc?rev=1241443&view=rev
Log:
eol

Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties  
 (props changed)

Propchange: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
--
svn:eol-style = native



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



Re: svn commit: r1241356 - in /tomcat/trunk/java/org/apache/tomcat/jni: Poll.java SSL.java SSLExt.java

2012-02-07 Thread sebb
On 7 February 2012 06:13,   wrote:
> Author: costin
> Date: Tue Feb  7 06:13:36 2012
> New Revision: 1241356
>
> URL: http://svn.apache.org/viewvc?rev=1241356&view=rev
> Log:
> Add the new ssl methods from tomcat-native ( and few poll methods that seemed 
> to be missing ).
>
> APR connector will not work unless you recompile tomcat-native ! ( it is ok 
> to use the current version of
> openssl, but npn methods will not work )
>
>
> Added:
>    tomcat/trunk/java/org/apache/tomcat/jni/SSLExt.java

EOL?

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



Re: svn commit: r1241356 - in /tomcat/trunk/java/org/apache/tomcat/jni: Poll.java SSL.java SSLExt.java

2012-02-07 Thread Costin Manolache
On Tue, Feb 7, 2012 at 2:14 AM, Mark Thomas  wrote:

> On 07/02/2012 06:13, cos...@apache.org wrote:
> > Author: costin
> > Date: Tue Feb  7 06:13:36 2012
> > New Revision: 1241356
> >
> > URL: http://svn.apache.org/viewvc?rev=1241356&view=rev
> > Log:
> > Add the new ssl methods from tomcat-native ( and few poll methods that
> seemed to be missing ).
> >
> > APR connector will not work unless you recompile tomcat-native ! ( it is
> ok to use the current version of
> > openssl, but npn methods will not work )
>
> Could you clarify this please. I just tested the latest trunk with my
> existing Win x64 1.1.22 native dll and it all appears to be OK.
>

My mistake - the methods missing in Poll.java were added to native some
time back, so last version  would load ( I'm also not sure if it's ok to
load a class where not all native methods are defined ).




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