#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;
-
-#define PHP_HTTP_URL_PARSE_MBLOC 0x001
-#define PHP_HTTP_URL_PARSE_MBUTF8 0x002
-#define PHP_HTTP_URL_PARSE_IDN 0x010
+/* parse multibyte according to locale */
+#define PHP_HTTP_URL_PARSE_MBLOC 0x10000
+/* parse utf8 multibyte sequences */
+#define PHP_HTTP_URL_PARSE_MBUTF8 0x20000
+/* convert multibyte hostnames to IDNA */
+#define PHP_HTTP_URL_PARSE_TOIDN 0x100000
+/* percent encode multibyte sequences in userinfo, path, query and fragment */
+#define PHP_HTTP_URL_PARSE_TOPCT 0x200000
typedef struct php_http_url {
- php_http_url_part_t scheme;
- struct {
- struct {
- php_http_url_part_t username;
- php_http_url_part_t password;
- } userinfo;
- php_http_url_part_t host;
- unsigned short port;
- } authority;
- php_http_url_part_t path;
- php_http_url_part_t query;
- php_http_url_part_t fragment;
- unsigned flags;
-#ifdef ZTS
- void ***ts;
-#endif
+ /* 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;
} php_http_url_t;
-PHP_HTTP_API php_http_url_t *php_http_url_init(php_http_url_t *url, const char *str, size_t len, unsigned flags TSRMLS_DC);
-PHP_HTTP_API void php_http_url_dtor(php_http_url_t *url);
+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);