diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-05-27 20:21:02 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-06-06 12:25:26 +0200 |
| commit | f92077c67c4d9329aba9f2455987d3d8ca632d17 (patch) | |
| tree | d90aff63280048176b5fd561df2d6a06d63fe463 /cpp/src/Ice/Selector.h | |
| parent | Fixed bug 3225 - Uninitialized attribute (diff) | |
| download | ice-f92077c67c4d9329aba9f2455987d3d8ca632d17.tar.bz2 ice-f92077c67c4d9329aba9f2455987d3d8ca632d17.tar.xz ice-f92077c67c4d9329aba9f2455987d3d8ca632d17.zip | |
- Fixed bug where first proxy request could incorrectly be sent compress or uncompressed.
- Added support to run the tests with valgrind on Linux (tested with valgrind
3.3.0).
Diffstat (limited to 'cpp/src/Ice/Selector.h')
| -rw-r--r-- | cpp/src/Ice/Selector.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h index 5e2282810c0..a3cb7bc4cd4 100644 --- a/cpp/src/Ice/Selector.h +++ b/cpp/src/Ice/Selector.h @@ -66,6 +66,7 @@ public: throw ex; } epoll_event event; + memset(&event, 0, sizeof(epoll_event)); event.events = EPOLLIN; event.data.ptr = 0; if(epoll_ctl(_queueFd, EPOLL_CTL_ADD, _fdIntrRead, &event) != 0) @@ -146,6 +147,7 @@ public: #if defined(ICE_USE_EPOLL) || defined(ICE_USE_KQUEUE) #if defined(ICE_USE_EPOLL) epoll_event event; + memset(&event, 0, sizeof(epoll_event)); event.events = status == NeedRead ? EPOLLIN : EPOLLOUT; event.data.ptr = handler; if(epoll_ctl(_queueFd, EPOLL_CTL_ADD, handler->_fd, &event) != 0) @@ -187,6 +189,7 @@ public: assert(newStatus != Finished); #if defined(ICE_USE_EPOLL) epoll_event event; + memset(&event, 0, sizeof(epoll_event)); event.events = newStatus == NeedRead ? EPOLLIN : EPOLLOUT; event.data.ptr = handler; if(epoll_ctl(_queueFd, EPOLL_CTL_MOD, handler->_fd, &event) != 0) @@ -206,6 +209,7 @@ public: #if defined(ICE_USE_EPOLL) || defined(ICE_USE_KQUEUE) #if defined(ICE_USE_EPOLL) epoll_event event; + memset(&event, 0, sizeof(epoll_event)); event.events = 0; int rs = epoll_ctl(_queueFd, EPOLL_CTL_DEL, handler->_fd, &event); #else // ICE_USE_KQUEUE |