simplify
[m6w6/ext-http] / php_http_url.c
index fd4ec2bf11db3f06cec4d0cc5080c24dcd3387d2..05850e8c42a74482c90a8725147ebf4d4d36f751 100644 (file)
@@ -6,14 +6,26 @@
     | 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>            |
     +--------------------------------------------------------------------+
 */
 
-#include "php_http.h"
+#include "php_http_api.h"
 
-#include <main/SAPI.h>
-#include <ext/standard/php_string.h>
+#ifdef PHP_HTTP_HAVE_IDN
+#      include <idna.h>
+#endif
+
+#ifdef PHP_HTTP_HAVE_WCHAR
+#      include <wchar.h>
+#      include <wctype.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#      include <arpa/inet.h>
+#endif
+
+#include "php_http_utf8.h"
 
 static inline char *localhostname(void)
 {
@@ -45,35 +57,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)
@@ -134,186 +185,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) {
@@ -323,7 +282,7 @@ 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, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, 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)
 {
        const char *arg_sep_str;
        size_t arg_sep_len;
@@ -331,11 +290,7 @@ PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, const char *pre_en
 
        php_http_url_argsep(&arg_sep_str, &arg_sep_len TSRMLS_CC);
 
-       if (pre_encoded_len && pre_encoded_str) {
-               php_http_buffer_append(qstr, pre_encoded_str, pre_encoded_len);
-       }
-
-       if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, ZEND_STRL("="), NULL, 0 TSRMLS_CC)) {
+       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;
        }
@@ -346,178 +301,814 @@ PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, const char *pre_en
        return SUCCESS;
 }
 
-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)
+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;
+
+       return SUCCESS;
+}
+
+struct parse_state {
+       php_http_url_t url;
+#ifdef ZTS
+       void ***ts;
+#endif
+       const char *ptr;
+       const char *end;
+       size_t maxlen;
+       off_t offset;
+       unsigned flags;
+       char buffer[1]; /* last member */
+};
+
+void php_http_url_free(php_http_url_t **url)
+{
+       if (*url) {
+               efree(*url);
+               *url = NULL;
        }
-       
-       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;
+}
+
+static size_t parse_mb_utf8(unsigned *wc, const char *ptr, const char *end)
+{
+       unsigned wchar;
+       size_t consumed = utf8towc(&wchar, (const unsigned char *) ptr, end - ptr);
+
+       if (!consumed || consumed == (size_t) -1) {
+               return 0;
+       }
+
+       if (wc) {
+               *wc = wchar;
+       }
+       return consumed;
+}
+
+#ifdef PHP_HTTP_HAVE_WCHAR
+static size_t parse_mb_loc(unsigned *wc, const char *ptr, const char *end)
+{
+       wchar_t wchar;
+       size_t consumed = 0;
+#if defined(HAVE_MBRTOWC)
+       mbstate_t ps = {0};
+
+       consumed = mbrtowc(&wchar, ptr, end - ptr, &ps);
+#elif defined(HAVE_MBTOWC)
+       consumed = mbtowc(&wchar, ptr, end - ptr);
+#endif
+
+       if (!consumed || consumed == (size_t) -1) {
+               return 0;
+       }
+
+       if (wc) {
+               *wc = wchar;
+       }
+       return consumed;
+}
+#endif
+
+typedef enum parse_mb_what {
+       PARSE_SCHEME,
+       PARSE_USERINFO,
+       PARSE_HOSTINFO,
+       PARSE_PATH,
+       PARSE_QUERY,
+       PARSE_FRAGMENT
+} parse_mb_what_t;
+
+static const char * const parse_what[] = {
+       "scheme",
+       "userinfo",
+       "hostinfo",
+       "path",
+       "query",
+       "fragment"
+};
+
+static const char parse_xdigits[] = "0123456789ABCDEF";
+
+static size_t parse_mb(struct parse_state *state, parse_mb_what_t what, const char *ptr, const char *end, const char *begin, zend_bool silent)
+{
+       unsigned wchar;
+       size_t consumed = 0;
+
+       if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) {
+               consumed = parse_mb_utf8(&wchar, ptr, end);
+       }
+#ifdef PHP_HTTP_HAVE_WCHAR
+       else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) {
+               consumed = parse_mb_loc(&wchar, ptr, end);
+       }
+#endif
+
+       while (consumed) {
+               if (!(state->flags & PHP_HTTP_URL_PARSE_TOPCT) || what == PARSE_HOSTINFO || what == PARSE_SCHEME) {
+                       if (what == PARSE_HOSTINFO && (state->flags & PHP_HTTP_URL_PARSE_TOIDN)) {
+                               /* idna */
+                       } else if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) {
+                               if (!isualnum(wchar)) {
+                                       break;
+                               }
+#ifdef PHP_HTTP_HAVE_WCHAR
+                       } else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) {
+                               if (!iswalnum(wchar)) {
+                                       break;
+                               }
+#endif
+                       }
+                       PHP_HTTP_DUFF(consumed, state->buffer[state->offset++] = *ptr++);
+               } else {
+                       int i = 0;
+
+                       PHP_HTTP_DUFF(consumed,
+                                       state->buffer[state->offset++] = '%';
+                                       state->buffer[state->offset++] = parse_xdigits[((unsigned char) ptr[i]) >> 4];
+                                       state->buffer[state->offset++] = parse_xdigits[((unsigned char) ptr[i]) & 0xf];
+                                       ++i;
+                       );
                }
