mirror/libkiwix
1
0
Fork 0
mirror of https://github.com/kiwix/libkiwix.git synced 2026-02-26 19:26:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Dropped the 2nd param of urlEncode()

Browse Source 
`urlEncode(str)` is now equivalent to the previous `urlEncode(str, true)`.
This commit is contained in:
Veloman Yunkan
2023-01-25 19:04:52 +04:00
parent 3bf8211b70
commit 471c5b89f4
9 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/stringTools.cpp
View File

@@ -164,9 +164,6 @@ std::string kiwix::encodeDiples(const std::string& str)
namespace
{
/* urlEncode() based on javascript encodeURI() &
encodeURIComponent(). Mostly code from rstudio/httpuv (GPLv3) */
bool isReservedUrlChar(char c)
{
switch (c) {
@@ -246,7 +243,7 @@ int hexToInt(char c) {
} // unnamed namespace
std::string kiwix::urlEncode(const std::string& value, bool encodeReserved)
std::string kiwix::urlEncode(const std::string& value)
{
std::ostringstream os;
os << std::hex << std::uppercase;
@@ -254,7 +251,7 @@ std::string kiwix::urlEncode(const std::string& value, bool encodeReserved)
it != value.end();
it++) {
if (!needsEscape(*it, encodeReserved)) {
if (!needsEscape(*it, true)) {
os << *it;
} else {
const unsigned int charVal = static_cast<unsigned char>(*it);