Updated Communicator.ice so that SSL related methods are only included when

    compiling the slice with -DICE_CPP. Updated project and Makefile
    accordingly. Continuing cleanup.

1 files changed, 4 insertions, 2 deletions

diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
index eb2b70af6cf..040d6cb0a27 100644
--- a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
+++ b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp
@@ -307,12 +307,14 @@ IceSSL::OpenSSL::ClientConnection::write(Buffer& buf, int timeout)
             }
 
             case SSL_ERROR_WANT_READ:
-            {
+            {

+                // TODO: Probably don't need this - remove later if not needed.

+
                 // If we get this error here, it HAS to be because
                 // the protocol wants to do something handshake related.
                 // In the case that we might actually get some application data,
                 // we will use the base SSL read method, using the _inBuffer.
-                readSSL(_inBuffer, timeout);
+                // readSSL(_inBuffer, timeout);
                 continue;
             }