X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=php_http_url.h;h=a3ea1d87bc97d0e46aa77b1e8f68bcc826f945ff;hb=b11342ec89ef18b55828c089d36924a8ecc3dfd5;hp=30f7780e92a548c30f92d3f7b08d89d24a03cc41;hpb=1b8751d5926235de8d0a9e26809ed774db709cde;p=m6w6%2Fext-http

diff --git a/php_http_url.h b/php_http_url.h
index 30f7780..a3ea1d8 100644
--- a/php_http_url.h
+++ b/php_http_url.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -35,6 +35,37 @@
 #define PHP_HTTP_URL_FROM_ENV		0x1000
 #define PHP_HTTP_URL_SANITIZE_PATH	0x2000
 
+typedef struct php_http_url_part {
+	char *str;
+	size_t len;
+} php_http_url_part_t;
+
+#define PHP_HTTP_URL_PARSE_LOCMB   0x01
+#define PHP_HTTP_URL_PARSE_UTF8MB  0x02
+#define PHP_HTTP_URL_PARSE_LOCIDN  0x10
+#define PHP_HTTP_URL_PARSE_UTF8IDN 0x20
+
+typedef struct php_http_url {
+	php_http_url_part_t scheme;
+	struct {
+		struct {
+			php_http_url_part_t username;
+			php_http_url_part_t password;
+		} userinfo;
+		php_http_url_part_t host;
+		unsigned short port;
+	} authority;
+	php_http_url_part_t path;
+	php_http_url_part_t query;
+	php_http_url_part_t fragment;
+	unsigned flags;
+#ifdef ZTS
+	void ***ts;
+#endif
+} php_http_url_t;
+
+PHP_HTTP_API php_http_url_t *php_http_url_init(php_http_url_t *url, const char *str, size_t len, unsigned flags TSRMLS_DC);
+
 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 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);
@@ -211,18 +242,12 @@ static inline HashTable *php_http_url_to_struct(php_url *url, zval *strct TSRMLS
 	return Z_ARRVAL(arr);
 }
 
-zend_class_entry *php_http_url_get_class_entry(void);
+PHP_HTTP_API zend_class_entry *php_http_url_class_entry;
+PHP_MINIT_FUNCTION(http_url);
 
 #define php_http_url_object_new php_http_object_new
 #define php_http_url_object_new_ex php_http_object_new_ex
 
-PHP_METHOD(HttpUrl, __construct);
-PHP_METHOD(HttpUrl, mod);
-PHP_METHOD(HttpUrl, toString);
-PHP_METHOD(HttpUrl, toArray);
-
-PHP_MINIT_FUNCTION(http_url);
-
 #endif
 
 /*