diff --git a/WebKitBrowser/CMakeLists.txt b/WebKitBrowser/CMakeLists.txt index 3bcb004bac..7eaf089405 100644 --- a/WebKitBrowser/CMakeLists.txt +++ b/WebKitBrowser/CMakeLists.txt @@ -187,7 +187,6 @@ find_package(CompileSettingsDebug CONFIG REQUIRED) find_package(WPEWebKit REQUIRED) find_package(WPEBackend REQUIRED) find_package(OpenSSL REQUIRED) -find_package(CURL REQUIRED) add_library(${MODULE_NAME} SHARED Module.cpp @@ -225,10 +224,7 @@ target_link_libraries(${PLUGIN_WEBKITBROWSER_IMPLEMENTATION} ${NAMESPACE}Definitions::${NAMESPACE}Definitions WPEBackend::WPEBackend WPEWebKit::WPEWebKit - OpenSSL::Crypto - ${CURL_LIBRARIES}) - -target_include_directories(${PLUGIN_WEBKITBROWSER_IMPLEMENTATION} PRIVATE ${CURL_INCLUDE_DIRS}) + OpenSSL::Crypto) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake") find_package(DS REQUIRED) diff --git a/WebKitBrowser/WebKitImplementation.cpp b/WebKitBrowser/WebKitImplementation.cpp index 3616e03b33..ae45f904e7 100644 --- a/WebKitBrowser/WebKitImplementation.cpp +++ b/WebKitBrowser/WebKitImplementation.cpp @@ -43,7 +43,6 @@ #include "videoOutputPortConfig.hpp" #include "UtilsJsonRpc.h" #include "UtilsIarm.h" -#include #ifdef WEBKIT_GLIB_API #include @@ -201,29 +200,6 @@ namespace return input.substr(0, end).append("/"); } - string normalizedUrl(const string& url) { - static thread_local CURLU *normalizedUrl = curl_url(); - string ret {url}; - char *normalizedCstr = nullptr; - CURLUcode ecode; - if (CURLUE_OK == (ecode = curl_url_set(normalizedUrl, CURLUPART_URL, url.c_str(), 0))) { - if (CURLUE_OK == (ecode = curl_url_get(normalizedUrl, CURLUPART_URL, &normalizedCstr, 0))) { - ret = normalizedCstr; - } - } - if (ecode != CURLUE_OK) { - SYSLOG_GLOBAL(Logging::Error, (_T("Error normalizing url '%s' : %d. Will return the input."), url.c_str(), ecode)); - } - if (normalizedCstr) { - curl_free(normalizedCstr); - normalizedCstr = nullptr; - } - return ret; - } - - bool normalizedUrlsEqual(const string& url1, const string& url2) { - return normalizedUrl(url1) == normalizedUrl(url2); - } } namespace WPEFramework { @@ -4596,8 +4572,8 @@ static GSourceFuncs _handlerIntervention = urlData_.loadResult.waitForFailedOrFinished, Core::ERROR_NONE == result ? "OK" : "NOK", URL.c_str()); - if (urlData_.loadResult.waitForFailedOrFinished && normalizedUrlsEqual(URL, urlData_.loadResult.loadUrl)) { - TRACE_L1("Notyfying with result = %s, url: %s\n", Core::ERROR_NONE == result ? "OK" : "NOK", URL.c_str()); + if (urlData_.loadResult.waitForFailedOrFinished && URL.find(urlData_.loadResult.loadUrl) != string::npos) { + TRACE_L1("Notyfying with result suresh = %s, url: %s\n", Core::ERROR_NONE == result ? "OK" : "NOK", URL.c_str()); urlData_.result = result; urlData_.loadResult.waitForFailedOrFinished = false; urlData_.loadResult.loadUrl = string("");