mirror of
https://github.com/levinsv/pgadmin3.git
synced 2026-06-30 06:12:11 -06:00
Add option to disable certificate verification for the gitlab site.
Добавлена настройка "sslverify" в файл gitlab.json по умолчанию true. При установке в false сайт указаный в "url" не проверяется. Настройка добавлена для решения проблем с ошибками SSL certificate verification failed: certificate signer not trusted.
This commit is contained in:
parent
002f13956f
commit
da29ea6973
2 changed files with 7 additions and 8 deletions
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue