Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly percent-encode URLs passed to libcurl

Browse Source 
URLs can't contain non-ASCII characters, so use wxURI to encode them
properly.
This commit is contained in:
Vadim Zeitlin
2021-01-11 02:31:51 +01:00
parent 252373e540
commit df13c2bd26
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/webrequest_curl.cpp
View File

@@ -22,6 +22,8 @@
#include "wx/utils.h" #include "wx/utils.h"
#endif #endif
#include "wx/uri.h"
// Define symbols that might be missing from older libcurl headers // Define symbols that might be missing from older libcurl headers
#ifndef CURL_AT_LEAST_VERSION #ifndef CURL_AT_LEAST_VERSION
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z) #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
@@ -156,8 +158,10 @@ wxWebRequestCURL::wxWebRequestCURL(wxWebSession & session,
curl_easy_setopt(m_handle, CURLOPT_ERRORBUFFER, m_errorBuffer); curl_easy_setopt(m_handle, CURLOPT_ERRORBUFFER, m_errorBuffer);
// Set this request in the private pointer // Set this request in the private pointer
curl_easy_setopt(m_handle, CURLOPT_PRIVATE, static_cast<void*>(this)); curl_easy_setopt(m_handle, CURLOPT_PRIVATE, static_cast<void*>(this));
// Set URL to handle // Set URL to handle: note that we must use wxURI to escape characters not
curl_easy_setopt(m_handle, CURLOPT_URL, static_cast<const char*>(url.mb_str())); // allowed in the URLs correctly (URL API is only available in libcurl
// since the relatively recent v7.62.0, so we don't want to rely on it).
curl_easy_setopt(m_handle, CURLOPT_URL, wxURI(url).BuildURI().utf8_str().data());
// Set callback functions // Set callback functions
curl_easy_setopt(m_handle, CURLOPT_WRITEFUNCTION, wxCURLWriteData); curl_easy_setopt(m_handle, CURLOPT_WRITEFUNCTION, wxCURLWriteData);
curl_easy_setopt(m_handle, CURLOPT_HEADERFUNCTION, wxCURLHeader); curl_easy_setopt(m_handle, CURLOPT_HEADERFUNCTION, wxCURLHeader);