separate url and parser state

[m6w6/ext-http] / php_http_url.h

diff --git a/php_http_url.h b/php_http_url.h
index df8cae513bae25eaf8179222f619a57677325963..7eee61d35a074a4ce53ab2e1b7c4b52f675e3963 100644 (file)
--- a/php_http_url.h
+++ b/php_http_url.h
@@ -45,7 +45,9 @@ typedef struct php_http_url_part {
 /* parse utf8 multibyte sequences */
 #define PHP_HTTP_URL_PARSE_MBUTF8 0x002
 /* convert multibyte hostnames to IDNA */
-#define PHP_HTTP_URL_PARSE_IDN    0x010
+#define PHP_HTTP_URL_PARSE_TOIDN  0x010
+/* percent encode multibyte sequences in userinfo, path, query and fragment */
+#define PHP_HTTP_URL_PARSE_TOPCT  0x020
 
 typedef struct php_http_url {
        /* compatible to php_url, but do not use php_url_free() */
@@ -57,16 +59,6 @@ typedef struct php_http_url {
        char *path;
        char *query;
        char *fragment;
-       /* our stuff */
-#ifdef ZTS
-       void ***ts;
-#endif
-       const char *ptr;
-       const char *end;
-       size_t maxlen;
-       off_t offset;
-       unsigned flags;
-       char buffer[];
 } php_http_url_t;
 
 PHP_HTTP_API php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags TSRMLS_DC);