You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2014/10/29 18:44:18 UTC

git commit: THRIFT-2792 Wrong option level for setsockopt(...TCP_DEFER_ACCEPT) Client: C++ Patch: Sven-Ola

Repository: thrift
Updated Branches:
  refs/heads/master 902b7af4c -> fdd8d13bd


THRIFT-2792 Wrong option level for setsockopt(...TCP_DEFER_ACCEPT)
Client: C++
Patch: Sven-Ola <sv...@numberfour.eu>


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/fdd8d13b
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/fdd8d13b
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/fdd8d13b

Branch: refs/heads/master
Commit: fdd8d13bd4e82c9e3e73f72e5556f5921e351fa0
Parents: 902b7af
Author: Jens Geyer <je...@apache.org>
Authored: Wed Oct 29 19:42:26 2014 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Wed Oct 29 19:42:26 2014 +0200

----------------------------------------------------------------------
 lib/cpp/src/thrift/transport/TServerSocket.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/fdd8d13b/lib/cpp/src/thrift/transport/TServerSocket.cpp
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/transport/TServerSocket.cpp b/lib/cpp/src/thrift/transport/TServerSocket.cpp
index 811076f..fe9f7e8 100755
--- a/lib/cpp/src/thrift/transport/TServerSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TServerSocket.cpp
@@ -248,7 +248,7 @@ void TServerSocket::listen() {
 
   // Defer accept
   #ifdef TCP_DEFER_ACCEPT
-  if (-1 == setsockopt(serverSocket_, SOL_SOCKET, TCP_DEFER_ACCEPT,
+  if (-1 == setsockopt(serverSocket_, IPPROTO_TCP, TCP_DEFER_ACCEPT,
                        &one, sizeof(one))) {
     int errno_copy = THRIFT_GET_SOCKET_ERROR;
     GlobalOutput.perror("TServerSocket::listen() setsockopt() TCP_DEFER_ACCEPT ", errno_copy);