-               
-               if (key.type == HASH_KEY_IS_STRING) {
-                       if (!*key.str) {
-                               /* only public properties */
-                               continue;
+
+               return consumed;
+       }
+
+       if (!silent) {
+               TSRMLS_FETCH_FROM_CTX(state->ts);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                               "Failed to parse %s; unexpected byte 0x%02x at pos %u in '%s'",
+                               parse_what[what], (unsigned char) *ptr, (unsigned) (ptr - begin), begin);
+       }
+
+       return 0;
+}
+
+static STATUS parse_userinfo(struct parse_state *state, const char *ptr)
+{
+       size_t mb;
+       const char *password = NULL, *end = state->ptr, *tmp = ptr;
+       TSRMLS_FETCH_FROM_CTX(state->ts);
+
+       state->url.user = &state->buffer[state->offset];
+
+       do {
+               switch (*ptr) {
+               case ':':
+                       if (password) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                               "Failed to parse password; duplicate ':' at pos %u in '%s'",
+                                               (unsigned) (ptr - tmp), tmp);
+                               return FAILURE;
                        }
-                       if (key.len && key.str[key.len - 1] == '\0') {
-                               --key.len;
+                       password = ptr + 1;
+                       state->buffer[state->offset++] = 0;
+                       state->url.pass = &state->buffer[state->offset];
+                       break;
+
+               case '%':
+                       if (ptr[1] != '%' && (end - ptr <= 2 || !isxdigit(*(ptr+1)) || !isxdigit(*(ptr+2)))) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                               "Failed to parse userinfo; invalid percent encoding at pos %u in '%s'",
+                                               (unsigned) (ptr - tmp), tmp);
+                               return FAILURE;
+                       }
+                       state->buffer[state->offset++] = *ptr++;
+                       state->buffer[state->offset++] = *ptr++;
+                       state->buffer[state->offset++] = *ptr;
+                       break;
+
+               case '!': case '$': case '&': case '\'': case '(': case ')': case '*':
+               case '+': case ',': case ';': case '=': /* sub-delims */
+               case '-': case '.': case '_': case '~': /* unreserved */
+               case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
+               case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
+               case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
+               case 'V': case 'W': case 'X': case 'Y': case 'Z':
+               case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
+               case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
+               case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
+               case 'v': case 'w': case 'x': case 'y': case 'z':
+               case '0': case '1': case '2': case '3': case '4': case '5': case '6':
+               case '7': case '8': case '9':
+                       /* allowed */
+                       state->buffer[state->offset++] = *ptr;
+                       break;
+
+               default:
+                       if (!(mb = parse_mb(state, PARSE_USERINFO, ptr, end, tmp, 0))) {
+                               return FAILURE;
+                       }
+                       ptr += mb - 1;
+               }
+       } while(++ptr != end);
+
+
+       state->buffer[state->offset++] = 0;
+
+       return SUCCESS;
+}
+
+static STATUS parse_hostinfo(struct parse_state *state, const char *ptr)
+{
+       size_t mb, len;
+       const char *end = state->ptr, *tmp = ptr, *port = NULL;
+       TSRMLS_FETCH_FROM_CTX(state->ts);
+
+
+#ifdef HAVE_INET_PTON
+       if (*ptr == '[') {
+               char *error = NULL, *tmp = memchr(ptr, ']', end - ptr);
+
+               if (tmp) {
+                       size_t addrlen = tmp - ptr + 1;
+                       char buf[16], *addr = estrndup(ptr + 1, addrlen - 2);
+                       int rv = inet_pton(AF_INET6, addr, buf);
+
+                       efree(addr);
+                       if (rv == 1) {
+                               state->buffer[state->offset] = '[';
+                               state->url.host = &state->buffer[state->offset];
+                               inet_ntop(AF_INET6, buf, state->url.host + 1, state->maxlen - state->offset);
+                               state->offset += strlen(state->url.host);
+                               state->buffer[state->offset++] = ']';
+                               state->buffer[state->offset++] = 0;
+                               ptr = tmp + 1;
+                       } else if (rv == -1) {
+                               error = strerror(errno);
+                       } else {
+                               error = "unexpected '['";
                        }
-                       encoded_key = php_url_encode(key.str, key.len, &encoded_len);
                } else {
-                       encoded_len = spprintf(&encoded_key, 0, "%ld", key.num);
+                       error = "expected ']'";
                }
-               
-               {
-                       php_http_buffer_init(&new_prefix);
-                       if (prefix_str && prefix_len) {
-                               php_http_buffer_append(&new_prefix, prefix_str, prefix_len);
-                               php_http_buffer_appends(&new_prefix, "%5B");
+
+               if (error) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse hostinfo; %s", error);
+                       return FAILURE;
+               }
+       }
+#endif
+       if (ptr != end) do {
+               switch (*ptr) {
+               case ':':
+                       if (port) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                               "Failed to parse port; unexpected ':' at pos %u in '%s'",
+                                               (unsigned) (ptr - tmp), tmp);
+                               return FAILURE;
                        }
-                       
-                       php_http_buffer_append(&new_prefix, encoded_key, encoded_len);
-                       efree(encoded_key);
-                       
-                       if (prefix_str && prefix_len) {
-                               php_http_buffer_appends(&new_prefix, "%5D");
-                       }
-                       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_ex(HASH_OF(*data), str, arg_sep_str, arg_sep_len, val_sep_str, val_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);
+                       port = ptr + 1;
+                       break;
+
+               case '%':
+                       if (ptr[1] != '%' && (end - ptr <= 2 || !isxdigit(*(ptr+1)) || !isxdigit(*(ptr+2)))) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                               "Failed to parse hostinfo; invalid percent encoding at pos %u in '%s'",
+                                               (unsigned) (ptr - tmp), tmp);
                                return FAILURE;
                        }
