X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_url.c;h=79966b601774dc81a4ffdeffa1f0684c572e9a1d;hb=88770c6b3fb365da405b4aede6def9ce88dbca7c;hp=6f0922482db3a6dbffcbf4e1ebca5a098f591720;hpb=c5c580f24e24e8032a0554a2e39e38c496144bc2;p=m6w6%2Fext-http

diff --git a/php_http_url.c b/php_http_url.c
index 6f09224..79966b6 100644
--- a/php_http_url.c
+++ b/php_http_url.c
@@ -120,12 +120,12 @@ PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url
 			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 {
@@ -340,7 +340,7 @@ PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, zend_bool override
 		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;
 	}
@@ -415,7 +415,7 @@ PHP_HTTP_API STATUS php_http_url_encode_hash_recursive(HashTable *ht, php_http_b
 				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);
@@ -460,12 +460,12 @@ zend_function_entry php_http_url_method_entry[] = {
 
 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) {
@@ -475,7 +475,7 @@ PHP_METHOD(HttpUrl, __construct)
 							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);
@@ -493,7 +493,7 @@ PHP_METHOD(HttpUrl, __construct)
 							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);