#endif
#include "php.h"
-#include "php_ini.h"
-#include "snprintf.h"
#include "ext/standard/info.h"
#include "ext/session/php_session.h"
#include "ext/standard/php_string.h"
#include "SAPI.h"
+#include "phpstr/phpstr.h"
+
#include "php_http.h"
+#include "php_http_std_defs.h"
#include "php_http_api.h"
+#include "php_http_auth_api.h"
#include "php_http_curl_api.h"
-#include "php_http_std_defs.h"
-
-#include "phpstr/phpstr.h"
+#include "php_http_cache_api.h"
+#include "php_http_curl_api.h"
+#include "php_http_date_api.h"
+#include "php_http_headers_api.h"
+#include "php_http_message_api.h"
+#include "php_http_send_api.h"
+#include "php_http_url_api.h"
-ZEND_DECLARE_MODULE_GLOBALS(http)
+ZEND_EXTERN_MODULE_GLOBALS(http)
/* {{{ proto string http_date([int timestamp])
*
array_init(info);
}
- if (SUCCESS == http_get(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
+ if (SUCCESS == http_get(URL, Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) {
RETURN_STRINGL(data, data_len, 0);
} else {
RETURN_FALSE;
array_init(info);
}
- if (SUCCESS == http_head(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
+ if (SUCCESS == http_head(URL, Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) {
RETURN_STRINGL(data, data_len, 0);
} else {
RETURN_FALSE;
array_init(info);
}
- if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
+ if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) {
RETURN_STRINGL(data, data_len, 0);
} else {
RETURN_FALSE;
array_init(info);
}
- if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
+ if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), Z_ARRVAL_P(options), Z_ARRVAL_P(info), &data, &data_len)) {
RETURN_STRINGL(data, data_len, 0);
} else {
RETURN_FALSE;
/* {{{ 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;
- char *prefix = NULL, *arg_sep = NULL;
- int prefix_len = 0;
- phpstr *formstr = phpstr_new();
+ char *prefix = NULL, *arg_sep = INI_STR("arg_separator.output");
+ int prefix_len = 0, arg_sep_len = strlen(arg_sep);
+ phpstr *formstr;
- 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|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) {
RETURN_FALSE;
}
RETURN_FALSE;
}
- if (!strlen(arg_sep = INI_STR("arg_separator.output"))) {
+ if (!arg_sep_len) {
arg_sep = HTTP_URL_ARGSEP_DEFAULT;
}
+ formstr = phpstr_new();
if (SUCCESS != http_urlencode_hash_implementation_ex(HASH_OF(formdata), formstr, arg_sep, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL) TSRMLS_CC)) {
- phpstr_dtor(formstr);
+ phpstr_free(formstr);
RETURN_FALSE;
}
if (!formstr->used) {
+ phpstr_free(formstr);
RETURN_NULL();
}