X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_url.c;h=5e8592ed8c7c0ae28adb95c19ba068ed172e40b2;hp=1215942bc55ba3dc1ee1eef8c8c4e9e339a31cf8;hb=294724730ce2865ecb887ffbb3a1ea8afdea37f5;hpb=3724cd76a28be1d6049b5537232e97ac567ae1f5 diff --git a/src/php_http_url.c b/src/php_http_url.c index 1215942..5e8592e 100644 --- a/src/php_http_url.c +++ b/src/php_http_url.c @@ -12,18 +12,26 @@ #include "php_http_api.h" -#if PHP_HTTP_HAVE_IDN2 +#if PHP_HTTP_HAVE_LIBIDN2 # include -#elif PHP_HTTP_HAVE_IDN +#endif +#if PHP_HTTP_HAVE_LIBIDN # include #endif +#if PHP_HTTP_HAVE_LIBICU +# include +#endif +#if PHP_HTTP_HAVE_LIBIDNKIT || PHP_HTTP_HAVE_LIBIDNKIT2 +# include +# include +#endif -#ifdef PHP_HTTP_HAVE_WCHAR +#if PHP_HTTP_HAVE_WCHAR # include # include #endif -#ifdef HAVE_ARPA_INET_H +#if HAVE_ARPA_INET_H # include #endif @@ -33,13 +41,13 @@ static inline char *localhostname(void) { char hostname[1024] = {0}; -#ifdef PHP_WIN32 +#if PHP_WIN32 if (SUCCESS == gethostname(hostname, lenof(hostname))) { return estrdup(hostname); } -#elif defined(HAVE_GETHOSTNAME) +#elif HAVE_GETHOSTNAME if (SUCCESS == gethostname(hostname, lenof(hostname))) { -# if defined(HAVE_GETDOMAINNAME) +# if HAVE_GETDOMAINNAME size_t hlen = strlen(hostname); if (hlen <= lenof(hostname) - lenof("(none)")) { hostname[hlen++] = '.'; @@ -61,7 +69,7 @@ static inline char *localhostname(void) #define url(buf) ((php_http_url_t *) (buf).data) -static php_http_url_t *php_http_url_from_env(TSRMLS_D) +static php_http_url_t *php_http_url_from_env(void) { zval *https, *zhost, *zport; long port; @@ -73,7 +81,7 @@ static php_http_url_t *php_http_url_from_env(TSRMLS_D) /* scheme */ url(buf)->scheme = &buf.data[buf.used]; - https = php_http_env_get_server_var(ZEND_STRL("HTTPS"), 1 TSRMLS_CC); + https = php_http_env_get_server_var(ZEND_STRL("HTTPS"), 1); if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) { php_http_buffer_append(&buf, "https", sizeof("https")); } else { @@ -82,9 +90,9 @@ static php_http_url_t *php_http_url_from_env(TSRMLS_D) /* host */ url(buf)->host = &buf.data[buf.used]; - 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)) { + if ((((zhost = php_http_env_get_server_var(ZEND_STRL("HTTP_HOST"), 1)) || + (zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_NAME"), 1)) || + (zhost = php_http_env_get_server_var(ZEND_STRL("SERVER_ADDR"), 1)))) && Z_STRLEN_P(zhost)) { size_t stop_at = strspn(Z_STRVAL_P(zhost), "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-."); php_http_buffer_append(&buf, Z_STRVAL_P(zhost), stop_at); @@ -97,7 +105,7 @@ static php_http_url_t *php_http_url_from_env(TSRMLS_D) } /* port */ - zport = php_http_env_get_server_var(ZEND_STRL("SERVER_PORT"), 1 TSRMLS_CC); + zport = php_http_env_get_server_var(ZEND_STRL("SERVER_PORT"), 1); if (zport && IS_LONG == is_numeric_string(Z_STRVAL_P(zport), Z_STRLEN_P(zport), &port, NULL, 0)) { url(buf)->port = port; } @@ -154,7 +162,7 @@ static php_http_url_t *php_http_url_from_env(TSRMLS_D) } \ } while (0) -php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags TSRMLS_DC) +php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_url_t *new_url, unsigned flags) { php_http_url_t *tmp_url = NULL; php_http_buffer_t buf; @@ -165,9 +173,9 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u /* set from env if requested */ if (flags & PHP_HTTP_URL_FROM_ENV) { - php_http_url_t *env_url = php_http_url_from_env(TSRMLS_C); + php_http_url_t *env_url = php_http_url_from_env(); - old_url = tmp_url = php_http_url_mod(env_url, old_url, flags ^ PHP_HTTP_URL_FROM_ENV TSRMLS_CC); + old_url = tmp_url = php_http_url_mod(env_url, old_url, flags ^ PHP_HTTP_URL_FROM_ENV); php_http_url_free(&env_url); } @@ -228,17 +236,17 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u if ((flags & PHP_HTTP_URL_JOIN_QUERY) && url_isset(new_url, query) && url_isset(old_url, query)) { zval qarr, qstr; - INIT_PZVAL(&qstr); - INIT_PZVAL(&qarr); array_init(&qarr); - ZVAL_STRING(&qstr, old_url->query, 0); - php_http_querystring_update(&qarr, &qstr, NULL TSRMLS_CC); - ZVAL_STRING(&qstr, new_url->query, 0); - php_http_querystring_update(&qarr, &qstr, NULL TSRMLS_CC); + ZVAL_STRING(&qstr, old_url->query); + php_http_querystring_update(&qarr, &qstr, NULL); + zval_ptr_dtor(&qstr); + ZVAL_STRING(&qstr, new_url->query); + php_http_querystring_update(&qarr, &qstr, NULL); + zval_ptr_dtor(&qstr); ZVAL_NULL(&qstr); - php_http_querystring_update(&qarr, NULL, &qstr TSRMLS_CC); + php_http_querystring_update(&qarr, NULL, &qstr); url(buf)->query = &buf.data[buf.used]; url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL(qstr), Z_STRLEN(qstr) + 1)); @@ -263,6 +271,7 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u /* replace directory references if path is not a single slash */ if ((flags & PHP_HTTP_URL_SANITIZE_PATH) + && url(buf)->path && url(buf)->path[0] && url(buf)->path[1]) { char *ptr, *end = url(buf)->path + strlen(url(buf)->path) + 1; @@ -422,9 +431,9 @@ char *php_http_url_authority_to_string(const php_http_url_t *url, char **url_str return buf.data; } -php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC) +php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags) { - zval *zcpy; + zend_string *zs; php_http_url_t *purl; switch (Z_TYPE_P(value)) { @@ -434,9 +443,9 @@ php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC) break; default: - zcpy = php_http_ztyp(IS_STRING, value); - purl = php_http_url_parse(Z_STRVAL_P(zcpy), Z_STRLEN_P(zcpy), flags TSRMLS_CC); - zval_ptr_dtor(&zcpy); + zs = zval_get_string(value); + purl = php_http_url_parse(zs->val, zs->len, flags); + zend_string_release(zs); } return purl; @@ -444,67 +453,66 @@ php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC) php_http_url_t *php_http_url_from_struct(HashTable *ht) { - zval **e; + zval *e; php_http_buffer_t buf; php_http_buffer_init_ex(&buf, MAX(PHP_HTTP_BUFFER_DEFAULT_SIZE, sizeof(php_http_url_t)<<2), PHP_HTTP_BUFFER_INIT_PREALLOC); php_http_buffer_account(&buf, sizeof(php_http_url_t)); memset(buf.data, 0, buf.used); - if (SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("scheme")))) { + zend_string *zs = zval_get_string(e); url(buf)->scheme = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "user", sizeof("user"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("user")))) { + zend_string *zs = zval_get_string(e); url(buf)->user = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "pass", sizeof("pass"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("pass")))) { + zend_string *zs = zval_get_string(e); url(buf)->pass = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "host", sizeof("host"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("host")))) { + zend_string *zs = zval_get_string(e); url(buf)->host = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "port", sizeof("port"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_LONG, *e); - url(buf)->port = (unsigned short) Z_LVAL_P(cpy); - zval_ptr_dtor(&cpy); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("port")))) { + url(buf)->port = (unsigned short) zval_get_long(e); } - if (SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("path")))) { + zend_string *zs = zval_get_string(e); url(buf)->path = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "query", sizeof("query"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("query")))) { + zend_string *zs = zval_get_string(e); url(buf)->query = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } - if (SUCCESS == zend_hash_find(ht, "fragment", sizeof("fragment"), (void *) &e)) { - zval *cpy = php_http_ztyp(IS_STRING, *e); + if ((e = zend_hash_str_find_ind(ht, ZEND_STRL("fragment")))) { + zend_string *zs = zval_get_string(e); url(buf)->fragment = &buf.data[buf.used]; - url_append(&buf, php_http_buffer_append(&buf, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy) + 1)); - zval_ptr_dtor(&cpy); + url_append(&buf, php_http_buffer_append(&buf, zs->val, zs->len + 1)); + zend_string_release(zs); } return url(buf); } -HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct TSRMLS_DC) +HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct) { - zval arr; + HashTable *ht = NULL; + zval tmp; if (strct) { switch (Z_TYPE_P(strct)) { @@ -514,53 +522,69 @@ HashTable *php_http_url_to_struct(const php_http_url_t *url, zval *strct TSRMLS_ /* no break */ case IS_ARRAY: case IS_OBJECT: - INIT_PZVAL_ARRAY((&arr), HASH_OF(strct)); + ht = HASH_OF(strct); break; } } else { - INIT_PZVAL(&arr); - array_init(&arr); + ALLOC_HASHTABLE(ht); + zend_hash_init(ht, 8, NULL, ZVAL_PTR_DTOR, 0); + } + +#define url_struct_add(part) \ + if (!strct || Z_TYPE_P(strct) == IS_ARRAY) { \ + zend_hash_str_update(ht, part, lenof(part), &tmp); \ + } else { \ + zend_update_property(Z_OBJCE_P(strct), strct, part, lenof(part), &tmp); \ + zval_ptr_dtor(&tmp); \ } if (url) { if (url->scheme) { - add_assoc_string(&arr, "scheme", url->scheme, 1); + ZVAL_STRING(&tmp, url->scheme); + url_struct_add("scheme"); } if (url->user) { - add_assoc_string(&arr, "user", url->user, 1); + ZVAL_STRING(&tmp, url->user); + url_struct_add("user"); } if (url->pass) { - add_assoc_string(&arr, "pass", url->pass, 1); + ZVAL_STRING(&tmp, url->pass); + url_struct_add("pass"); } if (url->host) { - add_assoc_string(&arr, "host", url->host, 1); + ZVAL_STRING(&tmp, url->host); + url_struct_add("host"); } if (url->port) { - add_assoc_long(&arr, "port", (long) url->port); + ZVAL_LONG(&tmp, url->port); + url_struct_add("port"); } if (url->path) { - add_assoc_string(&arr, "path", url->path, 1); + ZVAL_STRING(&tmp, url->path); + url_struct_add("path"); } if (url->query) { - add_assoc_string(&arr, "query", url->query, 1); + ZVAL_STRING(&tmp, url->query); + url_struct_add("query"); } if (url->fragment) { - add_assoc_string(&arr, "fragment", url->fragment, 1); + ZVAL_STRING(&tmp, url->fragment); + url_struct_add("fragment"); } } - return Z_ARRVAL(arr); + return ht; } -ZEND_RESULT_CODE 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) +ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len) { const char *arg_sep_str = "&"; size_t arg_sep_len = 1; php_http_buffer_t *qstr = php_http_buffer_new(); - php_http_url_argsep(&arg_sep_str, &arg_sep_len TSRMLS_CC); + php_http_url_argsep(&arg_sep_str, &arg_sep_len); - 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)) { + if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, "=", 1, pre_encoded_str, pre_encoded_len)) { php_http_buffer_free(&qstr); return FAILURE; } @@ -571,13 +595,13 @@ ZEND_RESULT_CODE php_http_url_encode_hash(HashTable *hash, const char *pre_encod return SUCCESS; } -ZEND_RESULT_CODE 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) +ZEND_RESULT_CODE 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) { if (pre_encoded_len && pre_encoded_str) { php_http_buffer_append(qstr, pre_encoded_str, pre_encoded_len); } - 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)) { + 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)) { return FAILURE; } @@ -586,9 +610,6 @@ ZEND_RESULT_CODE php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t struct parse_state { php_http_url_t url; -#ifdef ZTS - void ***ts; -#endif const char *ptr; const char *end; size_t maxlen; @@ -657,17 +678,17 @@ static size_t parse_mb_utf8(unsigned *wc, const char *ptr, const char *end) return consumed; } -#ifdef PHP_HTTP_HAVE_WCHAR +#if 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) +#if HAVE_MBRTOWC mbstate_t ps; memset(&ps, 0, sizeof(ps)); consumed = mbrtowc(&wchar, ptr, end - ptr, &ps); -#elif defined(HAVE_MBTOWC) +#elif HAVE_MBTOWC consumed = mbtowc(&wchar, ptr, end - ptr); #endif @@ -710,7 +731,7 @@ static size_t parse_mb(struct parse_state *state, parse_mb_what_t what, const ch if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { consumed = parse_mb_utf8(&wchar, ptr, end); } -#ifdef PHP_HTTP_HAVE_WCHAR +#if PHP_HTTP_HAVE_WCHAR else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) { consumed = parse_mb_loc(&wchar, ptr, end); } @@ -724,7 +745,7 @@ static size_t parse_mb(struct parse_state *state, parse_mb_what_t what, const ch if (!isualnum(wchar)) { break; } -#ifdef PHP_HTTP_HAVE_WCHAR +#if PHP_HTTP_HAVE_WCHAR } else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) { if (!iswalnum(wchar)) { break; @@ -747,13 +768,12 @@ static size_t parse_mb(struct parse_state *state, parse_mb_what_t what, const ch } if (!silent) { - TSRMLS_FETCH_FROM_CTX(state->ts); if (consumed) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Failed to parse %s; unexpected multibyte sequence 0x%x at pos %u in '%s'", parse_what[what], wchar, (unsigned) (ptr - begin), begin); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, 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); } @@ -766,7 +786,6 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt { 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]; @@ -774,10 +793,16 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt 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 (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse password; duplicate ':' at pos %u in '%s'", + (unsigned) (ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } + state->buffer[state->offset++] = *ptr; + break; } password = ptr + 1; state->buffer[state->offset++] = 0; @@ -786,16 +811,31 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt 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; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse userinfo; invalid percent encoding at pos %u in '%s'", + (unsigned) (ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } + state->buffer[state->offset++] = *ptr++; + break; } state->buffer[state->offset++] = *ptr++; state->buffer[state->offset++] = *ptr++; state->buffer[state->offset++] = *ptr; break; + default: + if ((mb = parse_mb(state, PARSE_USERINFO, ptr, end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) { + ptr += mb - 1; + break; + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } + /* no break */ case '!': case '$': case '&': case '\'': case '(': case ')': case '*': case '+': case ',': case ';': case '=': /* sub-delims */ case '-': case '.': case '_': case '~': /* unreserved */ @@ -813,13 +853,8 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt 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); + } while(++ptr < end); state->buffer[state->offset++] = 0; @@ -827,9 +862,9 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt return SUCCESS; } -#if defined(PHP_WIN32) || defined(HAVE_UIDNA_IDNTOASCII) +#if PHP_WIN32 || HAVE_UIDNA_IDNTOASCII typedef size_t (*parse_mb_func)(unsigned *wc, const char *ptr, const char *end); -static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u16, size_t *len TSRMLS_DC) +static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u16, size_t *len) { size_t offset = 0, u8_len = strlen(u8); @@ -843,7 +878,7 @@ static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u1 if (!consumed) { efree(*u16); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse UTF-8 at pos %zu of '%s'", offset, u8); + php_error_docref(NULL, E_WARNING, "Failed to parse UTF-8 at pos %zu of '%s'", offset, u8); return FAILURE; } else { offset += consumed; @@ -859,7 +894,7 @@ static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u1 case 0: default: efree(*u16); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to convert UTF-32 'U+%X' to UTF-16", wc); + php_error_docref(NULL, E_WARNING, "Failed to convert UTF-32 'U+%X' to UTF-16", wc); return FAILURE; } } @@ -868,142 +903,274 @@ static ZEND_RESULT_CODE to_utf16(parse_mb_func fn, const char *u8, uint16_t **u1 } #endif -#ifndef MAXHOSTNAMELEN -# define MAXHOSTNAMELEN 256 -#endif - -#if PHP_HTTP_HAVE_IDN2 -static ZEND_RESULT_CODE parse_idn2(struct parse_state *state, size_t prev_len) +#if PHP_HTTP_HAVE_LIBIDN2 +# if __GNUC__ +__attribute__ ((unused)) +# endif +static ZEND_RESULT_CODE parse_gidn_2008(struct parse_state *state, size_t prev_len) { char *idn = NULL; int rv = -1; - TSRMLS_FETCH_FROM_CTX(state->ts); if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { rv = idn2_lookup_u8((const unsigned char *) state->url.host, (unsigned char **) &idn, IDN2_NFC_INPUT); } -# ifdef PHP_HTTP_HAVE_WCHAR +# if PHP_HTTP_HAVE_WCHAR else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) { rv = idn2_lookup_ul(state->url.host, &idn, 0); } # endif if (rv != IDN2_OK) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idn2_strerror(rv)); - return FAILURE; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, "Failed to parse IDN (IDNA2008); %s", idn2_strerror(rv)); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } } else { size_t idnlen = strlen(idn); memcpy(state->url.host, idn, idnlen + 1); free(idn); state->offset += idnlen - prev_len; - return SUCCESS; } + return SUCCESS; } -#elif PHP_HTTP_HAVE_IDN -static ZEND_RESULT_CODE parse_idn(struct parse_state *state, size_t prev_len) +#endif + +#if PHP_HTTP_HAVE_LIBIDN +# if __GNUC__ +__attribute__ ((unused)) +# endif +static ZEND_RESULT_CODE parse_gidn_2003(struct parse_state *state, size_t prev_len) { char *idn = NULL; int rv = -1; - TSRMLS_FETCH_FROM_CTX(state->ts); 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); + rv = idna_to_ascii_8z(state->url.host, &idn, IDNA_ALLOW_UNASSIGNED); } -# ifdef PHP_HTTP_HAVE_WCHAR +# if 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); + rv = idna_to_ascii_lz(state->url.host, &idn, IDNA_ALLOW_UNASSIGNED); } # endif if (rv != IDNA_SUCCESS) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idna_strerror(rv)); - return FAILURE; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, "Failed to parse IDN (IDNA2003); %s", idna_strerror(rv)); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } } else { size_t idnlen = strlen(idn); memcpy(state->url.host, idn, idnlen + 1); free(idn); state->offset += idnlen - prev_len; - return SUCCESS; } + return SUCCESS; } #endif -#ifdef HAVE_UIDNA_IDNTOASCII -# if HAVE_UNICODE_UIDNA_H +#if HAVE_UIDNA_IDNTOASCII +# if PHP_HTTP_HAVE_LIBICU # include # else typedef uint16_t UChar; typedef enum { U_ZERO_ERROR = 0 } UErrorCode; int32_t uidna_IDNToASCII(const UChar *src, int32_t srcLength, UChar *dest, int32_t destCapacity, int32_t options, void *parseError, UErrorCode *status); # endif -static ZEND_RESULT_CODE parse_uidn(struct parse_state *state) +static ZEND_RESULT_CODE parse_uidn_2003(struct parse_state *state) { - char *host_ptr; - uint16_t *uhost_str, ahost_str[MAXHOSTNAMELEN], *ahost_ptr; + char *host_ptr = state->url.host, ebuf[64] = {0}, *error = NULL; + uint16_t *uhost_str, ahost_str[256], *ahost_ptr; size_t uhost_len, ahost_len; - UErrorCode error = U_ZERO_ERROR; - TSRMLS_FETCH_FROM_CTX(state->ts); + UErrorCode rc = U_ZERO_ERROR; if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { - if (SUCCESS != to_utf16(parse_mb_utf8, state->url.host, &uhost_str, &uhost_len TSRMLS_CC)) { - return FAILURE; + if (SUCCESS != to_utf16(parse_mb_utf8, state->url.host, &uhost_str, &uhost_len)) { + error = "failed to convert to UTF-16"; + goto error; } -#ifdef PHP_HTTP_HAVE_WCHAR +#if PHP_HTTP_HAVE_WCHAR } else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) { - if (SUCCESS != to_utf16(parse_mb_loc, state->url.host, &uhost_str, &uhost_len TSRMLS_CC)) { - return FAILURE; + if (SUCCESS != to_utf16(parse_mb_loc, state->url.host, &uhost_str, &uhost_len)) { + error = "failed to convert to UTF-16"; + goto error; } #endif } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; codepage not specified"); - return FAILURE; + error = "codepage not specified"; + goto error; } - ahost_len = uidna_IDNToASCII(uhost_str, uhost_len, ahost_str, MAXHOSTNAMELEN, 3, NULL, &error); +# if __GNUC__ >= 5 +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +# endif + ahost_len = uidna_IDNToASCII(uhost_str, uhost_len, ahost_str, 256, 3, NULL, &rc); +# if __GNUC__ >= 5 +# pragma GCC diagnostic pop +# endif + efree(uhost_str); + if (error > U_ZERO_ERROR) { + goto error; + } + + ahost_ptr = ahost_str; + PHP_HTTP_DUFF(ahost_len, *host_ptr++ = *ahost_ptr++); + *host_ptr = '\0'; + state->offset += host_ptr - state->url.host; + + return SUCCESS; - if (error != U_ZERO_ERROR) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; ICU error %d", error); + error: + if (!error) { + slprintf(ebuf, sizeof(ebuf)-1, "errorcode: %d", rc); + error = ebuf; + } + php_error_docref(NULL, E_WARNING, "Failed to parse IDN (ICU IDNA2003); %s", error); + + return FAILURE; +} +#endif + +#if HAVE_UIDNA_IDNTOASCII +# if PHP_HTTP_HAVE_LIBICU +# include +# endif +static ZEND_RESULT_CODE parse_uidn_2008(struct parse_state *state) +{ + char *host_ptr, *error = NULL, ebuf[64] = {0}; + UErrorCode rc = U_ZERO_ERROR; + UIDNAInfo info = UIDNA_INFO_INITIALIZER; + UIDNA *uidna = uidna_openUTS46(UIDNA_ALLOW_UNASSIGNED, &rc); + + if (!uidna || U_FAILURE(rc)) { return FAILURE; } host_ptr = state->url.host; - ahost_ptr = ahost_str; - PHP_HTTP_DUFF(ahost_len, *host_ptr++ = *ahost_ptr++); + + if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { + char ahost_str[256], *ahost_ptr = &ahost_str[0]; + size_t ahost_len = uidna_nameToASCII_UTF8(uidna, host_ptr, -1, ahost_str, sizeof(ahost_str)-1, &info, &rc); + + if (U_FAILURE(rc) || info.errors) { + goto error; + } + PHP_HTTP_DUFF(ahost_len, *host_ptr++ = *ahost_ptr++); +#if PHP_HTTP_HAVE_WCHAR + } else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) { + uint16_t *uhost_str, whost_str[256], *whost_ptr = &whost_str[0]; + size_t uhost_len, whost_len; + + if (SUCCESS != to_utf16(parse_mb_loc, host_ptr, &uhost_str, &uhost_len)) { + error = "could not convert to UTF-16"; + goto error; + } + + whost_len = uidna_nameToASCII(uidna, uhost_str, uhost_len, whost_str, sizeof(whost_str)-1, &info, &rc); + whost_ptr = whost_str; + efree(uhost_str); + if (U_FAILURE(rc) || info.errors) { + goto error; + } + PHP_HTTP_DUFF(whost_len, *host_ptr++ = *whost_ptr++); +#endif + } else { + error = "codepage not specified"; + goto error; + } *host_ptr = '\0'; state->offset += host_ptr - state->url.host; + uidna_close(uidna); return SUCCESS; + + error: + if (!error) { + if (U_FAILURE(rc)) { + slprintf(ebuf, sizeof(ebuf)-1, "%s", u_errorName(rc)); + error = ebuf; + } else if (info.errors) { + slprintf(ebuf, sizeof(ebuf)-1, "ICU IDNA error codes: 0x%x", info.errors); + error = ebuf; + } else { + error = "unknown error"; + } + } + php_error_docref(NULL, E_WARNING, "Failed to parse IDN (ICU IDNA2008); %s", error); + + uidna_close(uidna); + return FAILURE; +} +#endif + +#if PHP_HTTP_HAVE_LIBIDNKIT || PHP_HTTP_HAVE_LIBIDNKIT2 +# if __GNUC__ +__attribute__ ((unused)) +# endif +static ZEND_RESULT_CODE parse_kidn(struct parse_state *state) +{ + idn_result_t rc; +#if PHP_HTTP_HAVE_LIBIDNKIT + int actions = IDN_DELIMMAP|IDN_LOCALMAP|IDN_NAMEPREP|IDN_IDNCONV|IDN_LENCHECK; +#elif PHP_HTTP_HAVE_LIBIDNKIT2 + int actions = IDN_MAP|IDN_ASCLOWER|IDN_RTCONV|IDN_PROHCHECK|IDN_NFCCHECK|IDN_PREFCHECK|IDN_COMBCHECK|IDN_CTXOLITECHECK|IDN_BIDICHECK|IDN_LOCALCHECK|IDN_IDNCONV|IDN_LENCHECK|IDN_RTCHECK; +#endif + char ahost_str[256] = {0}, *ahost_ptr = &ahost_str[0], *host_ptr = state->url.host; + + if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) { +#if PHP_HTTP_HAVE_LIBIDNKIT + actions |= IDN_LOCALCONV; +#elif PHP_HTTP_HAVE_LIBIDNKIT2 + actions |= IDN_UNICODECONV; +#endif + } + + rc = idn_encodename(actions, state->url.host, ahost_str, 256); + if (rc == idn_success) { + PHP_HTTP_DUFF(strlen(ahost_str), *host_ptr++ = *ahost_ptr++); + + *host_ptr = '\0'; + state->offset += host_ptr - state->url.host; + + return SUCCESS; + } else { + php_error_docref(NULL, E_WARNING, "Failed to parse IDN; %s", idn_result_tostring(rc)); + return FAILURE; + } } #endif -#if 0 && defined(PHP_WIN32) -static ZEND_RESULT_CODE parse_widn(struct parse_state *state) +#if 0 && PHP_WIN32 +static ZEND_RESULT_CODE parse_widn_2003(struct parse_state *state) { char *host_ptr; - uint16_t *uhost_str, ahost_str[MAXHOSTNAMELEN], *ahost_ptr; + uint16_t *uhost_str, ahost_str[256], *ahost_ptr; size_t uhost_len; - TSRMLS_FETCH_FROM_CTX(state->ts); if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { if (SUCCESS != to_utf16(parse_mb_utf8, state->url.host, &uhost_str, &uhost_len)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN"); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN"); return FAILURE; } -#ifdef PHP_HTTP_HAVE_WCHAR +#if PHP_HTTP_HAVE_WCHAR } else if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) { if (SUCCESS != to_utf16(parse_mb_loc, state->url.host, &uhost_str, &uhost_len)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN"); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN"); return FAILURE; } #endif } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN"); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN"); return FAILURE; } - if (!IdnToAscii(IDN_ALLOW_UNASSIGNED|IDN_USE_STD3_ASCII_RULES, uhost_str, uhost_len, ahost_str, MAXHOSTNAMELEN)) { + if (!IdnToAscii(IDN_ALLOW_UNASSIGNED, uhost_str, uhost_len, ahost_str, 256)) { efree(uhost_str); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN"); + php_error_docref(NULL, E_WARNING, "Failed to parse IDN"); return FAILURE; } @@ -1011,7 +1178,6 @@ static ZEND_RESULT_CODE parse_widn(struct parse_state *state) host_ptr = state->url.host; ahost_ptr = ahost_str; PHP_HTTP_DUFF(wcslen(ahost_str), *host_ptr++ = *ahost_ptr++); - efree(ahost_str); *host_ptr = '\0'; state->offset += host_ptr - state->url.host; @@ -1020,11 +1186,66 @@ static ZEND_RESULT_CODE parse_widn(struct parse_state *state) } #endif -#ifdef HAVE_INET_PTON +static ZEND_RESULT_CODE parse_idna(struct parse_state *state, size_t len) +{ +#if PHP_HTTP_HAVE_IDNA2008 + if ((state->flags & PHP_HTTP_URL_PARSE_TOIDN_2008) == PHP_HTTP_URL_PARSE_TOIDN_2008 +# if PHP_HTTP_HAVE_IDNA2003 + || (state->flags & PHP_HTTP_URL_PARSE_TOIDN_2003) != PHP_HTTP_URL_PARSE_TOIDN_2003 +# endif + ) { +#if HAVE_UIDNA_NAMETOASCII_UTF8 + return parse_uidn_2008(state); +#elif PHP_HTTP_HAVE_LIBIDN2 + return parse_gidn_2008(state, len); +#elif PHP_HTTP_HAVE_LIBIDNKIT2 + return parse_kidn(state); +#endif + } +#endif + +#if PHP_HTTP_HAVE_IDNA2003 + if ((state->flags & PHP_HTTP_URL_PARSE_TOIDN_2003) == PHP_HTTP_URL_PARSE_TOIDN_2003 +# if PHP_HTTP_HAVE_IDNA2008 + || (state->flags & PHP_HTTP_URL_PARSE_TOIDN_2008) != PHP_HTTP_URL_PARSE_TOIDN_2008 +#endif + ) { +#if HAVE_UIDNA_IDNTOASCII + return parse_uidn_2003(state); +#elif PHP_HTTP_HAVE_LIBIDN + return parse_gidn_2003(state, len); +#elif PHP_HTTP_HAVE_LIBIDNKIT + return parse_kidn(state); +#endif + } +#endif + +#if 0 && PHP_WIN32 + return parse_widn_2003(state); +#endif + +#if HAVE_UIDNA_NAMETOASCII_UTF8 + return parse_uidn_2008(state); +#elif PHP_HTTP_HAVE_LIBIDN2 + return parse_gidn_2008(state, len); +#elif PHP_HTTP_HAVE_LIBIDNKIT2 + return parse_kidn(state); +#elif HAVE_UIDNA_IDNTOASCII + return parse_uidn_2003(state); +#elif PHP_HTTP_HAVE_LIBIDN + return parse_gidn_2003(state, len); +#elif PHP_HTTP_HAVE_LIBIDNKIT + return parse_kidn(state); +#endif + + return SUCCESS; +} + +#if HAVE_INET_PTON static const char *parse_ip6(struct parse_state *state, const char *ptr) { + unsigned pos = 0; const char *error = NULL, *end = state->ptr, *tmp = memchr(ptr, ']', end - ptr); - TSRMLS_FETCH_FROM_CTX(state->ts); if (tmp) { size_t addrlen = tmp - ptr + 1; @@ -1040,17 +1261,21 @@ static const char *parse_ip6(struct parse_state *state, const char *ptr) state->buffer[state->offset++] = 0; ptr = tmp + 1; } else if (rv == -1) { + pos = 1; error = strerror(errno); } else { error = "unexpected '['"; } efree(addr); } else { + pos = end - ptr; error = "expected ']'"; } if (error) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse hostinfo; %s", error); + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, "Failed to parse hostinfo; %s at pos %u in '%s'", error, pos, ptr); + } return NULL; } @@ -1060,13 +1285,15 @@ static const char *parse_ip6(struct parse_state *state, const char *ptr) static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *ptr) { - size_t mb, len; + size_t mb, len = state->offset; const char *end = state->ptr, *tmp = ptr, *port = NULL, *label = NULL; - TSRMLS_FETCH_FROM_CTX(state->ts); -#ifdef HAVE_INET_PTON +#if HAVE_INET_PTON if (*ptr == '[' && !(ptr = parse_ip6(state, ptr))) { - return FAILURE; + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } + ptr = tmp; } #endif @@ -1074,43 +1301,76 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt 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; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse port; unexpected ':' at pos %u in '%s'", + (unsigned) (ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } } 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; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse hostinfo; invalid percent encoding at pos %u in '%s'", + (unsigned) (ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } + state->buffer[state->offset++] = *ptr++; + break; } 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 '.': if (port || !label) { /* sort of a compromise, just ensure we don't end up * with a dot at the beginning or two consecutive dots */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Failed to parse %s; unexpected '%c' at pos %u in '%s'", - port ? "port" : "host", - (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp); - return FAILURE; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse %s; unexpected '%c' at pos %u in '%s'", + port ? "port" : "host", + (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } + break; } state->buffer[state->offset++] = *ptr; label = NULL; break; + case '-': + if (!label) { + /* sort of a compromise, just ensure we don't end up + * with a hyphen at the beginning + */ + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse %s; unexpected '%c' at pos %u in '%s'", + port ? "port" : "host", + (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } + break; + } + /* no break */ + case '_': case '~': /* unreserved */ + case '!': case '$': case '&': case '\'': case '(': case ')': case '*': + case '+': case ',': case ';': case '=': /* sub-delims */ 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': @@ -1120,10 +1380,15 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt 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; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse port; unexpected char '%c' at pos %u in '%s'", + (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } + break; } /* no break */ case '0': case '1': case '2': case '3': case '4': case '5': case '6': @@ -1142,36 +1407,34 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt if (ptr == end) { break; } else 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; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse port; unexpected byte 0x%02x at pos %u in '%s'", + (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } + break; + } else if (!(mb = parse_mb(state, PARSE_HOSTINFO, ptr, end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) { + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return FAILURE; + } + break; } label = ptr; ptr += mb - 1; } - } while (++ptr != end); + } while (++ptr < end); if (!state->url.host) { - len = (port ? port - tmp - 1 : end - tmp); + len = state->offset - len; state->url.host = &state->buffer[state->offset - len]; state->buffer[state->offset++] = 0; } if (state->flags & PHP_HTTP_URL_PARSE_TOIDN) { -#if PHP_HTTP_HAVE_IDN2 - return parse_idn2(state, len); -#elif PHP_HTTP_HAVE_IDN - return parse_idn(state, len); -#endif -#ifdef HAVE_UIDNA_IDNTOASCII - return parse_uidn(state); -#endif -#if 0 && defined(PHP_WIN32) - return parse_widn(state); -#endif + return parse_idna(state, len); } return SUCCESS; @@ -1186,10 +1449,14 @@ static const char *parse_authority(struct parse_state *state) 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; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse userinfo; unexpected '@'"); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return NULL; + } + break; } host = state->ptr + 1; if (tmp != state->ptr && SUCCESS != parse_userinfo(state, tmp)) { @@ -1219,7 +1486,6 @@ static const char *parse_path(struct parse_state *state) { size_t mb; const char *tmp; - TSRMLS_FETCH_FROM_CTX(state->ts); /* is there actually a path to parse? */ if (!*state->ptr) { @@ -1236,10 +1502,16 @@ static const char *parse_path(struct parse_state *state) 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; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse path; invalid percent encoding at pos %u in '%s'", + (unsigned) (state->ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return NULL; + } + state->buffer[state->offset++] = *state->ptr; + break; } state->buffer[state->offset++] = *state->ptr++; state->buffer[state->offset++] = *state->ptr++; @@ -1266,8 +1538,11 @@ static const char *parse_path(struct parse_state *state) break; default: - if (!(mb = parse_mb(state, PARSE_PATH, state->ptr, state->end, tmp, 0))) { - return NULL; + if (!(mb = parse_mb(state, PARSE_PATH, state->ptr, state->end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) { + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return NULL; + } + break; } state->ptr += mb - 1; } @@ -1287,7 +1562,6 @@ 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 != '?') { @@ -1305,21 +1579,27 @@ static const char *parse_query(struct parse_state *state) 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; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse query; invalid percent encoding at pos %u in '%s'", + (unsigned) (state->ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return NULL; + } + /* fallthrough, pct-encode the percent sign */ + } else { + state->buffer[state->offset++] = *state->ptr++; + state->buffer[state->offset++] = *state->ptr++; + state->buffer[state->offset++] = *state->ptr; + break; } - state->buffer[state->offset++] = *state->ptr++; - state->buffer[state->offset++] = *state->ptr++; - state->buffer[state->offset++] = *state->ptr; - break; - - /* RFC1738 unsafe */ + /* no break */ case '{': case '}': case '<': case '>': case '[': case ']': case '|': case '\\': case '^': case '`': case '"': case ' ': + /* RFC1738 unsafe */ if (state->flags & PHP_HTTP_URL_PARSE_TOPCT) { state->buffer[state->offset++] = '%'; state->buffer[state->offset++] = parse_xdigits[((unsigned char) *state->ptr) >> 4]; @@ -1348,8 +1628,11 @@ static const char *parse_query(struct parse_state *state) break; default: - if (!(mb = parse_mb(state, PARSE_QUERY, state->ptr, state->end, tmp, 0))) { - return NULL; + if (!(mb = parse_mb(state, PARSE_QUERY, state->ptr, state->end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) { + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return NULL; + } + break; } state->ptr += mb - 1; } @@ -1366,7 +1649,6 @@ 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 != '#') { @@ -1379,23 +1661,42 @@ static const char *parse_fragment(struct parse_state *state) do { switch (*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'", + case '#': + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse fragment; invalid fragment identifier at pos %u in '%s'", (unsigned) (state->ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { return NULL; } - state->buffer[state->offset++] = *state->ptr++; - state->buffer[state->offset++] = *state->ptr++; state->buffer[state->offset++] = *state->ptr; break; - /* RFC1738 unsafe */ + case '%': + if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) { + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse fragment; invalid percent encoding at pos %u in '%s'", + (unsigned) (state->ptr - tmp), tmp); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return NULL; + } + /* fallthrough */ + } else { + state->buffer[state->offset++] = *state->ptr++; + state->buffer[state->offset++] = *state->ptr++; + state->buffer[state->offset++] = *state->ptr; + break; + } + /* no break */ + case '{': case '}': case '<': case '>': case '[': case ']': case '|': case '\\': case '^': case '`': case '"': case ' ': + /* RFC1738 unsafe */ if (state->flags & PHP_HTTP_URL_PARSE_TOPCT) { state->buffer[state->offset++] = '%'; state->buffer[state->offset++] = parse_xdigits[((unsigned char) *state->ptr) >> 4]; @@ -1424,8 +1725,11 @@ static const char *parse_fragment(struct parse_state *state) break; default: - if (!(mb = parse_mb(state, PARSE_FRAGMENT, state->ptr, state->end, tmp, 0))) { - return NULL; + if (!(mb = parse_mb(state, PARSE_FRAGMENT, state->ptr, state->end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) { + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + return NULL; + } + break; } state->ptr += mb - 1; } @@ -1488,14 +1792,14 @@ static const char *parse_scheme(struct parse_state *state) } state->ptr += mb - 1; } - } while (++state->ptr != state->end); + } while (++state->ptr < state->end); softfail: state->offset = 0; return state->ptr = tmp; } -php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags TSRMLS_DC) +php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags) { size_t maxlen = 3 * len + 8 /* null bytes for all components */; struct parse_state *state = ecalloc(1, sizeof(*state) + maxlen); @@ -1504,10 +1808,9 @@ php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags T 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); + php_error_docref(NULL, E_WARNING, "Failed to parse URL scheme: '%s'", state->ptr); efree(state); return NULL; } @@ -1518,13 +1821,13 @@ php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags T } if (!parse_query(state)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse URL query: '%s'", state->ptr); + php_error_docref(NULL, 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); + php_error_docref(NULL, E_WARNING, "Failed to parse URL fragment: '%s'", state->ptr); efree(state); return NULL; } @@ -1532,7 +1835,7 @@ php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags T return (php_http_url_t *) state; } -php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags TSRMLS_DC) +php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags) { size_t maxlen = 3 * len; struct parse_state *state = ecalloc(1, sizeof(*state) + maxlen); @@ -1541,7 +1844,6 @@ php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsign state->ptr = str; state->flags = flags; state->maxlen = maxlen; - TSRMLS_SET_CTX(state->ts); if (!(state->ptr = parse_authority(state))) { efree(state); @@ -1549,16 +1851,33 @@ php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsign } if (state->ptr != state->end) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "Failed to parse URL authority, unexpected character at pos %u in '%s'", - (unsigned) (state->ptr - str), str); - efree(state); - return NULL; + if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, + "Failed to parse URL authority, unexpected character at pos %u in '%s'", + (unsigned) (state->ptr - str), str); + } + if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { + efree(state); + return NULL; + } } return (php_http_url_t *) state; } +static zend_class_entry *php_http_url_class_entry; +static zend_class_entry *php_http_env_url_class_entry; + +zend_class_entry *php_http_url_get_class_entry(void) +{ + return php_http_url_class_entry; +} + +zend_class_entry *php_http_get_env_url_class_entry(void) +{ + return php_http_env_url_class_entry; +} + ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl___construct, 0, 0, 0) ZEND_ARG_INFO(0, old_url) ZEND_ARG_INFO(0, new_url) @@ -1567,35 +1886,46 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpUrl, __construct) { zval *new_url = NULL, *old_url = NULL; - long flags = PHP_HTTP_URL_FROM_ENV; + zend_long flags = 0; 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_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z!z!l", &old_url, &new_url, &flags), invalid_arg, return); + + /* always set http\Url::FROM_ENV for instances of http\Env\Url */ + if (instanceof_function(Z_OBJCE_P(getThis()), php_http_env_url_class_entry)) { + flags |= PHP_HTTP_URL_FROM_ENV; + } - zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC); + if (flags & PHP_HTTP_URL_SILENT_ERRORS) { + zend_replace_error_handling(EH_SUPPRESS, NULL, &zeh); + } else if (flags & PHP_HTTP_URL_IGNORE_ERRORS) { + zend_replace_error_handling(EH_NORMAL, NULL, &zeh); + } else { + zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_url_class_entry(), &zeh); + } { php_http_url_t *res_purl, *new_purl = NULL, *old_purl = NULL; if (new_url) { - new_purl = php_http_url_from_zval(new_url, flags TSRMLS_CC); + new_purl = php_http_url_from_zval(new_url, flags); if (!new_purl) { - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); return; } } if (old_url) { - old_purl = php_http_url_from_zval(old_url, flags TSRMLS_CC); + old_purl = php_http_url_from_zval(old_url, flags); if (!old_purl) { if (new_purl) { php_http_url_free(&new_purl); } - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); return; } } - res_purl = php_http_url_mod(old_purl, new_purl, flags TSRMLS_CC); - php_http_url_to_struct(res_purl, getThis() TSRMLS_CC); + res_purl = php_http_url_mod(old_purl, new_purl, flags); + php_http_url_to_struct(res_purl, getThis()); php_http_url_free(&res_purl); if (old_purl) { @@ -1605,7 +1935,7 @@ PHP_METHOD(HttpUrl, __construct) php_http_url_free(&new_purl); } } - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_mod, 0, 0, 1) @@ -1615,19 +1945,25 @@ ZEND_END_ARG_INFO(); PHP_METHOD(HttpUrl, mod) { zval *new_url = NULL; - long flags = PHP_HTTP_URL_JOIN_PATH | PHP_HTTP_URL_JOIN_QUERY | PHP_HTTP_URL_SANITIZE_PATH; + zend_long flags = PHP_HTTP_URL_JOIN_PATH | PHP_HTTP_URL_JOIN_QUERY | PHP_HTTP_URL_SANITIZE_PATH; zend_error_handling zeh; - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!|l", &new_url, &flags), invalid_arg, return); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z!|l", &new_url, &flags), invalid_arg, return); - zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC); + if (flags & PHP_HTTP_URL_SILENT_ERRORS) { + zend_replace_error_handling(EH_SUPPRESS, NULL, &zeh); + } else if (flags & PHP_HTTP_URL_IGNORE_ERRORS) { + zend_replace_error_handling(EH_NORMAL, NULL, &zeh); + } else { + zend_replace_error_handling(EH_THROW, php_http_get_exception_bad_url_class_entry(), &zeh); + } { php_http_url_t *new_purl = NULL, *old_purl = NULL; if (new_url) { - new_purl = php_http_url_from_zval(new_url, flags TSRMLS_CC); + new_purl = php_http_url_from_zval(new_url, flags); if (!new_purl) { - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); return; } } @@ -1635,10 +1971,10 @@ PHP_METHOD(HttpUrl, mod) if ((old_purl = php_http_url_from_struct(HASH_OF(getThis())))) { php_http_url_t *res_purl; - ZVAL_OBJVAL(return_value, zend_objects_clone_obj(getThis() TSRMLS_CC), 0); + ZVAL_OBJ(return_value, zend_objects_clone_obj(getThis())); - res_purl = php_http_url_mod(old_purl, new_purl, flags TSRMLS_CC); - php_http_url_to_struct(res_purl, return_value TSRMLS_CC); + res_purl = php_http_url_mod(old_purl, new_purl, flags); + php_http_url_to_struct(res_purl, return_value); php_http_url_free(&res_purl); php_http_url_free(&old_purl); @@ -1647,7 +1983,7 @@ PHP_METHOD(HttpUrl, mod) php_http_url_free(&new_purl); } } - zend_restore_error_handling(&zeh TSRMLS_CC); + zend_restore_error_handling(&zeh); } ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_toString, 0, 0, 0) @@ -1663,7 +1999,7 @@ PHP_METHOD(HttpUrl, toString) php_http_url_to_string(purl, &str, &len, 0); php_http_url_free(&purl); - RETURN_STRINGL(str, len, 0); + RETURN_STR(php_http_cs2zs(str, len)); } } RETURN_EMPTY_STRING(); @@ -1681,7 +2017,7 @@ PHP_METHOD(HttpUrl, toArray) /* strip any non-URL properties */ purl = php_http_url_from_struct(HASH_OF(getThis())); - php_http_url_to_struct(purl, return_value TSRMLS_CC); + php_http_url_to_struct(purl, return_value); php_http_url_free(&purl); } @@ -1694,46 +2030,58 @@ static zend_function_entry php_http_url_methods[] = { EMPTY_FUNCTION_ENTRY }; -zend_class_entry *php_http_url_class_entry; - PHP_MINIT_FUNCTION(http_url) { 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); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("pass"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("host"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("port"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("path"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("query"), ZEND_ACC_PUBLIC TSRMLS_CC); - zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("fragment"), ZEND_ACC_PUBLIC TSRMLS_CC); - - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("REPLACE"), PHP_HTTP_URL_REPLACE TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_PATH"), PHP_HTTP_URL_JOIN_PATH TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_QUERY"), PHP_HTTP_URL_JOIN_QUERY TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_USER"), PHP_HTTP_URL_STRIP_USER TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PASS"), PHP_HTTP_URL_STRIP_PASS TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_AUTH"), PHP_HTTP_URL_STRIP_AUTH TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PORT"), PHP_HTTP_URL_STRIP_PORT TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PATH"), PHP_HTTP_URL_STRIP_PATH TSRMLS_CC); - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_QUERY"), PHP_HTTP_URL_STRIP_QUERY TSRMLS_CC); - 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); + php_http_url_class_entry = zend_register_internal_class(&ce); + + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("scheme"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("user"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("pass"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("host"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("port"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("path"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("query"), ZEND_ACC_PUBLIC); + zend_declare_property_null(php_http_url_class_entry, ZEND_STRL("fragment"), ZEND_ACC_PUBLIC); + + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("REPLACE"), PHP_HTTP_URL_REPLACE); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_PATH"), PHP_HTTP_URL_JOIN_PATH); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("JOIN_QUERY"), PHP_HTTP_URL_JOIN_QUERY); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_USER"), PHP_HTTP_URL_STRIP_USER); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PASS"), PHP_HTTP_URL_STRIP_PASS); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_AUTH"), PHP_HTTP_URL_STRIP_AUTH); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PORT"), PHP_HTTP_URL_STRIP_PORT); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_PATH"), PHP_HTTP_URL_STRIP_PATH); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_QUERY"), PHP_HTTP_URL_STRIP_QUERY); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_FRAGMENT"), PHP_HTTP_URL_STRIP_FRAGMENT); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STRIP_ALL"), PHP_HTTP_URL_STRIP_ALL); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("FROM_ENV"), PHP_HTTP_URL_FROM_ENV); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("SANITIZE_PATH"), PHP_HTTP_URL_SANITIZE_PATH); + +#if PHP_HTTP_HAVE_WCHAR + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBLOC"), PHP_HTTP_URL_PARSE_MBLOC); #endif - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBUTF8"), PHP_HTTP_URL_PARSE_MBUTF8 TSRMLS_CC); -#if defined(PHP_HTTP_HAVE_IDN2) || defined(PHP_HTTP_HAVE_IDN) || defined(HAVE_UIDNA_IDNTOASCII) - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOIDN"), PHP_HTTP_URL_PARSE_TOIDN TSRMLS_CC); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_MBUTF8"), PHP_HTTP_URL_PARSE_MBUTF8); +#if PHP_HTTP_HAVE_LIBIDN2 || PHP_HTTP_HAVE_LIBIDN || PHP_HTTP_HAVE_LIBIDNKIT || PHP_HTTP_HAVE_LIBIDNKIT2 || HAVE_UIDNA_IDNTOASCII || HAVE_UIDNA_NAMETOASCII_UTF8 + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOIDN"), PHP_HTTP_URL_PARSE_TOIDN); +# if PHP_HTTP_HAVE_IDNA2003 + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOIDN_2003"), PHP_HTTP_URL_PARSE_TOIDN_2003); +# endif +# if PHP_HTTP_HAVE_IDNA2008 + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOIDN_2008"), PHP_HTTP_URL_PARSE_TOIDN_2008); +# endif #endif - zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOPCT"), PHP_HTTP_URL_PARSE_TOPCT TSRMLS_CC); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOPCT"), PHP_HTTP_URL_PARSE_TOPCT); + + INIT_NS_CLASS_ENTRY(ce, "http\\Env", "Url", php_http_url_methods); + php_http_env_url_class_entry = zend_register_internal_class_ex(&ce, php_http_url_class_entry); + + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("IGNORE_ERRORS"), PHP_HTTP_URL_IGNORE_ERRORS); + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("SILENT_ERRORS"), PHP_HTTP_URL_SILENT_ERRORS); + + zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STDFLAGS"), PHP_HTTP_URL_STDFLAGS); return SUCCESS; }