X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url.h;h=eaecdfa8ace9debe375bacdec758c780d21e9f92;hp=938cf07de1314fd00f465032fee6c9421721aa3d;hb=d3ccf4a87cda3a4101e2dfb85f620c7e2c401731;hpb=87db9817d428282792c8146d9c2ae9748ebf6f1e diff --git a/php_http_url.h b/php_http_url.h index 938cf07..eaecdfa 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-2013, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -35,6 +35,45 @@ #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 +/* parse utf8 multibyte sequences */ +#define PHP_HTTP_URL_PARSE_MBUTF8 0x002 +/* convert multibyte hostnames to IDNA */ +#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() */ + char *scheme; + char *user; + char *pass; + char *host; + unsigned short port; + 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); +PHP_HTTP_API void php_http_url_free(php_http_url_t **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); 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);