-               } else {
-                       zval *val = php_http_ztyp(IS_STRING, *data);
-                       
-                       if (PHP_HTTP_BUFFER_LEN(str)) {
-                               php_http_buffer_append(str, arg_sep_str, arg_sep_len);
+                       state->buffer[state->offset++] = *ptr++;
+                       state->buffer[state->offset++] = *ptr++;
+                       state->buffer[state->offset++] = *ptr;
+                       break;
+
+               case '!': case '$': case '&': case '\'': case '(': case ')': case '*':
+               case '+': case ',': case ';': case '=': /* sub-delims */
+               case '-': case '.': case '_': case '~': /* unreserved */
+               case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
+               case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
+               case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
+               case 'V': case 'W': case 'X': case 'Y': case 'Z':
+               case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
+               case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
+               case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
+               case 'v': case 'w': case 'x': case 'y': case 'z':
+                       if (port) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                               "Failed to parse port; unexpected char '%c' at pos %u in '%s'",
+                                               (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
+                               return FAILURE;
                        }
-                       php_http_buffer_append(str, PHP_HTTP_BUFFER_VAL(&new_prefix), PHP_HTTP_BUFFER_LEN(&new_prefix));
-                       php_http_buffer_append(str, val_sep_str, val_sep_len);
-                       
-                       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);
+                       /* no break */
+               case '0': case '1': case '2': case '3': case '4': case '5': case '6':
+               case '7': case '8': case '9':
+                       /* allowed */
+                       if (port) {
+                               state->url.port *= 10;
+                               state->url.port += *ptr - '0';
+                       } else {
+                               state->buffer[state->offset++] = *ptr;
                        }
-                       
-                       zval_ptr_dtor(&val);
+                       break;
+
+               default:
+                       if (port) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                               "Failed to parse port; unexpected byte 0x%02x at pos %u in '%s'",
+                                               (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
+                               return FAILURE;
+                       } else if (!(mb = parse_mb(state, PARSE_HOSTINFO, ptr, end, tmp, 0))) {
+                               return FAILURE;
+                       }
+                       ptr += mb - 1;
                }
