You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2016/03/09 11:56:58 UTC
[1/2] thrift git commit: THRIFT-3729 Restrict rake version
Repository: thrift
Updated Branches:
refs/heads/master f2b7a4805 -> c87440832
THRIFT-3729 Restrict rake version
This closes #939
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/3fe8b0fe
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/3fe8b0fe
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/3fe8b0fe
Branch: refs/heads/master
Commit: 3fe8b0fe855ec9b7adfa3ac90e6c5dae53d79738
Parents: f2b7a48
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Wed Mar 9 19:55:48 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Wed Mar 9 19:55:48 2016 +0900
----------------------------------------------------------------------
lib/rb/thrift.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/3fe8b0fe/lib/rb/thrift.gemspec
----------------------------------------------------------------------
diff --git a/lib/rb/thrift.gemspec b/lib/rb/thrift.gemspec
index 43e5a7f..8e8deba 100644
--- a/lib/rb/thrift.gemspec
+++ b/lib/rb/thrift.gemspec
@@ -32,6 +32,6 @@ Gem::Specification.new do |s|
s.add_development_dependency "rack-test", "~> 0.6.2"
s.add_development_dependency "thin", "~> 1.5.0"
s.add_development_dependency "bundler"
- s.add_development_dependency 'rake'
+ s.add_development_dependency 'rake', '~> 10.5.0'
end
[2/2] thrift git commit: THRIFT-3722 Fix cert path in C++ cross tests
for non-Linux platform
Posted by ns...@apache.org.
THRIFT-3722 Fix cert path in C++ cross tests for non-Linux platform
This closes #933
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/c8744083
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/c8744083
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/c8744083
Branch: refs/heads/master
Commit: c8744083264b8a33c633d3fb6141cf064972a606
Parents: 3fe8b0f
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Wed Mar 9 19:55:56 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Wed Mar 9 19:55:56 2016 +0900
----------------------------------------------------------------------
test/cpp/src/TestClient.cpp | 9 +++------
test/cpp/src/TestServer.cpp | 12 +++++-------
2 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/c8744083/test/cpp/src/TestClient.cpp
----------------------------------------------------------------------
diff --git a/test/cpp/src/TestClient.cpp b/test/cpp/src/TestClient.cpp
index 6aebcdc..bbe1962 100644
--- a/test/cpp/src/TestClient.cpp
+++ b/test/cpp/src/TestClient.cpp
@@ -52,9 +52,6 @@ using namespace apache::thrift::transport;
using namespace thrift::test;
using namespace apache::thrift::async;
-// Length of argv[0] - Length of script dir
-#define EXECUTABLE_FILE_NAME_LENGTH 19
-
// Current time, microseconds since the epoch
uint64_t now() {
int64_t ret;
@@ -134,8 +131,8 @@ int main(int argc, char** argv) {
int ERR_EXCEPTIONS = 8;
int ERR_UNKNOWN = 64;
- string file_path = boost::filesystem::system_complete(argv[0]).string();
- string dir_path = file_path.substr(0, file_path.size() - EXECUTABLE_FILE_NAME_LENGTH);
+ string testDir = boost::filesystem::system_complete(argv[0]).parent_path().parent_path().parent_path().string();
+ string pemPath = testDir + "/keys/CA.pem";
#if _WIN32
transport::TWinsockSingleton::create();
#endif
@@ -232,7 +229,7 @@ int main(int argc, char** argv) {
if (ssl) {
factory = boost::shared_ptr<TSSLSocketFactory>(new TSSLSocketFactory());
factory->ciphers("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
- factory->loadTrustedCertificates((dir_path + "../keys/CA.pem").c_str());
+ factory->loadTrustedCertificates(pemPath.c_str());
factory->authenticate(true);
socket = factory->createSocket(host, port);
} else {
http://git-wip-us.apache.org/repos/asf/thrift/blob/c8744083/test/cpp/src/TestServer.cpp
----------------------------------------------------------------------
diff --git a/test/cpp/src/TestServer.cpp b/test/cpp/src/TestServer.cpp
index b3c292a..4808d89 100644
--- a/test/cpp/src/TestServer.cpp
+++ b/test/cpp/src/TestServer.cpp
@@ -65,9 +65,6 @@ using namespace apache::thrift::async;
using namespace thrift::test;
-// Length of argv[0] - Length of script dir
-#define EXECUTABLE_FILE_NAME_LENGTH 19
-
class TestHandler : public ThriftTestIf {
public:
TestHandler() {}
@@ -537,8 +534,9 @@ namespace po = boost::program_options;
int main(int argc, char** argv) {
- string file_path = boost::filesystem::system_complete(argv[0]).string();
- string dir_path = file_path.substr(0, file_path.size() - EXECUTABLE_FILE_NAME_LENGTH);
+ string testDir = boost::filesystem::system_complete(argv[0]).parent_path().parent_path().parent_path().string();
+ string certPath = testDir + "/keys/server.crt";
+ string keyPath = testDir + "/keys/server.key";
#if _WIN32
transport::TWinsockSingleton::create();
@@ -657,8 +655,8 @@ int main(int argc, char** argv) {
if (ssl) {
sslSocketFactory = boost::shared_ptr<TSSLSocketFactory>(new TSSLSocketFactory());
- sslSocketFactory->loadCertificate((dir_path + "../keys/server.crt").c_str());
- sslSocketFactory->loadPrivateKey((dir_path + "../keys/server.key").c_str());
+ sslSocketFactory->loadCertificate(certPath.c_str());
+ sslSocketFactory->loadPrivateKey(keyPath.c_str());
sslSocketFactory->ciphers("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
serverSocket = boost::shared_ptr<TServerSocket>(new TSSLServerSocket(port, sslSocketFactory));
} else {