diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-04-29 10:35:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-10 21:54:56 +0200 |
| commit | 4a14f7503e36c1f0111ebba12969fdbab21cdc5f (patch) | |
| tree | 33cf8620a035d45667c9d351e0d6e83e2d0dd199 /cpp/src | |
| parent | IceSSL/configuration test fixes for Debian kFreeBSD (diff) | |
| download | ice-4a14f7503e36c1f0111ebba12969fdbab21cdc5f.tar.bz2 ice-4a14f7503e36c1f0111ebba12969fdbab21cdc5f.tar.xz ice-4a14f7503e36c1f0111ebba12969fdbab21cdc5f.zip | |
Fixed bug where connection to SOCKs/HTTP proxies could hang under certain conditions
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/StreamSocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp index e11d5709aa4..efbe6c301e5 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 _desc = fdToString(_fd, _proxy, _addr); |