projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
* check initial length of arg_separator
[m6w6/ext-http]
/
http_functions.c
diff --git
a/http_functions.c
b/http_functions.c
index 05f6b7ee14a7bed0ee15a8bfedcfb3450b0629d9..470c47b4ca19128f2b5603d82d3666e3abfb1499 100644
(file)
--- a/
http_functions.c
+++ b/
http_functions.c
@@
-952,16
+952,16
@@
PHP_FUNCTION(http_auth_basic_cb)
/* {{{ Sara Golemons http_build_query() */
#ifndef ZEND_ENGINE_2
/* {{{ Sara Golemons http_build_query() */
#ifndef ZEND_ENGINE_2
-/* {{{ proto string http_build_query(mixed formdata [, string prefix])
+/* {{{ proto string http_build_query(mixed formdata [, string prefix
[, string arg_separator]
])
Generates a form-encoded query string from an associative array or object. */
PHP_FUNCTION(http_build_query)
{
zval *formdata;
Generates a form-encoded query string from an associative array or object. */
PHP_FUNCTION(http_build_query)
{
zval *formdata;
- char *prefix = NULL, *arg_sep =
NULL
;
- int prefix_len = 0;
+ char *prefix = NULL, *arg_sep =
INI_STR("arg_separator.output")
;
+ int prefix_len = 0
, arg_sep_len = strlen(arg_sep)
;
phpstr *formstr = phpstr_new();
phpstr *formstr = phpstr_new();
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s
", &formdata, &prefix, &prefix
_len) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s
s", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep
_len) != SUCCESS) {
RETURN_FALSE;
}
RETURN_FALSE;
}
@@
-970,7
+970,7
@@
PHP_FUNCTION(http_build_query)
RETURN_FALSE;
}
RETURN_FALSE;
}
- if (!
strlen(arg_sep = INI_STR("arg_separator.output"))
) {
+ if (!
arg_sep_len
) {
arg_sep = HTTP_URL_ARGSEP_DEFAULT;
}
arg_sep = HTTP_URL_ARGSEP_DEFAULT;
}
@@
-992,6
+992,7
@@
PHP_FUNCTION(http_build_query)
PHP_FUNCTION(http_test)
{
PHP_FUNCTION(http_test)
{
+ RETURN_TRUE;
}
/*
}
/*