X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url.h;h=babb9d18a2c221c2a77a3970dd3d0d03c38026ec;hp=eaecdfa8ace9debe375bacdec758c780d21e9f92;hb=f27f09fb8025a8d640fdd283b25577956fee13f8;hpb=d3ccf4a87cda3a4101e2dfb85f620c7e2c401731 diff --git a/php_http_url.h b/php_http_url.h index eaecdfa..babb9d1 100644 --- a/php_http_url.h +++ b/php_http_url.h @@ -35,19 +35,14 @@ #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; - /* parse multibyte according to locale */ -#define PHP_HTTP_URL_PARSE_MBLOC 0x001 +#define PHP_HTTP_URL_PARSE_MBLOC 0x10000 /* parse utf8 multibyte sequences */ -#define PHP_HTTP_URL_PARSE_MBUTF8 0x002 +#define PHP_HTTP_URL_PARSE_MBUTF8 0x20000 /* convert multibyte hostnames to IDNA */ -#define PHP_HTTP_URL_PARSE_TOIDN 0x010 +#define PHP_HTTP_URL_PARSE_TOIDN 0x100000 /* percent encode multibyte sequences in userinfo, path, query and fragment */ -#define PHP_HTTP_URL_PARSE_TOPCT 0x020 +#define PHP_HTTP_URL_PARSE_TOPCT 0x200000 typedef struct php_http_url { /* compatible to php_url, but do not use php_url_free() */ @@ -59,16 +54,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);