X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url.c;h=aeee9e81bc3ef9c0d61fb15f76433c039d0b8977;hp=efa9116e4b7a8d300b660717a6981e988a0d05d5;hb=8191c55421fb6ecc86185608a8b0510da1525e1e;hpb=f257ab645344a43d04c089a684a3ddfd3bf3fc48

diff --git a/php_http_url.c b/php_http_url.c
index efa9116..aeee9e8 100644
--- a/php_http_url.c
+++ b/php_http_url.c
@@ -287,51 +287,7 @@ PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url
 	}
 	
 	if (url_str) {
-		size_t len;
-		
-		*url_str = emalloc(PHP_HTTP_URL_MAXLEN + 1);
-		
-		**url_str = '\0';
-		strlcat(*url_str, url->scheme, PHP_HTTP_URL_MAXLEN);
-		strlcat(*url_str, "://", PHP_HTTP_URL_MAXLEN);
-		
-		if (url->user && *url->user) {
-			strlcat(*url_str, url->user, PHP_HTTP_URL_MAXLEN);
-			if (url->pass && *url->pass) {
-				strlcat(*url_str, ":", PHP_HTTP_URL_MAXLEN);
-				strlcat(*url_str, url->pass, PHP_HTTP_URL_MAXLEN);
-			}
-			strlcat(*url_str, "@", PHP_HTTP_URL_MAXLEN);
-		}
-		
-		strlcat(*url_str, url->host, PHP_HTTP_URL_MAXLEN);
-		
-		if (url->port) {
-			char port_str[8];
-			
-			snprintf(port_str, sizeof(port_str), "%d", (int) url->port);
-			strlcat(*url_str, ":", PHP_HTTP_URL_MAXLEN);
-			strlcat(*url_str, port_str, PHP_HTTP_URL_MAXLEN);
-		}
-		
-		strlcat(*url_str, url->path, PHP_HTTP_URL_MAXLEN);
-		
-		if (url->query && *url->query) {
-			strlcat(*url_str, "?", PHP_HTTP_URL_MAXLEN);
-			strlcat(*url_str, url->query, PHP_HTTP_URL_MAXLEN);
-		}
-		
-		if (url->fragment && *url->fragment) {
-			strlcat(*url_str, "#", PHP_HTTP_URL_MAXLEN);
-			strlcat(*url_str, url->fragment, PHP_HTTP_URL_MAXLEN);
-		}
-		
-		if (PHP_HTTP_URL_MAXLEN == (len = strlen(*url_str))) {
-			php_http_error(HE_NOTICE, PHP_HTTP_E_URL, "Length of URL exceeds PHP_HTTP_URL_MAXLEN");
-		}
-		if (url_len) {
-			*url_len = len;
-		}
+		php_http_url_to_string(url, url_str, url_len TSRMLS_CC);
 	}
 	
 	if (url_ptr) {
@@ -349,11 +305,7 @@ PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, const char *pre_en
 
 	php_http_url_argsep(&arg_sep_str, &arg_sep_len TSRMLS_CC);
 
-	if (pre_encoded_len && pre_encoded_str) {
-		php_http_buffer_append(qstr, pre_encoded_str, pre_encoded_len);
-	}
-
-	if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, ZEND_STRL("="), NULL, 0 TSRMLS_CC)) {
+	if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, "=", 1, pre_encoded_str, pre_encoded_len TSRMLS_CC)) {
 		php_http_buffer_free(&qstr);
 		return FAILURE;
 	}
@@ -364,91 +316,16 @@ PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, const char *pre_en
 	return SUCCESS;
 }
 
-PHP_HTTP_API STATUS php_http_url_encode_hash_ex(HashTable *ht, php_http_buffer_t *str, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *prefix_str, size_t prefix_len TSRMLS_DC)
+PHP_HTTP_API STATUS php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len TSRMLS_DC)
 {
-	php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
-	zval **data = NULL;
-	HashPosition pos;
+	if (pre_encoded_len && pre_encoded_str) {
+		php_http_buffer_append(qstr, pre_encoded_str, pre_encoded_len);
+	}
 
-	if (!ht || !str) {
-		php_http_error(HE_WARNING, PHP_HTTP_E_INVALID_PARAM, "Invalid parameters");
+	if (!php_http_params_to_string(qstr, hash, arg_sep_str, arg_sep_len, "", 0, val_sep_str, val_sep_len, PHP_HTTP_PARAMS_QUERY TSRMLS_CC)) {
 		return FAILURE;
 	}
-	if (ht->nApplyCount > 0) {
-		return SUCCESS;
-	}
-	
-	FOREACH_HASH_KEYVAL(pos, ht, key, data) {
-		char *encoded_key;
-		int encoded_len;
-		php_http_buffer_t new_prefix;
-		
-		if (!data || !*data) {
-			php_http_buffer_dtor(str);
-			return FAILURE;
-		}
-		
-		if (key.type == HASH_KEY_IS_STRING) {
-			if (!*key.str) {
-				/* only public properties */
-				continue;
-			}
-			if (key.len && key.str[key.len - 1] == '\0') {
-				--key.len;
-			}
-			encoded_key = php_url_encode(key.str, key.len, &encoded_len);
-		} else {
-			encoded_len = spprintf(&encoded_key, 0, "%ld", key.num);
-		}
-		
-		{
-			php_http_buffer_init(&new_prefix);
-			if (prefix_str && prefix_len) {
-				php_http_buffer_append(&new_prefix, prefix_str, prefix_len);
-				php_http_buffer_appends(&new_prefix, "%5B");
-			}
-			
-			php_http_buffer_append(&new_prefix, encoded_key, encoded_len);
-			efree(encoded_key);
-			
-			if (prefix_str && prefix_len) {
-				php_http_buffer_appends(&new_prefix, "%5D");
-			}
-			php_http_buffer_fix(&new_prefix);
-		}
-		
-		if (Z_TYPE_PP(data) == IS_ARRAY || Z_TYPE_PP(data) == IS_OBJECT) {
-			STATUS status;
-			++ht->nApplyCount;
-			status = php_http_url_encode_hash_ex(HASH_OF(*data), str, arg_sep_str, arg_sep_len, val_sep_str, val_sep_len, PHP_HTTP_BUFFER_VAL(&new_prefix), PHP_HTTP_BUFFER_LEN(&new_prefix) TSRMLS_CC);
-			--ht->nApplyCount;
-			if (SUCCESS != status) {
-				php_http_buffer_dtor(&new_prefix);
-				php_http_buffer_dtor(str);
-				return FAILURE;
-			}
-		} else {
-			zval *val = php_http_ztyp(IS_STRING, *data);
-			
-			if (PHP_HTTP_BUFFER_LEN(str)) {
-				php_http_buffer_append(str, arg_sep_str, arg_sep_len);
-			}
-			php_http_buffer_append(str, PHP_HTTP_BUFFER_VAL(&new_prefix), PHP_HTTP_BUFFER_LEN(&new_prefix));
-			php_http_buffer_append(str, val_sep_str, val_sep_len);
-			
-			if (Z_STRLEN_P(val) && Z_STRVAL_P(val)) {
-				char *encoded_val;
-				int encoded_len;
-				
-				encoded_val = php_url_encode(Z_STRVAL_P(val), Z_STRLEN_P(val), &encoded_len);
-				php_http_buffer_append(str, encoded_val, encoded_len);
-				efree(encoded_val);
-			}
-			
-			zval_ptr_dtor(&val);
-		}
-		php_http_buffer_dtor(&new_prefix);
-	}
+
 	return SUCCESS;
 }