Skip to content

Commit 1a522f7

Browse files
ndosschendossche
committed
Improve http_build_query() performance
1 parent 6adbe84 commit 1a522f7

File tree

4 files changed

+47
-52
lines changed

4 files changed

+47
-52
lines changed

‎ext/standard/http.c‎

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,17 @@ static void php_url_encode_scalar(zval *scalar, smart_str *form_str,
2727
const char *index_string, size_t index_string_len,
2828
const char *num_prefix, size_t num_prefix_len,
2929
const zend_string *key_prefix,
30-
const zend_string *arg_sep)
30+
const char *arg_sep, size_t arg_sep_len)
3131
{
3232
if (form_str->s) {
33-
smart_str_append(form_str, arg_sep);
33+
smart_str_appendl(form_str, arg_sep, arg_sep_len);
3434
}
3535
/* Simple key=value */
3636
if (key_prefix) {
3737
smart_str_append(form_str, key_prefix);
3838
}
3939
if (index_string) {
40-
zend_string *encoded_key;
41-
if (encoding_type == PHP_QUERY_RFC3986) {
42-
encoded_key = php_raw_url_encode(index_string, index_string_len);
43-
} else {
44-
encoded_key = php_url_encode(index_string, index_string_len);
45-
}
46-
smart_str_append(form_str, encoded_key);
47-
zend_string_free(encoded_key);
40+
php_url_encode_to_smart_str(form_str, index_string, index_string_len, encoding_type == PHP_QUERY_RFC3986);
4841
} else {
4942
/* Numeric key */
5043
if (num_prefix) {
@@ -59,31 +52,16 @@ static void php_url_encode_scalar(zval *scalar, smart_str *form_str,
5952

6053
try_again:
6154
switch (Z_TYPE_P(scalar)) {
62-
case IS_STRING: {
63-
zend_string *encoded_data;
64-
if (encoding_type == PHP_QUERY_RFC3986) {
65-
encoded_data = php_raw_url_encode(Z_STRVAL_P(scalar), Z_STRLEN_P(scalar));
66-
} else {
67-
encoded_data = php_url_encode(Z_STRVAL_P(scalar), Z_STRLEN_P(scalar));
68-
}
69-
smart_str_append(form_str, encoded_data);
70-
zend_string_free(encoded_data);
55+
case IS_STRING:
56+
php_url_encode_to_smart_str(form_str, Z_STRVAL_P(scalar), Z_STRLEN_P(scalar), encoding_type == PHP_QUERY_RFC3986);
7157
break;
72-
}
7358
case IS_LONG:
7459
smart_str_append_long(form_str, Z_LVAL_P(scalar));
7560
break;
7661
case IS_DOUBLE: {
77-
zend_string *encoded_data;
7862
zend_string *tmp = zend_double_to_str(Z_DVAL_P(scalar));
79-
if (encoding_type == PHP_QUERY_RFC3986) {
80-
encoded_data = php_raw_url_encode(ZSTR_VAL(tmp), ZSTR_LEN(tmp));
81-
} else {
82-
encoded_data = php_url_encode(ZSTR_VAL(tmp), ZSTR_LEN(tmp));
83-
}
84-
smart_str_append(form_str, encoded_data);
63+
php_url_encode_to_smart_str(form_str, ZSTR_VAL(tmp), ZSTR_LEN(tmp), encoding_type == PHP_QUERY_RFC3986);
8564
zend_string_free(tmp);
86-
zend_string_free(encoded_data);
8765
break;
8866
}
8967
case IS_FALSE:
@@ -109,7 +87,7 @@ static void php_url_encode_scalar(zval *scalar, smart_str *form_str,
10987
PHPAPI void php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
11088
const char *num_prefix, size_t num_prefix_len,
11189
const zend_string *key_prefix,
112-
zval *type, const zend_string *arg_sep, int enc_type)
90+
zval *type, const char *arg_sep, size_t arg_sep_len, int enc_type)
11391
{
11492
zend_string *key = NULL;
11593
const char *prop_name;
@@ -124,9 +102,12 @@ PHPAPI void php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
124102
}
125103

126104
if (!arg_sep) {
127-
arg_sep = zend_ini_str("arg_separator.output", strlen("arg_separator.output"), false);
128-
if (ZSTR_LEN(arg_sep) == 0) {
129-
arg_sep = ZSTR_CHAR('&');
105+
arg_sep = PG(arg_separator.output);
106+
if (!arg_sep || !*arg_sep) {
107+
arg_sep = "&";
108+
arg_sep_len = 1;
109+
} else {
110+
arg_sep_len = strlen(arg_sep);
130111
}
131112
}
132113

@@ -181,7 +162,7 @@ PHPAPI void php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
181162
} else {
182163
new_prefix = zend_string_concat2(ZSTR_VAL(encoded_key), ZSTR_LEN(encoded_key), "%5B", strlen("%5B"));
183164
}
184-
zend_string_release_ex(encoded_key, false);
165+
zend_string_efree(encoded_key);
185166
} else { /* is integer index */
186167
char *index_int_as_str;
187168
size_t index_int_as_str_len;
@@ -208,9 +189,9 @@ PHPAPI void php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
208189
efree(index_int_as_str);
209190
}
210191
GC_TRY_PROTECT_RECURSION(ht);
211-
php_url_encode_hash_ex(HASH_OF(zdata), formstr, NULL, 0, new_prefix, (Z_TYPE_P(zdata) == IS_OBJECT ? zdata : NULL), arg_sep, enc_type);
192+
php_url_encode_hash_ex(HASH_OF(zdata), formstr, NULL, 0, new_prefix, (Z_TYPE_P(zdata) == IS_OBJECT ? zdata : NULL), arg_sep, arg_sep_len, enc_type);
212193
GC_TRY_UNPROTECT_RECURSION(ht);
213-
zend_string_release_ex(new_prefix, false);
194+
zend_string_efree(new_prefix);
214195
} else if (Z_TYPE_P(zdata) == IS_NULL || Z_TYPE_P(zdata) == IS_RESOURCE) {
215196
/* Skip these types */
216197
continue;
@@ -220,7 +201,7 @@ PHPAPI void php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
220201
prop_name, prop_len,
221202
num_prefix, num_prefix_len,
222203
key_prefix,
223-
arg_sep);
204+
arg_sep, arg_sep_len);
224205
}
225206
} ZEND_HASH_FOREACH_END();
226207
}
@@ -233,15 +214,16 @@ PHP_FUNCTION(http_build_query)
233214
zval *formdata;
234215
char *prefix = NULL;
235216
size_t prefix_len = 0;
236-
zend_string *arg_sep = NULL;
217+
char *arg_sep = NULL;
218+
size_t arg_sep_len = 0;
237219
smart_str formstr = {0};
238220
zend_long enc_type = PHP_QUERY_RFC1738;
239221

