diff --git a/CMakeLists.txt b/CMakeLists.txt index e8d3a18..ad304f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,14 +4,7 @@ project(pgAdmin3 VERSION 1.26.0) include_directories(. include) set(PRECOMP_FILE precomp.h) if(NOT CROSS_COMPILE) - include_directories(include/libssh2) - find_package(CURL) - if(NOT CURL_FOUND) - add_compile_definitions(NO_WXJSON_GIT) - else() - include_directories(${CURL_INCLUDE_DIR}) - link_libraries(${CURL_LIBRARIES}) - endif() + include_directories(include/libssh2) find_package(LibXslt REQUIRED) if(NOT LIBXSLT_FOUND) message(SEND_ERROR "Failed to find LibXslt") diff --git a/ctl/ctlGitPanel.cpp b/ctl/ctlGitPanel.cpp index 4162134..02f0044 100644 --- a/ctl/ctlGitPanel.cpp +++ b/ctl/ctlGitPanel.cpp @@ -351,6 +351,9 @@ wxMemoryBuffer ctlGitPanel::execRequestBinary(wxString url) { } wxString pt; cfg["private_token"].AsString(pt); + bool sslverify=true; + cfg["sslverify"].AsBool(sslverify); + if (!sslverify) request.DisablePeerVerify(); request.SetHeader("PRIVATE-TOKEN", pt); wxString rez; wxMemoryOutputStream output; @@ -427,6 +430,9 @@ wxJSONValue ctlGitPanel::execRequest(wxString url, wxJSONValue args,wxString cmd } wxString pt; cfg["private_token"].AsString(pt); + bool sslverify=true; + cfg["sslverify"].AsBool(sslverify); + if (!sslverify) request.DisablePeerVerify(); request.SetHeader("PRIVATE-TOKEN", pt); if (cmd != "GET") request.SetMethod(cmd); if (!args.IsNull()) {