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

diff --git a/php_http_url_api.h b/php_http_url_api.h
index 878afff..dc00899 100644
--- a/php_http_url_api.h
+++ b/php_http_url_api.h
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -18,29 +15,82 @@
 #ifndef PHP_HTTP_URL_API_H
 #define PHP_HTTP_URL_API_H
 
-#include "php_http_std_defs.h"
+#include "ext/standard/url.h"
 
-#define http_absolute_uri(url) http_absolute_url(url)
-#define http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port) _http_absolute_url_ex((url), (url_len), (proto), (proto_len), (host), (host_len), (port) TSRMLS_CC)
-#define http_absolute_url(url) http_absolute_url_ex((url), strlen(url), NULL, 0, NULL, 0, 0)
-#define http_absolute_url_ex(url, url_len, proto, proto_len, host, host_len, port) _http_absolute_url_ex((url), (url_len), (proto), (proto_len), (host), (host_len), (port) TSRMLS_CC)
-PHP_HTTP_API char *_http_absolute_url_ex(const char *url, size_t url_len, const char *proto, size_t proto_len, const char *host, size_t host_len, unsigned port TSRMLS_DC);
+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_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_PORT		0x020
+#define HTTP_URL_STRIP_PATH		0x040
+#define HTTP_URL_STRIP_QUERY	0x080
+#define HTTP_URL_STRIP_FRAGMENT	0x100
+
+#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);
 
 #define http_urlencode_hash(h, q) _http_urlencode_hash_ex((h), 1, NULL, 0, (q), NULL TSRMLS_CC)
 #define http_urlencode_hash_ex(h, o, p, pl, q, ql) _http_urlencode_hash_ex((h), (o), (p), (pl), (q), (ql) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, zend_bool override_argsep, char *pre_encoded_data, size_t pre_encoded_len, char **encoded_data, size_t *encoded_len TSRMLS_DC);
 
-#define http_urlencode_hash_implementation(ht, formstr, argsep) \
-	http_urlencode_hash_implementation_ex((ht), (formstr), (argsep), NULL, 0, NULL, 0, NULL, 0, NULL)
-#define http_urlencode_hash_implementation_ex(ht, formstr, argsep, np, npl, kp, kpl, ks, ksl, type) \
-	_http_urlencode_hash_implementation_ex((ht), (formstr), (argsep), (np), (npl), (kp), (kpl), (ks), (ksl), (type) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_urlencode_hash_implementation_ex(
-	HashTable *ht, phpstr *formstr, char *arg_sep,
-	const char *num_prefix, int num_prefix_len,
-	const char *key_prefix, int key_prefix_len,
-	const char *key_suffix, int key_suffix_len,
-	zval *type TSRMLS_DC);
+#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)
+{
+	zval **e;
+	php_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))
+			&& (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))
+			&& (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))
+			&& (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))
+			&& (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))
+			&& (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))
+			&& (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 (Z_TYPE_PP(e) == IS_LONG) {
+			url->port = (unsigned short) Z_LVAL_PP(e);
+		} else {
+			zval *o = *e;
+			
+			convert_to_long_ex(e);
+			url->port = (unsigned short) Z_LVAL_PP(e);
+			if (o != *e) zval_ptr_dtor(e);
+		}
+	}
+	
+	return url;
+}
 
 #endif