X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url_api.h;h=940db8e61e68e1a544896a691079ad33c5b633ff;hp=dc0089909674861d236a78e59d42e45c1f74aa1d;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=d046681a7b929ef813849cfe38fbceb333f0b0eb

diff --git a/php_http_url_api.h b/php_http_url_api.h
index dc00899..940db8e 100644
--- a/php_http_url_api.h
+++ b/php_http_url_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -19,19 +19,28 @@
 
 extern PHP_MINIT_FUNCTION(http_url);
 
-#define http_absolute_url(u) _http_absolute_url((u) TSRMLS_CC)
-PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC);
+#define http_absolute_url(u) _http_absolute_url_ex((u), HTTP_URL_REPLACE TSRMLS_CC)
+#define http_absolute_url_ex(u, f) _http_absolute_url_ex((u), (f) TSRMLS_CC)
+PHP_HTTP_API char *_http_absolute_url_ex(const char *url, int flags TSRMLS_DC);
 
 #define HTTP_URL_REPLACE		0x000
 #define HTTP_URL_JOIN_PATH		0x001
 #define HTTP_URL_JOIN_QUERY		0x002
 #define HTTP_URL_STRIP_USER		0x004
 #define HTTP_URL_STRIP_PASS		0x008
-#define HTTP_URL_STRIP_AUTH		0x010
+#define HTTP_URL_STRIP_AUTH		(HTTP_URL_STRIP_USER|HTTP_URL_STRIP_PASS)
 #define HTTP_URL_STRIP_PORT		0x020
 #define HTTP_URL_STRIP_PATH		0x040
 #define HTTP_URL_STRIP_QUERY	0x080
 #define HTTP_URL_STRIP_FRAGMENT	0x100
+#define HTTP_URL_STRIP_ALL ( \
+	HTTP_URL_STRIP_AUTH | \
+	HTTP_URL_STRIP_PORT | \
+	HTTP_URL_STRIP_PATH | \
+	HTTP_URL_STRIP_QUERY | \
+	HTTP_URL_STRIP_FRAGMENT \
+)
+#define HTTP_URL_FROM_ENV		0x1000
 
 #define http_build_url(f, o, n, p, s, l) _http_build_url((f), (o), (n), (p), (s), (l) TSRMLS_CC)
 PHP_HTTP_API void _http_build_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);
@@ -43,55 +52,106 @@ PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, zend_bool override_
 #define http_urlencode_hash_recursive(ht, s, as, al, pr, pl) _http_urlencode_hash_recursive((ht), (s), (as), (al), (pr), (pl) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC);
 
-#define array2url(ht) _array2url((ht) TSRMLS_CC)
-static inline php_url *_array2url(HashTable *ht TSRMLS_DC)
+#define http_url_from_struct(u, ht) _http_url_from_struct((u), (ht) TSRMLS_CC)
+static inline php_url *_http_url_from_struct(php_url *url, HashTable *ht TSRMLS_DC)
 {
 	zval **e;
-	php_url *url = ecalloc(1, sizeof(php_url));
 	
-	if ((SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void **) &e))
+	if (!url) {
+		url = ecalloc(1, sizeof(php_url));
+	}
+	
+	if ((SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void *) &e))
 			&& (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) {
 		url->scheme = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e));
 	}
-	if ((SUCCESS == zend_hash_find(ht, "user", sizeof("user"), (void **) &e))
+	if ((SUCCESS == zend_hash_find(ht, "user", sizeof("user"), (void *) &e))
 			&& (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) {
 		url->user = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e));
 	}
-	if ((SUCCESS == zend_hash_find(ht, "pass", sizeof("pass"), (void **) &e))
+	if ((SUCCESS == zend_hash_find(ht, "pass", sizeof("pass"), (void *) &e))
 			&& (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) {
 		url->pass = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e));
 	}
-	if ((SUCCESS == zend_hash_find(ht, "host", sizeof("host"), (void **) &e))
+	if ((SUCCESS == zend_hash_find(ht, "host", sizeof("host"), (void *) &e))
 			&& (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) {
 		url->host = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e));
 	}
-	if ((SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void **) &e))
+	if ((SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &e))
 			&& (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) {
 		url->path = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e));
 	}
-	if ((SUCCESS == zend_hash_find(ht, "query", sizeof("query"), (void **) &e))
+	if ((SUCCESS == zend_hash_find(ht, "query", sizeof("query"), (void *) &e))
 			&& (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) {
 		url->query = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e));
 	}
-	if ((SUCCESS == zend_hash_find(ht, "fragment", sizeof("fragment"), (void **) &e))
+	if ((SUCCESS == zend_hash_find(ht, "fragment", sizeof("fragment"), (void *) &e))
 			&& (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) {
 		url->fragment = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e));
 	}
-	if (SUCCESS == zend_hash_find(ht, "port", sizeof("port"), (void **) &e)) {
+	if (SUCCESS == zend_hash_find(ht, "port", sizeof("port"), (void *) &e)) {
 		if (Z_TYPE_PP(e) == IS_LONG) {
 			url->port = (unsigned short) Z_LVAL_PP(e);
 		} else {
-			zval *o = *e;
+			zval *o = http_zsep(IS_LONG, *e);
 			
-			convert_to_long_ex(e);
-			url->port = (unsigned short) Z_LVAL_PP(e);
-			if (o != *e) zval_ptr_dtor(e);
+			url->port = (unsigned short) Z_LVAL_P(o);
+			zval_ptr_dtor(&o);
 		}
 	}
 	
 	return url;
 }
 
+#define http_url_tostruct(u, strct) _http_url_tostruct((u), (strct) TSRMLS_CC)
+static inline HashTable *_http_url_tostruct(php_url *url, zval *strct TSRMLS_DC)
+{
+	zval arr;
+	
+	if (strct) {
+		switch (Z_TYPE_P(strct)) {
+			default:
+				zval_dtor(strct);
+				array_init(strct);
+			case IS_ARRAY:
+			case IS_OBJECT:
+				INIT_ZARR(arr, HASH_OF(strct));
+		}
+	} else {
+		INIT_PZVAL(&arr);
+		array_init(&arr);
+	}
+	
+	if (url) {
+		if (url->scheme) {
+			add_assoc_string(&arr, "scheme", url->scheme, 1);
+		}
+		if (url->user) {
+			add_assoc_string(&arr, "user", url->user, 1);
+		}
+		if (url->pass) {
+			add_assoc_string(&arr, "pass", url->pass, 1);
+		}
+		if (url->host) {
+			add_assoc_string(&arr, "host", url->host, 1);
+		}
+		if (url->port) {
+			add_assoc_long(&arr, "port", (long) url->port);
+		}
+		if (url->path) {
+			add_assoc_string(&arr, "path", url->path, 1);
+		}
+		if (url->query) {
+			add_assoc_string(&arr, "query", url->query, 1);
+		}
+		if (url->fragment) {
+			add_assoc_string(&arr, "fragment", url->fragment, 1);
+		}
+	}
+	
+	return Z_ARRVAL(arr);
+}
+
 #endif
 
 /*