wip

Author: ndossche

ext/standard/http.c

@@ -103,7 +103,7 @@ PHPAPI void php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
 
 	if (!arg_sep) {
 		arg_sep = PG(arg_separator.output);
-		if (!arg_sep || !*arg_sep) {
+		if (!*arg_sep) {
 			arg_sep = "&";
 			arg_sep_len = 1;
 		} else {

ext/standard/url.c

@@ -540,15 +540,20 @@ static zend_always_inline size_t php_url_encode_impl(unsigned char *to, const ch
 }
 /* }}} */
 
-/* {{{ php_url_encode */
-PHPAPI zend_string *php_url_encode(char const *s, size_t len)
+static zend_always_inline zend_string *php_url_encode_helper(char const *s, size_t len, bool raw)
 {
 	zend_string *result = zend_string_safe_alloc(3, len, 0, false);
-	size_t length = php_url_encode_impl((unsigned char *) ZSTR_VAL(result), s, len, false);
+	size_t length = php_url_encode_impl((unsigned char *) ZSTR_VAL(result), s, len, raw);
 	ZSTR_VAL(result)[length] = '\0';
 	ZEND_ASSERT(!ZSTR_IS_INTERNED(result) && GC_REFCOUNT(result) == 1);
 	return zend_string_truncate(result, length, false);
 }
+
+/* {{{ php_url_encode */
+PHPAPI zend_string *php_url_encode(char const *s, size_t len)
+{
+	return php_url_encode_helper(s, len, false);
+}
 /* }}} */
 
 /* {{{ URL-encodes string */
@@ -614,11 +619,7 @@ PHPAPI size_t php_url_decode(char *str, size_t len)
 /* {{{ php_raw_url_encode */
 PHPAPI zend_string *php_raw_url_encode(char const *s, size_t len)
 {
-	zend_string *result = zend_string_safe_alloc(3, len, 0, false);
-	size_t length = php_url_encode_impl((unsigned char *) ZSTR_VAL(result), s, len, true);
-	ZSTR_VAL(result)[length] = '\0';
-	ZEND_ASSERT(!ZSTR_IS_INTERNED(result) && GC_REFCOUNT(result) == 1);
-	return zend_string_truncate(result, length, false);
+	return php_url_encode_helper(s, len, true);
 }
 /* }}} */