#include "php_http.h"
+#include <main/SAPI.h>
+#include <ext/standard/php_string.h>
+
static inline char *localhostname(void)
{
char hostname[1024] = {0};
array_init(&qarr);
ZVAL_STRING(&qstr, old_url->query, 0);
- php_http_querystring_modify(&qarr, &qstr TSRMLS_CC);
+ php_http_querystring_update(&qarr, &qstr, NULL TSRMLS_CC);
ZVAL_STRING(&qstr, new_url->query, 0);
- php_http_querystring_modify(&qarr, &qstr TSRMLS_CC);
+ php_http_querystring_update(&qarr, &qstr, NULL TSRMLS_CC);
ZVAL_NULL(&qstr);
- php_http_querystring_update(&qarr, &qstr TSRMLS_CC);
+ php_http_querystring_update(&qarr, NULL, &qstr TSRMLS_CC);
url->query = Z_STRVAL(qstr);
zval_dtor(&qarr);
} else {
{
char *arg_sep;
size_t arg_sep_len;
- php_http_buffer *qstr = php_http_buffer_new();
+ php_http_buffer_t *qstr = php_http_buffer_new();
if (override_argsep || !(arg_sep_len = strlen(arg_sep = INI_STR("arg_separator.output")))) {
arg_sep = PHP_HTTP_URL_ARGSEP;
php_http_buffer_append(qstr, pre_encoded_data, pre_encoded_len);
}
- if (SUCCESS != php_http_url_encode_hash_recursive(hash, qstr, arg_sep, arg_sep_len, NULL, 0)) {
+ if (SUCCESS != php_http_url_encode_hash_recursive(hash, qstr, arg_sep, arg_sep_len, NULL, 0 TSRMLS_CC)) {
php_http_buffer_free(&qstr);
return FAILURE;
}
return SUCCESS;
}
-PHP_HTTP_API STATUS php_http_url_encode_hash_recursive(HashTable *ht, php_http_buffer *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC)
+PHP_HTTP_API STATUS php_http_url_encode_hash_recursive(HashTable *ht, php_http_buffer_t *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC)
{
php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
zval **data = NULL;
FOREACH_HASH_KEYVAL(pos, ht, key, data) {
char *encoded_key;
int encoded_len;
- php_http_buffer new_prefix;
+ php_http_buffer_t new_prefix;
if (!data || !*data) {
php_http_buffer_dtor(str);
return FAILURE;
}
} else {
- zval *val = php_http_zsep(IS_STRING, *data);
+ zval *val = php_http_ztyp(IS_STRING, *data);
if (PHP_HTTP_BUFFER_LEN(str)) {
php_http_buffer_append(str, arg_sep, arg_sep_len);
PHP_METHOD(HttpUrl, __construct)
{
- with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) {
+ with_error_handling(EH_THROW, php_http_exception_class_entry) {
zval *new_url = NULL, *old_url = NULL;
long flags = PHP_HTTP_URL_FROM_ENV;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!z!l", &old_url, &new_url, &flags)) {
- with_error_handling(EH_THROW, PHP_HTTP_EX_CE(url)) {
+ with_error_handling(EH_THROW, php_http_exception_class_entry) {
php_url *res_purl, *new_purl = NULL, *old_purl = NULL;
if (new_url) {
new_purl = php_http_url_from_struct(NULL, HASH_OF(new_url) TSRMLS_CC);
break;
default: {
- zval *cpy = php_http_zsep(IS_STRING, new_url);
+ zval *cpy = php_http_ztyp(IS_STRING, new_url);
new_purl = php_url_parse(Z_STRVAL_P(new_url));
zval_ptr_dtor(&cpy);
old_purl = php_http_url_from_struct(NULL, HASH_OF(old_url) TSRMLS_CC);
break;
default: {
- zval *cpy = php_http_zsep(IS_STRING, old_url);
+ zval *cpy = php_http_ztyp(IS_STRING, old_url);
old_purl = php_url_parse(Z_STRVAL_P(old_url));
zval_ptr_dtor(&cpy);