-               php_http_buffer_dtor(&new_prefix);
+       } while (++ptr != end);
+
+       if (!state->url.host) {
+               len = (port ? port - tmp - 1 : end - tmp);
+               state->url.host = &state->buffer[state->offset - len];
+               state->buffer[state->offset++] = 0;
        }
+
+#ifdef PHP_HTTP_HAVE_IDN
+       if (state->flags & PHP_HTTP_URL_PARSE_TOIDN) {
+               char *idn = NULL;
+               int rv = -1;
+
+               if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) {
+                       rv = idna_to_ascii_8z(state->url.host, &idn, IDNA_ALLOW_UNASSIGNED|IDNA_USE_STD3_ASCII_RULES);
+               }
+#      ifdef PHP_HTTP_HAVE_WCHAR
+               else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) {
+                       rv = idna_to_ascii_lz(state->url.host, &idn, IDNA_ALLOW_UNASSIGNED|IDNA_USE_STD3_ASCII_RULES);
+               }
+#      endif
+               if (rv != IDNA_SUCCESS) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idna_strerror(rv));
+                       return FAILURE;
+               } else {
+                       size_t idnlen = strlen(idn);
+                       memcpy(state->url.host, idn, idnlen + 1);
+                       free(idn);
+                       state->offset += idnlen - len;
+               }
+       }
+#endif
+
        return SUCCESS;
 }
 
-#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)
+static const char *parse_authority(struct parse_state *state)
+{
+       const char *tmp = state->ptr, *host = NULL;
 
-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);
+       do {
+               switch (*state->ptr) {
+               case '@':
+                       /* userinfo delimiter */
+                       if (host) {
+                               TSRMLS_FETCH_FROM_CTX(state->ts);
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                               "Failed to parse userinfo; unexpected '@'");
+                               return NULL;
+                       }
+                       host = state->ptr + 1;
+                       if (tmp != state->ptr && SUCCESS != parse_userinfo(state, tmp)) {
+                               return NULL;
+                       }
+                       tmp = state->ptr + 1;
+                       break;
 
-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
-};
+               case '/':
+               case '?':
+               case '#':
+               case '\0':
+                       /* host delimiter */
+                       if (tmp != state->ptr && SUCCESS != parse_hostinfo(state, tmp)) {
+                               return NULL;
+                       }
+                       return state->ptr;
+               }
+       } while (++state->ptr <= state->end);
 
-PHP_METHOD(HttpUrl, __construct)
+       return NULL;
+}
+
+static const char *parse_path(struct parse_state *state)
 {
-       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);
+       size_t mb;
+       const char *tmp;
+       TSRMLS_FETCH_FROM_CTX(state->ts);
 
-                                                       new_purl = php_url_parse(Z_STRVAL_P(new_url));
-                                                       zval_ptr_dtor(&cpy);
-                                                       break;
-                                               }
-                                       }
-                                       if (!new_purl) {
-                                               return;
-                                       }
-                               }
-                               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);
+       /* is there actually a path to parse? */
+       if (!*state->ptr) {
+               return state->ptr;
+       }
+       tmp = state->ptr;
+       state->url.path = &state->buffer[state->offset];
 
