summaryrefslogtreecommitdiff
path: root/ext/standard/url.c
diff options
context:
space:
mode:
authorAndrea Faulds <ajf@ajf.me>2016-09-11 22:46:20 +0100
committerAndrea Faulds <ajf@ajf.me>2016-09-11 22:46:20 +0100
commitfc5497cb923df43e20deff3e03d1bfa50acc0570 (patch)
tree825752e4f4a4f73a7bf3da0346f6c8ebf326eef2 /ext/standard/url.c
parentc90f7f66eadb8bc5577c39b9b4d6a4fe2d60f78e (diff)
parentd690014bf35507ccb7a1150a27504d2f87848842 (diff)
downloadphp-git-fc5497cb923df43e20deff3e03d1bfa50acc0570.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/standard/url.c')
-rw-r--r--ext/standard/url.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/ext/standard/url.c b/ext/standard/url.c
index a33ff9ae82..6ca340a96a 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -551,15 +551,9 @@ PHP_FUNCTION(urlencode)
{
zend_string *in_str;
-#ifndef FAST_ZPP
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &in_str) == FAILURE) {
- return;
- }
-#else
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_STR(in_str)
ZEND_PARSE_PARAMETERS_END();
-#endif
RETURN_STR(php_url_encode(ZSTR_VAL(in_str), ZSTR_LEN(in_str)));
}
@@ -571,15 +565,9 @@ PHP_FUNCTION(urldecode)
{
zend_string *in_str, *out_str;
-#ifndef FAST_ZPP
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &in_str) == FAILURE) {
- return;
- }
-#else
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_STR(in_str)
ZEND_PARSE_PARAMETERS_END();
-#endif
out_str = zend_string_init(ZSTR_VAL(in_str), ZSTR_LEN(in_str), 0);
ZSTR_LEN(out_str) = php_url_decode(ZSTR_VAL(out_str), ZSTR_LEN(out_str));
@@ -658,15 +646,9 @@ PHP_FUNCTION(rawurlencode)
{
zend_string *in_str;
-#ifndef FAST_ZPP
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &in_str) == FAILURE) {
- return;
- }
-#else
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_STR(in_str)
ZEND_PARSE_PARAMETERS_END();
-#endif
RETURN_STR(php_raw_url_encode(ZSTR_VAL(in_str), ZSTR_LEN(in_str)));
}
@@ -678,15 +660,9 @@ PHP_FUNCTION(rawurldecode)
{
zend_string *in_str, *out_str;
-#ifndef FAST_ZPP
- if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &in_str) == FAILURE) {
- return;
- }
-#else
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_STR(in_str)
ZEND_PARSE_PARAMETERS_END();
-#endif
out_str = zend_string_init(ZSTR_VAL(in_str), ZSTR_LEN(in_str), 0);
ZSTR_LEN(out_str) = php_raw_url_decode(ZSTR_VAL(out_str), ZSTR_LEN(out_str));