1 files changed, 73 insertions, 21 deletions

diff --git a/core/ustring.cpp b/core/ustring.cpp
index 913c98e91e..b98e202175 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -1151,7 +1151,7 @@ String String::num_uint64(uint64_t p_num, int base, bool capitalize_hex) {
 	c[chars] = 0;
 	n = p_num;
 	do {
-		int mod = ABS(n % base);
+		int mod = n % base;
 		if (mod >= 10) {
 			char a = (capitalize_hex ? 'A' : 'a');
 			c[--chars] = a + (mod - 10);
@@ -1550,8 +1550,7 @@ String::String(const StrRange &p_range) {
 
 int String::hex_to_int(bool p_with_prefix) const {
 
-	int l = length();
-	if (p_with_prefix && l < 3)
+	if (p_with_prefix && length() < 3)
 		return 0;
 
 	const CharType *s = ptr();
@@ -1560,17 +1559,13 @@ int String::hex_to_int(bool p_with_prefix) const {
 
 	if (sign < 0) {
 		s++;
-		l--;
-		if (p_with_prefix && l < 2)
-			return 0;
 	}
 
 	if (p_with_prefix) {
 		if (s[0] != '0' || s[1] != 'x')
 			return 0;
 		s += 2;
-		l -= 2;
-	};
+	}
 
 	int hex = 0;
 
@@ -1596,8 +1591,7 @@ int String::hex_to_int(bool p_with_prefix) const {
 
 int64_t String::hex_to_int64(bool p_with_prefix) const {
 
-	int l = length();
-	if (p_with_prefix && l < 3)
+	if (p_with_prefix && length() < 3)
 		return 0;
 
 	const CharType *s = ptr();
@@ -1606,17 +1600,13 @@ int64_t String::hex_to_int64(bool p_with_prefix) const {
 
 	if (sign < 0) {
 		s++;
-		l--;
-		if (p_with_prefix && l < 2)
-			return 0;
 	}
 
 	if (p_with_prefix) {
 		if (s[0] != '0' || s[1] != 'x')
 			return 0;
 		s += 2;
-		l -= 2;
-	};
+	}
 
 	int64_t hex = 0;
 
@@ -3199,7 +3189,7 @@ String String::word_wrap(int p_chars_per_line) const {
 	return ret;
 }
 
-String String::percent_encode() const {
+String String::http_escape() const {
 	const CharString temp = utf8();
 	String res;
 	for (int i = 0; i < temp.length(); ++i) {
@@ -3223,7 +3213,7 @@ String String::percent_encode() const {
 	return res;
 }
 
-String String::percent_decode() const {
+String String::http_unescape() const {
 	String res;
 	for (int i = 0; i < length(); ++i) {
 		if (ord_at(i) == '%' && i + 2 < length()) {
@@ -3530,13 +3520,13 @@ bool String::is_valid_hex_number(bool p_with_prefix) const {
 
 	if (p_with_prefix) {
 
-		if (len < 2)
+		if (len < 3)
 			return false;
 		if (operator[](from) != '0' || operator[](from + 1) != 'x') {
 			return false;
-		};
+		}
 		from += 2;
-	};
+	}
 
 	for (int i = from; i < len; i++) {
 
@@ -3544,7 +3534,7 @@ bool String::is_valid_hex_number(bool p_with_prefix) const {
 		if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'))
 			continue;
 		return false;
-	};
+	}
 
 	return true;
 };
@@ -3779,6 +3769,68 @@ String String::plus_file(const String &p_file) const {
 	return *this + "/" + p_file;
 }
 
+String String::percent_encode() const {
+
+	CharString cs = utf8();
+	String encoded;
+	for (int i = 0; i < cs.length(); i++) {
+		uint8_t c = cs[i];
+		if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '-' || c == '_' || c == '~' || c == '.') {
+
+			char p[2] = { (char)c, 0 };
+			encoded += p;
+		} else {
+			char p[4] = { '%', 0, 0, 0 };
+			static const char hex[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+
+			p[1] = hex[c >> 4];
+			p[2] = hex[c & 0xF];
+			encoded += p;
+		}
+	}
+
+	return encoded;
+}
+String String::percent_decode() const {
+
+	CharString pe;
+
+	CharString cs = utf8();
+	for (int i = 0; i < cs.length(); i++) {
+
+		uint8_t c = cs[i];
+		if (c == '%' && i < length() - 2) {
+
+			uint8_t a = LOWERCASE(cs[i + 1]);
+			uint8_t b = LOWERCASE(cs[i + 2]);
+
+			c = 0;
+			if (a >= '0' && a <= '9')
+				c = (a - '0') << 4;
+			else if (a >= 'a' && a <= 'f')
+				c = (a - 'a' + 10) << 4;
+			else
+				continue;
+
+			uint8_t d = 0;
+
+			if (b >= '0' && b <= '9')
+				d = (b - '0');
+			else if (b >= 'a' && b <= 'f')
+				d = (b - 'a' + 10);
+			else
+				continue;
+			c += d;
+			i += 2;
+		}
+		pe.push_back(c);
+	}
+
+	pe.push_back(0);
+
+	return String::utf8(pe.ptr());
+}
+
 String String::get_basename() const {
 
 	int pos = find_last(".");