X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url.c;h=7c8077b6a31995208a8a16da0ed6789d68bd2878;hp=0bfd6576e70f63a80b2a40835460bcbcb367262f;hb=refs%2Fheads%2Fv2.1.x;hpb=d2aca1740aad980f8ec182c2f9ffac20f15a4a54

diff --git a/php_http_url.c b/php_http_url.c
index 0bfd657..7c8077b 100644
--- a/php_http_url.c
+++ b/php_http_url.c
@@ -6,16 +6,11 @@
     | 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-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_url_api.c 292841 2009-12-31 08:48:57Z mike $ */
-
-#include "php_http.h"
-
-#include <main/SAPI.h>
-#include <ext/standard/php_string.h>
+#include "php_http_api.h"
 
 static inline char *localhostname(void)
 {
@@ -47,35 +42,74 @@ static inline char *localhostname(void)
 	return estrndup("localhost", lenof("localhost"));
 }
 
-PHP_HTTP_API char *php_http_url_absolute(const char *url, int flags TSRMLS_DC)
+static php_url *php_http_url_from_env(php_url *url TSRMLS_DC)
 {
-	char *abs = NULL;
-	php_url *purl = NULL;
-	
-	if (url) {
-		purl = php_url_parse(abs = estrdup(url));
-		STR_SET(abs, NULL);
-		if (!purl) {
-			php_http_error(HE_WARNING, PHP_HTTP_E_URL, "Could not parse URL (%s)", url);
-			return NULL;
+	zval *https, *zhost, *zport;
+	long port;
+
+	if (!url) {
+		url = ecalloc(1, sizeof(*url));
+	}
+
+	/* port */
+	zport = php_http_env_get_server_var(ZEND_STRL("SERVER_PORT"), 1 TSRMLS_CC);
+	if (zport && IS_LONG == is_numeric_string(Z_STRVAL_P(zport), Z_STRLEN_P(zport), &port, NULL, 0)) {
+		url->port = port;
+	}
+
+	/* scheme */
+	https = php_http_env_get_server_var(ZEND_STRL("HTTPS"), 1 TSRMLS_CC);
+	if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) {
+		url->scheme = estrndup("https", lenof("https"));
+	} else {
+		url->scheme = estrndup("http", lenof("http"));
+	}
+
+	/* host */
+	if ((((zhost = php_http_env_get_server_var(ZEND_STRL("HTTP_HOST"), 1 TSRMLS_CC)) ||
+			(zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_NAME"), 1 TSRMLS_CC)) ||
+			(zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_ADDR"), 1 TSRMLS_CC)))) && Z_STRLEN_P(zhost)) {
+		size_t stop_at = strspn(Z_STRVAL_P(zhost), "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-.");
+
+		url->host = estrndup(Z_STRVAL_P(zhost), stop_at);
+	} else {
+		url->host = localhostname();
+	}
+
+	/* path */
+	if (SG(request_info).request_uri && SG(request_info).request_uri[0]) {
+		const char *q = strchr(SG(request_info).request_uri, '?');
+
+		if (q) {
+			url->path = estrndup(SG(request_info).request_uri, q - SG(request_info).request_uri);
+		} else {
+			url->path = estrdup(SG(request_info).request_uri);
 		}
 	}
-	
-	php_http_url(flags, purl, NULL, NULL, &abs, NULL TSRMLS_CC);
-	
-	if (purl) {
-		php_url_free(purl);
+
+	/* query */
+	if (SG(request_info).query_string && SG(request_info).query_string[0]) {
+		url->query = estrdup(SG(request_info).query_string);
 	}
-	
-	return abs;
+
+	return url;
 }
 
-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)
+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)
 {
-#if defined(HAVE_GETSERVBYPORT) || defined(HAVE_GETSERVBYNAME)
-	struct servent *se;
-#endif
-	php_url *url = ecalloc(1, sizeof(php_url));
+	php_url *url, *tmp_url = NULL;
+
+	/* set from env if requested */
+	if (flags & PHP_HTTP_URL_FROM_ENV) {
+		php_url *env_url = php_http_url_from_env(NULL TSRMLS_CC);
+
+		php_http_url(flags ^ PHP_HTTP_URL_FROM_ENV, env_url, old_url, &tmp_url, NULL, NULL TSRMLS_CC);
+
+		php_url_free(env_url);
+		old_url = tmp_url;
+	}
+
+	url = ecalloc(1, sizeof(*url));
 
 #define __URLSET(u,n) \
 	((u)&&(u)->n)
@@ -136,186 +170,94 @@ PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url
 		__URLCPY(fragment);
 	}
 	
-	if (!url->scheme) {
-		if (flags & PHP_HTTP_URL_FROM_ENV) {
-			zval *https = php_http_env_get_server_var(ZEND_STRL("HTTPS"), 1 TSRMLS_CC);
-			if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) {
-				url->scheme = estrndup("https", lenof("https"));
-			} else switch (url->port) {
-				case 443:
-					url->scheme = estrndup("https", lenof("https"));
-					break;
+	/* done with copy & combine & strip */
 
-#ifndef HAVE_GETSERVBYPORT
-				default:
-#endif
-				case 80:
-				case 0:
-					url->scheme = estrndup("http", lenof("http"));
-					break;
-			
-#ifdef HAVE_GETSERVBYPORT
-				default:
-					if ((se = getservbyport(htons(url->port), "tcp")) && se->s_name) {
-						url->scheme = estrdup(se->s_name);
-					} else {
-						url->scheme = estrndup("http", lenof("http"));
-					}
-					break;
-#endif
-			}
-		} else {
-			url->scheme = estrndup("http", lenof("http"));
-		}
+	if (flags & PHP_HTTP_URL_FROM_ENV) {
+		/* free old_url we tainted above */
+		php_url_free(tmp_url);
+	}
+
+	/* set some sane defaults */
+
+	if (!url->scheme) {
+		url->scheme = estrndup("http", lenof("http"));
 	}
 
 	if (!url->host) {
-		if (flags & PHP_HTTP_URL_FROM_ENV) {
-			zval *zhost;
-			
-			if ((((zhost = php_http_env_get_server_var(ZEND_STRL("HTTP_HOST"), 1 TSRMLS_CC)) ||
-					(zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_NAME"), 1 TSRMLS_CC)))) && Z_STRLEN_P(zhost)) {
-				url->host = estrndup(Z_STRVAL_P(zhost), Z_STRLEN_P(zhost));
-			} else {
-				url->host = localhostname();
-			}
-		} else {
-			url->host = estrndup("localhost", lenof("localhost"));
-		}
+		url->host = estrndup("localhost", lenof("localhost"));
 	}
 	
 	if (!url->path) {
-		if ((flags & PHP_HTTP_URL_FROM_ENV) && SG(request_info).request_uri && SG(request_info).request_uri[0]) {
-			const char *q = strchr(SG(request_info).request_uri, '?');
-			
-			if (q) {
-				url->path = estrndup(SG(request_info).request_uri, q - SG(request_info).request_uri);
-			} else {
-				url->path = estrdup(SG(request_info).request_uri);
-			}
-		} else {
-			url->path = estrndup("/", 1);
-		}
+		url->path = estrndup("/", 1);
 	} else if (url->path[0] != '/') {
-		if ((flags & PHP_HTTP_URL_FROM_ENV) && SG(request_info).request_uri && SG(request_info).request_uri[0]) {
-			size_t ulen = strlen(SG(request_info).request_uri);
-			size_t plen = strlen(url->path);
-			char *path;
-			
-			if (SG(request_info).request_uri[ulen-1] != '/') {
-				for (--ulen; ulen && SG(request_info).request_uri[ulen - 1] != '/'; --ulen);
-			}
-			
-			path = emalloc(ulen + plen + 1);
-			memcpy(path, SG(request_info).request_uri, ulen);
-			memcpy(path + ulen, url->path, plen);
-			path[ulen + plen] = '\0';
-			STR_SET(url->path, path);
-		} else {
-			size_t plen = strlen(url->path);
-			char *path = emalloc(plen + 1 + 1);
-			
-			path[0] = '/';
-			memcpy(&path[1], url->path, plen + 1);
-			STR_SET(url->path, path);
-		}
+		size_t plen = strlen(url->path);
+		char *path = emalloc(plen + 1 + 1);
+
+		path[0] = '/';
+		memcpy(&path[1], url->path, plen + 1);
+		STR_SET(url->path, path);
 	}
 	/* replace directory references if path is not a single slash */
-	if (url->path[0] && (url->path[0] != '/' || url->path[1])) {
+	if ((flags & PHP_HTTP_URL_SANITIZE_PATH)
+	&&	url->path[0] && (url->path[0] != '/' || url->path[1])) {
 		char *ptr, *end = url->path + strlen(url->path) + 1;
 			
-		for (ptr = strstr(url->path, "/."); ptr; ptr = strstr(ptr, "/.")) {
-			switch (ptr[2]) {
-				case '\0':
-					ptr[1] = '\0';
-					break;
-				
+		for (ptr = strchr(url->path, '/'); ptr; ptr = strchr(ptr, '/')) {
+			switch (ptr[1]) {
 				case '/':
-					memmove(&ptr[1], &ptr[3], end - &ptr[3]);
+					memmove(&ptr[1], &ptr[2], end - &ptr[2]);
 					break;
 					
 				case '.':
-					if (ptr[3] == '/') {
-						char *pos = &ptr[4];
-						while (ptr != url->path) {
-							if (*--ptr == '/') {
+					switch (ptr[2]) {
+						case '\0':
+							ptr[1] = '\0';
+							break;
+
+						case '/':
+							memmove(&ptr[1], &ptr[3], end - &ptr[3]);
+							break;
+
+						case '.':
+							if (ptr[3] == '/') {
+								char *pos = &ptr[4];
+								while (ptr != url->path) {
+									if (*--ptr == '/') {
+										break;
+									}
+								}
+								memmove(&ptr[1], pos, end - pos);
 								break;
+							} else if (!ptr[3]) {
+								/* .. at the end */
+								ptr[1] = '\0';
 							}
-						}
-						memmove(&ptr[1], pos, end - pos);
-						break;
-					} else if (!ptr[3]) {
-						/* .. at the end */
-						ptr[1] = '\0';
+							/* no break */
+
+						default:
+							/* something else */
+							++ptr;
+							break;
 					}
-					/* fallthrough */
-				
+					break;
+
 				default:
-					/* something else */
 					++ptr;
 					break;
 			}
 		}
 	}
-	
+	/* unset default ports */
 	if (url->port) {
 		if (	((url->port == 80) && !strcmp(url->scheme, "http"))
 			||	((url->port ==443) && !strcmp(url->scheme, "https"))
-#ifdef HAVE_GETSERVBYNAME
-			||	((se = getservbyname(url->scheme, "tcp")) && se->s_port && 
-					(url->port == ntohs(se->s_port)))
-#endif
 		) {
 			url->port = 0;
 		}
 	}
 	
 	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) {
@@ -325,204 +267,167 @@ PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url
 	}
 }
 
-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)
+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)
 {
-	char *arg_sep;
+	const char *arg_sep_str;
 	size_t arg_sep_len;
 	php_http_buffer_t *qstr = php_http_buffer_new();
 
-	if (override_argsep || !(arg_sep_len = strlen(arg_sep = INI_STR("arg_separator.output")))) {
-		arg_sep = PHP_HTTP_URL_ARGSEP;
-		arg_sep_len = lenof(PHP_HTTP_URL_ARGSEP);
-	}
+	php_http_url_argsep(&arg_sep_str, &arg_sep_len TSRMLS_CC);
 
-	if (pre_encoded_len && pre_encoded_data) {
-		php_http_buffer_append(qstr, pre_encoded_data, pre_encoded_len);
-	}
-
-	if (SUCCESS != php_http_url_encode_hash_recursive(hash, qstr, arg_sep, arg_sep_len, NULL, 0)) {
+	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;
 	}
 
-	php_http_buffer_data(qstr, encoded_data, encoded_len);
+	php_http_buffer_data(qstr, encoded_str, encoded_len);
 	php_http_buffer_free(&qstr);
 
 	return SUCCESS;
 }
 
-PHP_HTTP_API STATUS php_http_url_encode_hash_recursive(HashTable *ht, php_http_buffer_t *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC)
+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;
+
+	return SUCCESS;
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl___construct, 0, 0, 0)
+	ZEND_ARG_INFO(0, old_url)
+	ZEND_ARG_INFO(0, new_url)
+	ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpUrl, __construct)
+{
+	zval *new_url = NULL, *old_url = NULL;
+	long flags = PHP_HTTP_URL_FROM_ENV;
+	zend_error_handling zeh;
+
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!z!l", &old_url, &new_url, &flags), invalid_arg, return);
+
+	zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
+	{
+		php_url *res_purl, *new_purl = NULL, *old_purl = NULL;
+
+		if (new_url) {
+			switch (Z_TYPE_P(new_url)) {
+				case IS_OBJECT:
+				case IS_ARRAY:
+					new_purl = php_http_url_from_struct(NULL, HASH_OF(new_url) TSRMLS_CC);
+					break;
+				default: {
+					zval *cpy = php_http_ztyp(IS_STRING, new_url);
+
+					new_purl = php_url_parse(Z_STRVAL_P(cpy));
+					zval_ptr_dtor(&cpy);
+					break;
+				}
 			}
-			if (key.len && key.str[key.len - 1] == '\0') {
-				--key.len;
+			if (!new_purl) {
+				zend_restore_error_handling(&zeh TSRMLS_CC);
+				return;
 			}
-			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 && prefix_len) {
-				php_http_buffer_append(&new_prefix, prefix, prefix_len);
-				php_http_buffer_appends(&new_prefix, "%5B");
+		if (old_url) {
+			switch (Z_TYPE_P(old_url)) {
+				case IS_OBJECT:
+				case IS_ARRAY:
+					old_purl = php_http_url_from_struct(NULL, HASH_OF(old_url) TSRMLS_CC);
+					break;
+				default: {
+					zval *cpy = php_http_ztyp(IS_STRING, old_url);
+
+					old_purl = php_url_parse(Z_STRVAL_P(cpy));
+					zval_ptr_dtor(&cpy);
+					break;
+				}
 			}
-			
-			php_http_buffer_append(&new_prefix, encoded_key, encoded_len);
-			efree(encoded_key);
-			
-			if (prefix && prefix_len) {
-				php_http_buffer_appends(&new_prefix, "%5D");
+			if (!old_purl) {
+				if (new_purl) {
+					php_url_free(new_purl);
+				}
+				zend_restore_error_handling(&zeh TSRMLS_CC);
+				return;
 			}
-			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_recursive(HASH_OF(*data), str, arg_sep, arg_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, arg_sep_len);
-			}
-			php_http_buffer_append(str, PHP_HTTP_BUFFER_VAL(&new_prefix), PHP_HTTP_BUFFER_LEN(&new_prefix));
-			php_http_buffer_appends(str, "=");
-			
-			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_url(flags, old_purl, new_purl, &res_purl, NULL, NULL TSRMLS_CC);
+		php_http_url_to_struct(res_purl, getThis() TSRMLS_CC);
+
+		php_url_free(res_purl);
+		if (old_purl) {
+			php_url_free(old_purl);
+		}
+		if (new_purl) {
+			php_url_free(new_purl);
 		}
-		php_http_buffer_dtor(&new_prefix);
 	}
-	return SUCCESS;
+	zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
-#define PHP_HTTP_BEGIN_ARGS(method, req_args) 	PHP_HTTP_BEGIN_ARGS_EX(HttpUrl, method, 0, req_args)
-#define PHP_HTTP_EMPTY_ARGS(method)				PHP_HTTP_EMPTY_ARGS_EX(HttpUrl, method, 0)
-#define PHP_HTTP_URL_ME(method, visibility)	PHP_ME(HttpUrl, method, PHP_HTTP_ARGS(HttpUrl, method), visibility)
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_mod, 0, 0, 1)
+	ZEND_ARG_INFO(0, more_url_parts)
+	ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpUrl, mod)
+{
+	zval *new_url = NULL;
+	long flags = PHP_HTTP_URL_JOIN_PATH | PHP_HTTP_URL_JOIN_QUERY;
+	zend_error_handling zeh;
 
-PHP_HTTP_BEGIN_ARGS(__construct, 0)
-	PHP_HTTP_ARG_VAL(old_url, 0)
-	PHP_HTTP_ARG_VAL(new_url, 0)
-	PHP_HTTP_ARG_VAL(flags, 0)
-PHP_HTTP_END_ARGS;
-PHP_HTTP_EMPTY_ARGS(toString);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!|l", &new_url, &flags), invalid_arg, return);
 
-zend_class_entry *php_http_url_class_entry;
-zend_function_entry php_http_url_method_entry[] = {
-	PHP_HTTP_URL_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-	PHP_HTTP_URL_ME(toString, ZEND_ACC_PUBLIC)
-	ZEND_MALIAS(HttpUrl, __toString, toString, PHP_HTTP_ARGS(HttpUrl, toString), ZEND_ACC_PUBLIC)
-	EMPTY_FUNCTION_ENTRY
-};
+	zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
+	{
+		php_url *new_purl = NULL, *old_purl = NULL;
 
-PHP_METHOD(HttpUrl, __construct)
-{
-	with_error_handling(EH_THROW, php_http_exception_class_entry) {
-		zval *new_url = NULL, *old_url = NULL;
-		long flags = PHP_HTTP_URL_FROM_ENV;
-
-		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!z!l", &old_url, &new_url, &flags)) {
-			with_error_handling(EH_THROW, php_http_exception_class_entry) {
-				php_url *res_purl, *new_purl = NULL, *old_purl = NULL;
-
-				if (new_url) {
-					switch (Z_TYPE_P(new_url)) {
-						case IS_OBJECT:
-						case IS_ARRAY:
-							new_purl = php_http_url_from_struct(NULL, HASH_OF(new_url) TSRMLS_CC);
-							break;
-						default: {
-							zval *cpy = php_http_ztyp(IS_STRING, new_url);
+		if (new_url) {
+			switch (Z_TYPE_P(new_url)) {
+				case IS_OBJECT:
+				case IS_ARRAY:
+					new_purl = php_http_url_from_struct(NULL, HASH_OF(new_url) TSRMLS_CC);
+					break;
+				default: {
+					zval *cpy = php_http_ztyp(IS_STRING, new_url);
 
-							new_purl = php_url_parse(Z_STRVAL_P(new_url));
-							zval_ptr_dtor(&cpy);
-							break;
-						}
-					}
-					if (!new_purl) {
-						return;
-					}
+					new_purl = php_url_parse(Z_STRVAL_P(new_url));
+					zval_ptr_dtor(&cpy);
+					break;
 				}
-				if (old_url) {
-					switch (Z_TYPE_P(old_url)) {
-						case IS_OBJECT:
-						case IS_ARRAY:
-							old_purl = php_http_url_from_struct(NULL, HASH_OF(old_url) TSRMLS_CC);
-							break;
-						default: {
-							zval *cpy = php_http_ztyp(IS_STRING, old_url);
+			}
+			if (!new_purl) {
+				zend_restore_error_handling(&zeh TSRMLS_CC);
+				return;
+			}
+		}
 
-							old_purl = php_url_parse(Z_STRVAL_P(old_url));
-							zval_ptr_dtor(&cpy);
-							break;
-						}
-					}
-					if (!old_purl) {
-						if (new_purl) {
-							php_url_free(new_purl);
-						}
-						return;
-					}
-				}
+		if ((old_purl = php_http_url_from_struct(NULL, HASH_OF(getThis()) TSRMLS_CC))) {
+			php_url *res_purl;
 
-				php_http_url(flags, old_purl, new_purl, &res_purl, NULL, NULL TSRMLS_CC);
-				php_http_url_to_struct(res_purl, getThis() TSRMLS_CC);
+			ZVAL_OBJVAL(return_value, zend_objects_clone_obj(getThis() TSRMLS_CC), 0);
 
-				php_url_free(res_purl);
-				if (old_purl) {
-					php_url_free(old_purl);
-				}
-				if (new_purl) {
-					php_url_free(new_purl);
-				}
-			} end_error_handling();
+			php_http_url(flags, old_purl, new_purl, &res_purl, NULL, NULL TSRMLS_CC);
+			php_http_url_to_struct(res_purl, return_value TSRMLS_CC);
+
+			php_url_free(res_purl);
+			php_url_free(old_purl);
 		}
-	} end_error_handling();
+		if (new_purl) {
+			php_url_free(new_purl);
+		}
+	}
+	zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_toString, 0, 0, 0)
+ZEND_END_ARG_INFO();
 PHP_METHOD(HttpUrl, toString)
 {
 	if (SUCCESS == zend_parse_parameters_none()) {
@@ -540,9 +445,39 @@ PHP_METHOD(HttpUrl, toString)
 	RETURN_EMPTY_STRING();
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_toArray, 0, 0, 0)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpUrl, toArray)
+{
+	php_url *purl;
+
+	if (SUCCESS != zend_parse_parameters_none()) {
+		return;
+	}
+
+	/* strip any non-URL properties */
+	purl = php_http_url_from_struct(NULL, HASH_OF(getThis()) TSRMLS_CC);
+	php_http_url_to_struct(purl, return_value TSRMLS_CC);
+	php_url_free(purl);
+}
+
+static zend_function_entry php_http_url_methods[] = {
+	PHP_ME(HttpUrl, __construct,  ai_HttpUrl___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(HttpUrl, mod,          ai_HttpUrl_mod, ZEND_ACC_PUBLIC)
+	PHP_ME(HttpUrl, toString,     ai_HttpUrl_toString, ZEND_ACC_PUBLIC)
+	ZEND_MALIAS(HttpUrl, __toString, toString, ai_HttpUrl_toString, ZEND_ACC_PUBLIC)
+	PHP_ME(HttpUrl, toArray,      ai_HttpUrl_toArray, ZEND_ACC_PUBLIC)
+	EMPTY_FUNCTION_ENTRY
+};
+
+zend_class_entry *php_http_url_class_entry;
+
 PHP_MINIT_FUNCTION(http_url)
 {
-	PHP_HTTP_REGISTER_CLASS(http, Url, http_url, php_http_object_class_entry, 0);
+	zend_class_entry ce = {0};
+
+	INIT_NS_CLASS_ENTRY(ce, "http", "Url", php_http_url_methods);
+	php_http_url_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
 
 	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("scheme"), ZEND_ACC_PUBLIC TSRMLS_CC);
 	zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("user"), ZEND_ACC_PUBLIC TSRMLS_CC);
@@ -565,6 +500,7 @@ PHP_MINIT_FUNCTION(http_url)
 	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_FRAGMENT"), PHP_HTTP_URL_STRIP_FRAGMENT TSRMLS_CC);
 	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_ALL"), PHP_HTTP_URL_STRIP_ALL TSRMLS_CC);
 	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("FROM_ENV"), PHP_HTTP_URL_FROM_ENV TSRMLS_CC);
+	zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("SANITIZE_PATH"), PHP_HTTP_URL_SANITIZE_PATH TSRMLS_CC);
 
 	return SUCCESS;
 }