diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-04-29 10:35:53 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-04-29 10:35:53 +0200 |
| commit | 141deb91a7bf837dba79a36bc64ad1383398a419 (patch) | |
| tree | 01c5939b00e7db317da595dd339604cc47cc652d | |
| parent | Add encoding comments to python generated code (diff) | |
| download | ice-141deb91a7bf837dba79a36bc64ad1383398a419.tar.bz2 ice-141deb91a7bf837dba79a36bc64ad1383398a419.tar.xz ice-141deb91a7bf837dba79a36bc64ad1383398a419.zip | |
Fixed bug where connection to SOCKs/HTTP proxies could hang under certain conditions
| -rw-r--r-- | cpp/src/Ice/StreamSocket.cpp | 2 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/StreamSocket.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp index 2f5cb94021f..fa3761f5fa0 100644 --- a/cpp/src/Ice/StreamSocket.cpp +++ b/cpp/src/Ice/StreamSocket.cpp @@ -32,7 +32,7 @@ StreamSocket::StreamSocket(const ProtocolInstancePtr& instance, #ifndef ICE_USE_IOCP if(doConnect(_fd, _proxy ? _proxy->getAddress() : _addr, sourceAddr)) { - _state = StateConnected; + _state = _proxy ? StateProxyWrite : StateConnected; } #endif try diff --git a/java/src/Ice/src/main/java/IceInternal/StreamSocket.java b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java index c628d791d71..03cd265e0e6 100644 --- a/java/src/Ice/src/main/java/IceInternal/StreamSocket.java +++ b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java @@ -27,7 +27,7 @@ public class StreamSocket init(); if(Network.doConnect(_fd, _proxy != null ? _proxy.getAddress() : _addr, sourceAddr)) { - _state = StateConnected; + _state = _proxy != null ? StateProxyWrite : StateConnected; } } catch(Ice.LocalException ex) |