-                                                       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;
-                                       }
+       do {
+               switch (*state->ptr) {
+               case '#':
+               case '?':
+               case '\0':
+                       /* did we have any path component ? */
+                       if (tmp != state->ptr) {
+                               state->buffer[state->offset++] = 0;
+                       } else {
+                               state->url.path = NULL;
+                       }
+                       return state->ptr;
+
+               case '%':
+                       if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                               "Failed to parse path; invalid percent encoding at pos %u in '%s'",
+                                               (unsigned) (state->ptr - tmp), tmp);
+                               return NULL;
+                       }
+                       state->buffer[state->offset++] = *state->ptr++;
+                       state->buffer[state->offset++] = *state->ptr++;
+                       state->buffer[state->offset++] = *state->ptr;
+                       break;
+
+               case '/': /* yeah, well */
+               case '!': case '$': case '&': case '\'': case '(': case ')': case '*':
+               case '+': case ',': case ';': case '=': /* sub-delims */
+               case '-': case '.': case '_': case '~': /* unreserved */
+               case ':': case '@': /* pchar */
+               case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
+               case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
+               case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
+               case 'V': case 'W': case 'X': case 'Y': case 'Z':
+               case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
+               case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
+               case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
+               case 'v': case 'w': case 'x': case 'y': case 'z':
+               case '0': case '1': case '2': case '3': case '4': case '5': case '6':
+               case '7': case '8': case '9':
+                       /* allowed */
+                       state->buffer[state->offset++] = *state->ptr;
+                       break;
+
+               default:
+                       if (!(mb = parse_mb(state, PARSE_PATH, state->ptr, state->end, tmp, 0))) {
+                               return NULL;
+                       }
+                       state->ptr += mb - 1;
+               }
+       } while (++state->ptr <= state->end);
+
+       return NULL;
+}
+
+static const char *parse_query(struct parse_state *state)
+{
+       size_t mb;
+       const char *tmp = state->ptr + !!*state->ptr;
+       TSRMLS_FETCH_FROM_CTX(state->ts);
+
+       /* is there actually a query to parse? */
+       if (*state->ptr != '?') {
+               return state->ptr;
+       }
+
+       /* skip initial '?' */
+       tmp = ++state->ptr;
+       state->url.query = &state->buffer[state->offset];
+
+       do {
+               switch (*state->ptr) {
+               case '#':
+               case '\0':
+                       state->buffer[state->offset++] = 0;
+                       return state->ptr;
+
+               case '%':
+                       if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                               "Failed to parse query; invalid percent encoding at pos %u in '%s'",
+                                               (unsigned) (state->ptr - tmp), tmp);
+                               return NULL;
+                       }
+                       state->buffer[state->offset++] = *state->ptr++;
+                       state->buffer[state->offset++] = *state->ptr++;
+                       state->buffer[state->offset++] = *state->ptr;
+                       break;
+
+               case '?': case '/': /* yeah, well */
+               case '!': case '$': case '&': case '\'': case '(': case ')': case '*':
+               case '+': case ',': case ';': case '=': /* sub-delims */
+               case '-': case '.': case '_': case '~': /* unreserved */
+               case ':': case '@': /* pchar */
+               case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
+               case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
+               case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
+               case 'V': case 'W': case 'X': case 'Y': case 'Z':
+               case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
+               case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
+               case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
+               case 'v': case 'w': case 'x': case 'y': case 'z':
+               case '0': case '1': case '2': case '3': case '4': case '5': case '6':
+               case '7': case '8': case '9':
+                       /* allowed */
+                       state->buffer[state->offset++] = *state->ptr;
+                       break;
+
+               default:
+                       if (!(mb = parse_mb(state, PARSE_QUERY, state->ptr, state->end, tmp, 0))) {
+                               return NULL;
+                       }
+                       state->ptr += mb - 1;
+               }
+       } while (++state->ptr <= state->end);
+
+       return NULL;
+}
+
+static const char *parse_fragment(struct parse_state *state)
+{
+       size_t mb;
+       const char *tmp;
+       TSRMLS_FETCH_FROM_CTX(state->ts);
+
+       /* is there actually a fragment to parse? */
+       if (*state->ptr != '#') {
+               return state->ptr;
+       }
+
+       /* skip initial '#' */
+       tmp = ++state->ptr;
+       state->url.fragment = &state->buffer[state->offset];
+
+       do {
+               switch (*state->ptr) {
+               case '\0':
+                       state->buffer[state->offset++] = 0;
+                       return state->ptr;
+
+               case '%':
+                       if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                               "Failed to parse fragment; invalid percent encoding at pos %u in '%s'",
+                                               (unsigned) (state->ptr - tmp), tmp);
+                               return NULL;
+                       }
+                       state->buffer[state->offset++] = *state->ptr++;
+                       state->buffer[state->offset++] = *state->ptr++;
+                       state->buffer[state->offset++] = *state->ptr;
+                       break;
+
+               case '?': case '/':
+               case '!': case '$': case '&': case '\'': case '(': case ')': case '*':
+               case '+': case ',': case ';': case '=': /* sub-delims */
+               case '-': case '.': case '_': case '~': /* unreserved */
+               case ':': case '@': /* pchar */
+               case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
+               case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
+               case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
+               case 'V': case 'W': case 'X': case 'Y': case 'Z':
+               case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
+               case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
+               case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
+               case 'v': case 'w': case 'x': case 'y': case 'z':
+               case '0': case '1': case '2': case '3': case '4': case '5': case '6':
+               case '7': case '8': case '9':
+                       /* allowed */
+                       state->buffer[state->offset++] = *state->ptr;
+                       break;
+
+               default:
+                       if (!(mb = parse_mb(state, PARSE_FRAGMENT, state->ptr, state->end, tmp, 0))) {
+                               return NULL;
+                       }
+                       state->ptr += mb - 1;
+               }
+       } while (++state->ptr <= state->end);
+
+       return NULL;
+}
+
+static const char *parse_hier(struct parse_state *state)
+{
+       if (*state->ptr == '/') {
+               if (state->end - state->ptr > 1) {
+                       if (*(state->ptr + 1) == '/') {
+                               state->ptr += 2;
+                               if (!(state->ptr = parse_authority(state))) {
+                                       return NULL;
                                }
+                       }
+               }
+       }
+       return parse_path(state);
+}
+
+static const char *parse_scheme(struct parse_state *state)
+{
+       size_t mb;
+       const char *tmp = state->ptr;
+
+       do {
+               switch (*state->ptr) {
+               case ':':
+                       /* scheme delimiter */
+                       state->url.scheme = &state->buffer[0];
+                       state->buffer[state->offset++] = 0;
+                       return ++state->ptr;
+
+               case '0': case '1': case '2': case '3': case '4': case '5': case '6':
+               case '7': case '8': case '9':
+               case '+': case '-': case '.':
+                       if (state->ptr == tmp) {
+                               return tmp;
+                       }
+                       /* no break */
+               case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
+               case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
+               case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
+               case 'V': case 'W': case 'X': case 'Y': case 'Z':
+               case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
+               case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
+               case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
+               case 'v': case 'w': case 'x': case 'y': case 'z':
+                       /* scheme part */
+                       state->buffer[state->offset++] = *state->ptr;
+                       break;
+
+               default:
+                       if (!(mb = parse_mb(state, PARSE_SCHEME, state->ptr, state->end, tmp, 1))) {
+                               /* soft fail; parse path next */
+                               return tmp;
+                       }
+                       state->ptr += mb - 1;
+               }
+       } while (++state->ptr != state->end);
+
+       return tmp;
+}
+
+php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags TSRMLS_DC)
+{
+       size_t maxlen = 3 * len;
+       struct parse_state *state = ecalloc(1, sizeof(*state) + maxlen);
+
+       state->end = str + len;
+       state->ptr = str;
+       state->flags = flags;
+       state->maxlen = maxlen;
+       TSRMLS_SET_CTX(state->ts);
+
+       if (!parse_scheme(state)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse URL scheme: '%s'", state->ptr);
+               efree(state);
+               return NULL;
+       }
+
+       if (!parse_hier(state)) {
+               efree(state);
+               return NULL;
+       }
+
+       if (!parse_query(state)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse URL query: '%s'", state->ptr);
+               efree(state);
+               return NULL;
+       }
+
+       if (!parse_fragment(state)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse URL fragment: '%s'", state->ptr);
+               efree(state);
+               return NULL;
+       }
+
+       return (php_http_url_t *) state;
+}
+
+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);
 
