Re: WIAB broken in Firefox 10

[Ali Lown]

I have traced this problem down to the part of my SSL patch which
switches the Jetty servlets from NIO to BIO -> there appears to be an
incompatibility between the socket.io implementation and using BIO.

The swap sorted out the SSL handshake timout issue with the default
browser on ICS, but following the release of Chrome for Android (ICS
only) this isn't going to be a problem anymore (since it works fine in
Chrome for Android without this patch).

@Yuri: To get this fixed immediately, I suggest you ship the attached
patch which simply reverts the IO swapping.

From 82696f02752d6abe41e3998a132dd7796acc7245 Mon Sep 17 00:00:00 2001
From: Ali Lown <a...@lown.me.uk>
Date: Wed, 8 Feb 2012 18:02:47 +0000
Subject: [PATCH] Revert "Change to use BIO instead of NIO"

This reverts commit 3381c785138b45dbf7a985ff63b394c3312dd5bf.
---
 .../box/server/rpc/ServerRpcProvider.java          |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java
index adcc09e..82c3c8d 100755
--- a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java
+++ b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java
@@ -45,10 +45,10 @@ import com.glines.socketio.server.transport.XHRPollingTransport;
 import com.glines.socketio.server.transport.jetty.JettyWebSocketTransport;
 
 import org.eclipse.jetty.http.ssl.SslContextFactory;
-import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.server.session.HashSessionManager;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -354,11 +354,11 @@ public class ServerRpcProvider {
   public void startWebSocketServer(final Injector injector) {
     httpServer = new Server();
 
-    List<SocketConnector> connectors = getSocketConnectors(httpAddresses);
+    List<SelectChannelConnector> connectors = getSelectChannelConnectors(httpAddresses);
     if (connectors.isEmpty()) {
       LOG.severe("No valid http end point address provided!");
     }
-    for (SocketConnector connector : connectors) {
+    for (SelectChannelConnector connector : connectors) {
       httpServer.addConnector(connector);
     }
     final WebAppContext context = new WebAppContext();
@@ -510,12 +510,12 @@ public class ServerRpcProvider {
   }
 
   /**
-   * @return a list of {@link SocketConnector} each bound to a host:port
+   * @return a list of {@link SelectChannelConnector} each bound to a host:port
    *         pair form the list addresses.
    */
-  private List<SocketConnector> getSocketConnectors(
+  private List<SelectChannelConnector> getSelectChannelConnectors(
       InetSocketAddress[] httpAddresses) {
-    List<SocketConnector> list = Lists.newArrayList();
+    List<SelectChannelConnector> list = Lists.newArrayList();
     String[] excludeCiphers = {"SSL_RSA_EXPORT_WITH_RC4_40_MD5", "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
                                "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", "SSL_RSA_WITH_DES_CBC_SHA",
                                "SSL_DHE_RSA_WITH_DES_CBC_SHA", "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
@@ -535,11 +535,11 @@ public class ServerRpcProvider {
     }
 
     for (InetSocketAddress address : httpAddresses) {
-      SocketConnector connector;
+      SelectChannelConnector connector;
       if (sslEnabled) {
-        connector = new SslSocketConnector(sslContextFactory);
+        connector = new SslSelectChannelConnector(sslContextFactory);
       } else {
-        connector = new SocketConnector();
+        connector = new SelectChannelConnector();
       }
       connector.setHost(address.getAddress().getHostAddress());
       connector.setPort(address.getPort());
-- 
1.7.8.1