X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url.h;h=02535d84e3c2088cefbd2f097198b3278f7f948c;hp=bbb6177617e957acb3762570bdd7c893e011e381;hb=20a7c37b273e313e53a37f4406eb49898dd50b6d;hpb=d3485e3b28336153dca690e872ffe1ddc60fedd2

diff --git a/php_http_url.h b/php_http_url.h
index bbb6177..02535d8 100644
--- a/php_http_url.h
+++ b/php_http_url.h
@@ -6,15 +6,15 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_url_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_URL_H
 #define PHP_HTTP_URL_H
 
+#include <ext/standard/url.h>
+
 #define PHP_HTTP_URL_REPLACE		0x000
 #define PHP_HTTP_URL_JOIN_PATH		0x001
 #define PHP_HTTP_URL_JOIN_QUERY		0x002
@@ -37,8 +37,19 @@
 PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC);
 PHP_HTTP_API char *php_http_url_absolute(const char *url, int flags TSRMLS_DC);
 
-PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, zend_bool override_argsep, char *pre_encoded_data, size_t pre_encoded_len, char **encoded_data, size_t *encoded_len TSRMLS_DC);
-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(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len TSRMLS_DC);
+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);
+
+static inline void php_http_url_argsep(const char **str, size_t *len TSRMLS_DC)
+{
+	*str = INI_STR("arg_separator.output");
+	*len = strlen(*str);
+
+	if (!*len) {
+		*str = PHP_HTTP_URL_ARGSEP;
+		*len = lenof(PHP_HTTP_URL_ARGSEP);
+	}
+}
 
 static inline php_url *php_http_url_from_struct(php_url *url, HashTable *ht TSRMLS_DC)
 {
@@ -50,42 +61,42 @@ static inline php_url *php_http_url_from_struct(php_url *url, HashTable *ht TSRM
 	memset(url, 0, sizeof(*url));
 	
 	if (SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void *) &e)) {
-		zval *cpy = php_http_zsep(IS_STRING, *e);
+		zval *cpy = php_http_ztyp(IS_STRING, *e);
 		url->scheme = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
 		zval_ptr_dtor(&cpy);
 	}
 	if (SUCCESS == zend_hash_find(ht, "user", sizeof("user"), (void *) &e)) {
-		zval *cpy = php_http_zsep(IS_STRING, *e);
+		zval *cpy = php_http_ztyp(IS_STRING, *e);
 		url->user = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
 		zval_ptr_dtor(&cpy);
 	}
 	if (SUCCESS == zend_hash_find(ht, "pass", sizeof("pass"), (void *) &e)) {
-		zval *cpy = php_http_zsep(IS_STRING, *e);
+		zval *cpy = php_http_ztyp(IS_STRING, *e);
 		url->pass = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
 		zval_ptr_dtor(&cpy);
 	}
 	if (SUCCESS == zend_hash_find(ht, "host", sizeof("host"), (void *) &e)) {
-		zval *cpy = php_http_zsep(IS_STRING, *e);
+		zval *cpy = php_http_ztyp(IS_STRING, *e);
 		url->host = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
 		zval_ptr_dtor(&cpy);
 	}
 	if (SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &e)) {
-		zval *cpy = php_http_zsep(IS_STRING, *e);
+		zval *cpy = php_http_ztyp(IS_STRING, *e);
 		url->path = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
 		zval_ptr_dtor(&cpy);
 	}
 	if (SUCCESS == zend_hash_find(ht, "query", sizeof("query"), (void *) &e)) {
-		zval *cpy = php_http_zsep(IS_STRING, *e);
+		zval *cpy = php_http_ztyp(IS_STRING, *e);
 		url->query = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
 		zval_ptr_dtor(&cpy);
 	}
 	if (SUCCESS == zend_hash_find(ht, "fragment", sizeof("fragment"), (void *) &e)) {
-		zval *cpy = php_http_zsep(IS_STRING, *e);
+		zval *cpy = php_http_ztyp(IS_STRING, *e);
 		url->fragment = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
 		zval_ptr_dtor(&cpy);
 	}
 	if (SUCCESS == zend_hash_find(ht, "port", sizeof("port"), (void *) &e)) {
-		zval *cpy = php_http_zsep(IS_LONG, *e);
+		zval *cpy = php_http_ztyp(IS_LONG, *e);
 		url->port = (unsigned short) Z_LVAL_P(cpy);
 		zval_ptr_dtor(&cpy);
 	}