-                               php_http_url(flags, old_purl, new_purl, &res_purl, NULL, NULL TSRMLS_CC);
-                               php_http_url_to_struct(res_purl, getThis() TSRMLS_CC);
+       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;
 
-                               php_url_free(res_purl);
-                               if (old_purl) {
-                                       php_url_free(old_purl);
+               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 (!new_purl) {
+                               zend_restore_error_handling(&zeh TSRMLS_CC);
+                               return;
+                       }
+               }
+               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;
+                               }
+                       }
+                       if (!old_purl) {
                                if (new_purl) {
                                        php_url_free(new_purl);
                                }
-                       } end_error_handling();
+                               zend_restore_error_handling(&zeh TSRMLS_CC);
+                               return;
+                       }
+               }
+
+               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);
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+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_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!|l", &new_url, &flags), invalid_arg, return);
+
+       zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
+       {
+               php_url *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(new_url));
+                                       zval_ptr_dtor(&cpy);
+                                       break;
+                               }
+                       }
+                       if (!new_purl) {
+                               zend_restore_error_handling(&zeh TSRMLS_CC);
+                               return;
+                       }
                }
-       } end_error_handling();
+
+               if ((old_purl = php_http_url_from_struct(NULL, HASH_OF(getThis()) TSRMLS_CC))) {
+                       php_url *res_purl;
+
+                       ZVAL_OBJVAL(return_value, zend_objects_clone_obj(getThis() TSRMLS_CC), 0);
+
+                       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);
+               }
+               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()) {
@@ -535,9 +1126,94 @@ 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);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_parse, 0, 0, 1)
+       ZEND_ARG_INFO(0, url)
+       ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
+PHP_METHOD(HttpUrl, parse)
+{
+       char *str;
+       int len;
+       long flags = 0;
+       php_http_url_t *url;
+       zend_error_handling zeh;
+
+       php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &str, &len, &flags), invalid_arg, return);
+
+       zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
+       if ((url = php_http_url_parse(str, len, flags TSRMLS_CC))) {
+               object_init_ex(return_value, php_http_url_class_entry);
+               if (url->scheme) {
+                       zend_update_property_string(php_http_url_class_entry, return_value,
+                                       ZEND_STRL("scheme"), url->scheme TSRMLS_CC);
+               }
+               if (url->user) {
+                       zend_update_property_string(php_http_url_class_entry, return_value,
+                                       ZEND_STRL("user"), url->user TSRMLS_CC);
+               }
+               if (url->pass) {
+                       zend_update_property_string(php_http_url_class_entry, return_value,
+                                       ZEND_STRL("pass"), url->pass TSRMLS_CC);
+               }
+               if (url->host) {
+                       zend_update_property_string(php_http_url_class_entry, return_value,
+                                       ZEND_STRL("host"), url->host TSRMLS_CC);
+               }
+               if (url->port) {
+                       zend_update_property_long(php_http_url_class_entry, return_value,
+                                       ZEND_STRL("port"), url->port TSRMLS_CC);
+               }
+               if (url->path) {
+                       zend_update_property_string(php_http_url_class_entry, return_value,
+                                       ZEND_STRL("path"), url->path TSRMLS_CC);
+               }
+               if (url->query) {
+                       zend_update_property_string(php_http_url_class_entry, return_value,
+                                       ZEND_STRL("query"), url->query TSRMLS_CC);
+               }
+               if (url->fragment) {
+                       zend_update_property_string(php_http_url_class_entry, return_value,
+                                       ZEND_STRL("fragment"), url->fragment TSRMLS_CC);
+               }
+               php_http_url_free(&url);
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+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)
+       PHP_ME(HttpUrl, parse,        ai_HttpUrl_parse, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+       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);
@@ -560,6 +1236,16 @@ 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);
+
+#ifdef PHP_HTTP_HAVE_WCHAR
+       zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBLOC"), PHP_HTTP_URL_PARSE_MBLOC TSRMLS_CC);
+#endif
+       zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBUTF8"), PHP_HTTP_URL_PARSE_MBUTF8 TSRMLS_CC);
+#ifdef PHP_HTTP_HAVE_IDN
+       zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOIDN"), PHP_HTTP_URL_PARSE_TOIDN TSRMLS_CC);
+#endif
+       zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOPCT"), PHP_HTTP_URL_PARSE_TOPCT TSRMLS_CC);
 
        return SUCCESS;
 }