240222
ZEND_PARSE_PARAMETERS_START(1, 4)
241223
Z_PARAM_ARRAY_OR_OBJECT(formdata)
242224
Z_PARAM_OPTIONAL
243225
Z_PARAM_STRING(prefix, prefix_len)
244-
Z_PARAM_STR_OR_NULL(arg_sep)
226+
Z_PARAM_STRING_OR_NULL(arg_sep, arg_sep_len)
245227
Z_PARAM_LONG(enc_type)
246228
ZEND_PARSE_PARAMETERS_END();
247229

@@ -250,7 +232,7 @@ PHP_FUNCTION(http_build_query)
250232
RETURN_THROWS();
251233
}
252234

253-
php_url_encode_hash_ex(HASH_OF(formdata), &formstr, prefix, prefix_len, /* key_prefix */ NULL, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL), arg_sep, (int)enc_type);
235+
php_url_encode_hash_ex(HASH_OF(formdata), &formstr, prefix, prefix_len, /* key_prefix */ NULL, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL), arg_sep, arg_sep_len, (int)enc_type);
254236

255237
RETURN_STR(smart_str_extract(&formstr));
256238
}

‎ext/standard/php_http.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
PHPAPI void php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
2525
const char *num_prefix, size_t num_prefix_len,
2626
const zend_string *key_prefix,
27-
zval *type, const zend_string *arg_sep, int enc_type);
27+
zval *type, const char *arg_sep, size_t arg_sep_len, int enc_type);
2828

2929
#endif

‎ext/standard/url.c‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include "url.h"
2929
#include "file.h"
30+
#include "Zend/zend_smart_str.h"
3031

