You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jk...@apache.org on 2017/03/22 19:10:45 UTC
[1/2] thrift git commit: THRIFT-4129: Fix fd leak when failing to
dispatch new connections Client: C++
Repository: thrift
Updated Branches:
refs/heads/master e576b26e3 -> bf9b6970b
THRIFT-4129: Fix fd leak when failing to dispatch new connections
Client: C++
This closes #1210
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/75386db8
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/75386db8
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/75386db8
Branch: refs/heads/master
Commit: 75386db8c0eaba39ec5ad374cba27e039d2493e2
Parents: e576b26
Author: Changli Gao <xi...@gmail.com>
Authored: Fri Mar 10 13:15:37 2017 +0800
Committer: James E. King, III <jk...@apache.org>
Committed: Wed Mar 22 15:03:37 2017 -0400
----------------------------------------------------------------------
lib/cpp/src/thrift/server/TNonblockingServer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/75386db8/lib/cpp/src/thrift/server/TNonblockingServer.cpp
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/server/TNonblockingServer.cpp b/lib/cpp/src/thrift/server/TNonblockingServer.cpp
index d4418bd..2cf64f8 100644
--- a/lib/cpp/src/thrift/server/TNonblockingServer.cpp
+++ b/lib/cpp/src/thrift/server/TNonblockingServer.cpp
@@ -1004,7 +1004,7 @@ void TNonblockingServer::handleEvent(THRIFT_SOCKET fd, short which) {
} else {
if (!clientConnection->notifyIOThread()) {
GlobalOutput.perror("[ERROR] notifyIOThread failed on fresh connection, closing", errno);
- returnConnection(clientConnection);
+ clientConnection->close();
}
}
[2/2] thrift git commit: THRIFT-4081 broke compiling with gcc 4.6.x
Posted by jk...@apache.org.
THRIFT-4081 broke compiling with gcc 4.6.x
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/bf9b6970
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/bf9b6970
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/bf9b6970
Branch: refs/heads/master
Commit: bf9b6970ba3e30d0a13eca358335508b3f788e33
Parents: 75386db
Author: James E. King, III <jk...@apache.org>
Authored: Wed Mar 22 15:07:23 2017 -0400
Committer: James E. King, III <jk...@apache.org>
Committed: Wed Mar 22 15:07:23 2017 -0400
----------------------------------------------------------------------
build/cmake/DefinePlatformSpecifc.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/bf9b6970/build/cmake/DefinePlatformSpecifc.cmake
----------------------------------------------------------------------
diff --git a/build/cmake/DefinePlatformSpecifc.cmake b/build/cmake/DefinePlatformSpecifc.cmake
index 28cc5c2..e8479bc 100644
--- a/build/cmake/DefinePlatformSpecifc.cmake
+++ b/build/cmake/DefinePlatformSpecifc.cmake
@@ -100,7 +100,7 @@ endif()
# GCC and Clang: use C++11
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.6")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.6.4")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall -Wextra -pedantic")