Skip to content

Revert "ARRISEOS-46608 WebKitBrowser: normalize compared urls" #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: lgi-thunder4.2-20230922
Choose a base branch
from
Open

Revert "ARRISEOS-46608 WebKitBrowser: normalize compared urls" #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions WebKitBrowser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
28 changes: 2 additions & 26 deletions WebKitBrowser/WebKitImplementation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include "videoOutputPortConfig.hpp"
#include "UtilsJsonRpc.h"
#include "UtilsIarm.h"
#include <curl/urlapi.h>

#ifdef WEBKIT_GLIB_API
#include <wpe/webkit.h>
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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("");
Expand Down