3132
/* {{{ free_url */
3233
PHPAPI void php_url_free(php_url *theurl)
@@ -446,16 +447,13 @@ static int php_htoi(char *s)
446447

447448
static const unsigned char hexchars[] = "0123456789ABCDEF";
448449

449-
static zend_always_inline zend_string *php_url_encode_impl(const char *s, size_t len, bool raw) /* {{{ */ {
450+
static zend_always_inline size_t php_url_encode_impl(unsigned char *to, const char *s, size_t len, bool raw) /* {{{ */ {
450451
unsigned char c;
451-
unsigned char *to;
452452
unsigned char const *from, *end;
453-
zend_string *start;
453+
const unsigned char *to_init = to;
454454

455455
from = (unsigned char *)s;
456456
end = (unsigned char *)s + len;
457-
start = zend_string_safe_alloc(3, len, 0, 0);
458-
to = (unsigned char*)ZSTR_VAL(start);
459457

460458
#ifdef __SSE2__
461459
while (from + 16 < end) {
@@ -534,19 +532,19 @@ static zend_always_inline zend_string *php_url_encode_impl(const char *s, size_t
534532
*to++ = c;
535533
}
536534
}
537-
*to = '\0';
538535

539-
ZEND_ASSERT(!ZSTR_IS_INTERNED(start) && GC_REFCOUNT(start) == 1);
540-
start = zend_string_truncate(start, to - (unsigned char*)ZSTR_VAL(start), 0);
541-
542-
return start;
536+
return to - to_init;
543537
}
544538
/* }}} */
545539

546540
/* {{{ php_url_encode */
547541
PHPAPI zend_string *php_url_encode(char const *s, size_t len)
548542
{
549-
return php_url_encode_impl(s, len, 0);
543+
zend_string *result = zend_string_safe_alloc(3, len, 0, false);
544+
size_t length = php_url_encode_impl((unsigned char *) ZSTR_VAL(result), s, len, false);
545+
ZSTR_VAL(result)[length] = '\0';
546+
ZEND_ASSERT(!ZSTR_IS_INTERNED(result) && GC_REFCOUNT(result) == 1);
547+
return zend_string_truncate(result, length, false);
550548
}
551549
/* }}} */
552550

@@ -608,10 +606,24 @@ PHPAPI size_t php_url_decode(char *str, size_t len)
608606
/* {{{ php_raw_url_encode */
609607
PHPAPI zend_string *php_raw_url_encode(char const *s, size_t len)
610608
{
611-
return php_url_encode_impl(s, len, 1);
609+
zend_string *result = zend_string_safe_alloc(3, len, 0, false);
610+
size_t length = php_url_encode_impl((unsigned char *) ZSTR_VAL(result), s, len, true);
611+
ZSTR_VAL(result)[length] = '\0';
612+
ZEND_ASSERT(!ZSTR_IS_INTERNED(result) && GC_REFCOUNT(result) == 1);
613+
return zend_string_truncate(result, length, false);
612614
}
613615
/* }}} */
614616

617+
PHPAPI size_t php_url_encode_to_smart_str(smart_str *buf, char const *s, size_t len, bool raw)
618+
{
619+
size_t start_length = smart_str_get_len(buf);
620+
size_t extend = zend_safe_address_guarded(3, len, 0);
621+
char *dest = smart_str_extend(buf, extend);
622+
size_t length = php_url_encode_impl((unsigned char *) dest, s, len, raw);
623+
ZSTR_LEN(buf->s) = start_length + length;
624+
return length;
625+
}
626+
615627
/* {{{ URL-encodes string */
616628
PHP_FUNCTION(rawurlencode)
617629
{

‎ext/standard/url.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ PHPAPI size_t php_url_decode(char *str, size_t len); /* return value: length of
3636
PHPAPI size_t php_raw_url_decode(char *str, size_t len); /* return value: length of decoded string */
3737
PHPAPI zend_string *php_url_encode(char const *s, size_t len);
3838
PHPAPI zend_string *php_raw_url_encode(char const *s, size_t len);
39+
PHPAPI size_t php_url_encode_to_smart_str(smart_str *buf, char const *s, size_t len, bool raw);
3940

4041
#define PHP_URL_SCHEME 0
4142
#define PHP_URL_HOST 1

0 commit comments

Comments
 (0)