mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Small fix for URL encoding.

Browse source
This commit is contained in:
Julian Storer 2010-03-24 22:14:56 +00:00
parent 1458cd4eb3
commit e7326dbbaf
2 changed files with 20 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

28
juce_amalgamated.cpp
View file

@ -8243,30 +8243,22 @@ const StringPairArray& URL::getMimeTypesOfUploadFiles() const
const String URL::removeEscapeChars (const String& s)
{
const int len = s.length();
HeapBlock <char> resultUTF8 (len * 4);
char* r = resultUTF8;
String result (s.replaceCharacter ('+', ' '));
int nextPercent = 0;
for (int i = 0; i < len; ++i)
for (;;)
{
char c = (char) s[i];
if (c == 0)
nextPercent = result.indexOfChar (nextPercent, '%');
if (nextPercent < 0)
break;
if (c == '+')
{
c = ' ';
}
else if (c == '%')
{
c = (char) s.substring (i + 1, i + 3).getHexValue32();
i += 2;
}
*r++ = c;
juce_wchar replacementChar = result.substring (nextPercent + 1, nextPercent + 3).getHexValue32();
result = result.replaceSection (nextPercent, 3, String::charToString (replacementChar));
++nextPercent;
}
return String::fromUTF8 (resultUTF8);
return result;
}
const String URL::addEscapeChars (const String& s, const bool isParameter)

28
src/io/network/juce_URL.cpp
View file

@ -537,30 +537,22 @@ const StringPairArray& URL::getMimeTypesOfUploadFiles() const
//==============================================================================
const String URL::removeEscapeChars (const String& s)
{
const int len = s.length();
HeapBlock <char> resultUTF8 (len * 4);
char* r = resultUTF8;
String result (s.replaceCharacter ('+', ' '));
int nextPercent = 0;
for (int i = 0; i < len; ++i)
for (;;)
{
char c = (char) s[i];
if (c == 0)
nextPercent = result.indexOfChar (nextPercent, '%');
if (nextPercent < 0)
break;
if (c == '+')
{
c = ' ';
}
else if (c == '%')
{
c = (char) s.substring (i + 1, i + 3).getHexValue32();
i += 2;
}
*r++ = c;
juce_wchar replacementChar = result.substring (nextPercent + 1, nextPercent + 3).getHexValue32();
result = result.replaceSection (nextPercent, 3, String::charToString (replacementChar));
++nextPercent;
}
return String::fromUTF8 (resultUTF8);
return result;
}
const String URL::addEscapeChars (const String& s, const bool isParameter)