X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_url.c;h=2055df7a33890724162dd292e4f085f06e071ee6;hp=5e8592ed8c7c0ae28adb95c19ba068ed172e40b2;hb=d5d03014cff8c8ca80ee7866af100d3ceae1bd8f;hpb=294724730ce2865ecb887ffbb3a1ea8afdea37f5 diff --git a/src/php_http_url.c b/src/php_http_url.c index 5e8592e..2055df7 100644 --- a/src/php_http_url.c +++ b/src/php_http_url.c @@ -12,13 +12,14 @@ #include "php_http_api.h" -#if PHP_HTTP_HAVE_LIBIDN2 -# include -#endif #if PHP_HTTP_HAVE_LIBIDN # include #endif +#if PHP_HTTP_HAVE_LIBIDN2 +# include +#endif #if PHP_HTTP_HAVE_LIBICU +# include # include #endif #if PHP_HTTP_HAVE_LIBIDNKIT || PHP_HTTP_HAVE_LIBIDNKIT2 @@ -40,7 +41,7 @@ static inline char *localhostname(void) { char hostname[1024] = {0}; - + #if PHP_WIN32 if (SUCCESS == gethostname(hostname, lenof(hostname))) { return estrdup(hostname); @@ -188,9 +189,9 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u if (!(flags & PHP_HTTP_URL_STRIP_PASS)) { url_copy(pass); } - + url_copy(host); - + if (!(flags & PHP_HTTP_URL_STRIP_PORT)) { url(buf)->port = url_isset(new_url, port) ? new_url->port : ((old_url) ? old_url->port : 0); } @@ -199,14 +200,14 @@ 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_PATH) && url_isset(old_url, path) && url_isset(new_url, path) && *new_url->path != '/') { size_t old_path_len = strlen(old_url->path), new_path_len = strlen(new_url->path); char *path = ecalloc(1, old_path_len + new_path_len + 1 + 1); - + strcat(path, old_url->path); if (path[old_path_len - 1] != '/') { php_dirname(path, old_path_len); strcat(path, "/"); } strcat(path, new_url->path); - + url(buf)->path = &buf.data[buf.used]; if (path[0] != '/') { url_append(&buf, php_http_buffer_append(&buf, "/", 1)); @@ -235,16 +236,16 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u if (!(flags & PHP_HTTP_URL_STRIP_QUERY)) { if ((flags & PHP_HTTP_URL_JOIN_QUERY) && url_isset(new_url, query) && url_isset(old_url, query)) { zval qarr, qstr; - + array_init(&qarr); - + 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); @@ -261,7 +262,7 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u if (!(flags & PHP_HTTP_URL_STRIP_FRAGMENT)) { url_copy(fragment); } - + /* done with copy & combine & strip */ if (flags & PHP_HTTP_URL_FROM_ENV) { @@ -274,13 +275,13 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u && url(buf)->path && url(buf)->path[0] && url(buf)->path[1]) { char *ptr, *end = url(buf)->path + strlen(url(buf)->path) + 1; - + for (ptr = strchr(url(buf)->path, '/'); ptr; ptr = strchr(ptr, '/')) { switch (ptr[1]) { case '/': memmove(&ptr[1], &ptr[2], end - &ptr[2]); break; - + case '.': switch (ptr[2]) { case '\0': @@ -328,7 +329,7 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u url(buf)->port = 0; } } - + return url(buf); } @@ -663,7 +664,7 @@ php_http_url_t *php_http_url_copy(const php_http_url_t *url, zend_bool persisten return cpy; } -static size_t parse_mb_utf8(unsigned *wc, const char *ptr, const char *end) +static inline size_t parse_mb_utf8(unsigned *wc, const char *ptr, const char *end) { unsigned wchar; size_t consumed = utf8towc(&wchar, (const unsigned char *) ptr, end - ptr); @@ -679,7 +680,7 @@ static size_t parse_mb_utf8(unsigned *wc, const char *ptr, const char *end) } #if PHP_HTTP_HAVE_WCHAR -static size_t parse_mb_loc(unsigned *wc, const char *ptr, const char *end) +static inline size_t parse_mb_loc(unsigned *wc, const char *ptr, const char *end) { wchar_t wchar; size_t consumed = 0; @@ -723,7 +724,7 @@ static const char * const parse_what[] = { static const char parse_xdigits[] = "0123456789ABCDEF"; -static size_t parse_mb(struct parse_state *state, parse_mb_what_t what, const char *ptr, const char *end, const char *begin, zend_bool silent) +static inline size_t parse_mb(struct parse_state *state, parse_mb_what_t what, const char *ptr, const char *end, const char *begin, zend_bool force_silent) { unsigned wchar; size_t consumed = 0; @@ -742,7 +743,11 @@ static size_t parse_mb(struct parse_state *state, parse_mb_what_t what, const ch if (what == PARSE_HOSTINFO && (state->flags & PHP_HTTP_URL_PARSE_TOIDN)) { /* idna */ } else if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { +#if PHP_HTTP_HAVE_LIBICU + if (!u_isalnum(wchar)) { +#else if (!isualnum(wchar)) { +#endif break; } #if PHP_HTTP_HAVE_WCHAR @@ -752,22 +757,23 @@ static size_t parse_mb(struct parse_state *state, parse_mb_what_t what, const ch } #endif } - PHP_HTTP_DUFF(consumed, state->buffer[state->offset++] = *ptr++); + + memcpy(&state->buffer[state->offset], ptr, consumed); + state->offset += consumed; } else { - int i = 0; - - PHP_HTTP_DUFF(consumed, - state->buffer[state->offset++] = '%'; - state->buffer[state->offset++] = parse_xdigits[((unsigned char) ptr[i]) >> 4]; - state->buffer[state->offset++] = parse_xdigits[((unsigned char) ptr[i]) & 0xf]; - ++i; - ); + size_t i; + + for (i = 0; i < consumed; ++i) { + state->buffer[state->offset++] = '%'; + state->buffer[state->offset++] = parse_xdigits[((unsigned char) ptr[i]) >> 4]; + state->buffer[state->offset++] = parse_xdigits[((unsigned char) ptr[i]) & 0xf]; + } } return consumed; } - if (!silent) { + if (!force_silent && !(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) { if (consumed) { php_error_docref(NULL, E_WARNING, "Failed to parse %s; unexpected multibyte sequence 0x%x at pos %u in '%s'", @@ -779,6 +785,11 @@ static size_t parse_mb(struct parse_state *state, parse_mb_what_t what, const ch } } + if (state->flags & PHP_HTTP_URL_IGNORE_ERRORS) { + state->buffer[state->offset++] = *ptr; + return 1; + } + return 0; } @@ -828,7 +839,7 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt break; default: - if ((mb = parse_mb(state, PARSE_USERINFO, ptr, end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) { + if ((mb = parse_mb(state, PARSE_USERINFO, ptr, end, tmp, 0))) { ptr += mb - 1; break; } @@ -972,17 +983,15 @@ static ZEND_RESULT_CODE parse_gidn_2003(struct parse_state *state, size_t prev_l #endif #if HAVE_UIDNA_IDNTOASCII -# if PHP_HTTP_HAVE_LIBICU -# include -# else +# if !PHP_HTTP_HAVE_LIBICU 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_2003(struct parse_state *state) +static ZEND_RESULT_CODE parse_uidn_2003(struct parse_state *state, size_t prev_len) { - char *host_ptr = state->url.host, ebuf[64] = {0}, *error = NULL; - uint16_t *uhost_str, ahost_str[256], *ahost_ptr; + char ebuf[64] = {0}, *error = NULL; + uint16_t *uhost_str, ahost_str[256]; size_t uhost_len, ahost_len; UErrorCode rc = U_ZERO_ERROR; @@ -1016,10 +1025,11 @@ static ZEND_RESULT_CODE parse_uidn_2003(struct parse_state *state) 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; + state->url.host[ahost_len] = '\0'; + state->offset += ahost_len - prev_len; + while (ahost_len--) { + state->url.host[ahost_len] = ahost_str[ahost_len]; + } return SUCCESS; @@ -1034,13 +1044,10 @@ static ZEND_RESULT_CODE parse_uidn_2003(struct parse_state *state) } #endif -#if HAVE_UIDNA_IDNTOASCII -# if PHP_HTTP_HAVE_LIBICU -# include -# endif -static ZEND_RESULT_CODE parse_uidn_2008(struct parse_state *state) +#if PHP_HTTP_HAVE_LIBICU && HAVE_UIDNA_NAMETOASCII_UTF8 +static ZEND_RESULT_CODE parse_uidn_2008(struct parse_state *state, size_t prev_len) { - char *host_ptr, *error = NULL, ebuf[64] = {0}; + char *error = NULL, ebuf[64] = {0}; UErrorCode rc = U_ZERO_ERROR; UIDNAInfo info = UIDNA_INFO_INITIALIZER; UIDNA *uidna = uidna_openUTS46(UIDNA_ALLOW_UNASSIGNED, &rc); @@ -1049,42 +1056,46 @@ static ZEND_RESULT_CODE parse_uidn_2008(struct parse_state *state) return FAILURE; } - host_ptr = state->url.host; - 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); + char ahost_str[256]; + size_t ahost_len = uidna_nameToASCII_UTF8(uidna, state->url.host, -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++); + + memcpy(state->url.host, ahost_str, ahost_len); + state->url.host[ahost_len] = '\0'; + state->offset += ahost_len - prev_len; + #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]; + uint16_t *uhost_str, whost_str[256]; size_t uhost_len, whost_len; - if (SUCCESS != to_utf16(parse_mb_loc, host_ptr, &uhost_str, &uhost_len)) { + if (SUCCESS != to_utf16(parse_mb_loc, state->url.host, &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++); + + state->url.host[whost_len] = '\0'; + state->offset += whost_len - prev_len; + while (whost_len--) { + state->url.host[whost_len] = whost_str[whost_len]; + } #endif } else { error = "codepage not specified"; goto error; } - *host_ptr = '\0'; - state->offset += host_ptr - state->url.host; - uidna_close(uidna); return SUCCESS; @@ -1111,7 +1122,7 @@ static ZEND_RESULT_CODE parse_uidn_2008(struct parse_state *state) # if __GNUC__ __attribute__ ((unused)) # endif -static ZEND_RESULT_CODE parse_kidn(struct parse_state *state) +static ZEND_RESULT_CODE parse_kidn(struct parse_state *state, size_t prev_len) { idn_result_t rc; #if PHP_HTTP_HAVE_LIBIDNKIT @@ -1119,7 +1130,7 @@ static ZEND_RESULT_CODE parse_kidn(struct parse_state *state) #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; + char ahost_str[256] = {0}; if (state->flags & PHP_HTTP_URL_PARSE_MBLOC) { #if PHP_HTTP_HAVE_LIBIDNKIT @@ -1131,10 +1142,10 @@ static ZEND_RESULT_CODE parse_kidn(struct parse_state *state) rc = idn_encodename(actions, state->url.host, ahost_str, 256); if (rc == idn_success) { - PHP_HTTP_DUFF(strlen(ahost_str), *host_ptr++ = *ahost_ptr++); + size_t ahost_len = strlen(ahost_str); - *host_ptr = '\0'; - state->offset += host_ptr - state->url.host; + memcpy(state->url.host, ahost_str, ahost_len + 1); + state->offset += ahost_len - prev_len; return SUCCESS; } else { @@ -1145,11 +1156,11 @@ static ZEND_RESULT_CODE parse_kidn(struct parse_state *state) #endif #if 0 && PHP_WIN32 -static ZEND_RESULT_CODE parse_widn_2003(struct parse_state *state) +static ZEND_RESULT_CODE parse_widn_2003(struct parse_state *state, size_t prev_len) { char *host_ptr; - uint16_t *uhost_str, ahost_str[256], *ahost_ptr; - size_t uhost_len; + uint16_t *uhost_str, ahost_str[256]; + size_t uhost_len, ahost_len; if (state->flags & PHP_HTTP_URL_PARSE_MBUTF8) { if (SUCCESS != to_utf16(parse_mb_utf8, state->url.host, &uhost_str, &uhost_len)) { @@ -1175,12 +1186,12 @@ static ZEND_RESULT_CODE parse_widn_2003(struct parse_state *state) } efree(uhost_str); - host_ptr = state->url.host; - ahost_ptr = ahost_str; - PHP_HTTP_DUFF(wcslen(ahost_str), *host_ptr++ = *ahost_ptr++); - - *host_ptr = '\0'; - state->offset += host_ptr - state->url.host; + ahost_len = wcslen(ahost_str); + state->url.host[ahost_len] = '\0'; + state->offset += ahost_len - prev_len; + while (ahost_len--) { + state->url.host[ahost_len] = ahost_str[ahost_len]; + } return SUCCESS; } @@ -1194,12 +1205,12 @@ static ZEND_RESULT_CODE parse_idna(struct parse_state *state, size_t len) || (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); +#if PHP_HTTP_HAVE_LIBICU && HAVE_UIDNA_NAMETOASCII_UTF8 + return parse_uidn_2008(state, len); #elif PHP_HTTP_HAVE_LIBIDN2 return parse_gidn_2008(state, len); #elif PHP_HTTP_HAVE_LIBIDNKIT2 - return parse_kidn(state); + return parse_kidn(state, len); #endif } #endif @@ -1211,31 +1222,31 @@ static ZEND_RESULT_CODE parse_idna(struct parse_state *state, size_t len) #endif ) { #if HAVE_UIDNA_IDNTOASCII - return parse_uidn_2003(state); + return parse_uidn_2003(state, len); #elif PHP_HTTP_HAVE_LIBIDN return parse_gidn_2003(state, len); #elif PHP_HTTP_HAVE_LIBIDNKIT - return parse_kidn(state); + return parse_kidn(state, len); #endif } #endif #if 0 && PHP_WIN32 - return parse_widn_2003(state); + return parse_widn_2003(state, len); #endif -#if HAVE_UIDNA_NAMETOASCII_UTF8 - return parse_uidn_2008(state); +#if PHP_HTTP_HAVE_LIBICU && HAVE_UIDNA_NAMETOASCII_UTF8 + return parse_uidn_2008(state, len); #elif PHP_HTTP_HAVE_LIBIDN2 return parse_gidn_2008(state, len); #elif PHP_HTTP_HAVE_LIBIDNKIT2 - return parse_kidn(state); + return parse_kidn(state, len); #elif HAVE_UIDNA_IDNTOASCII - return parse_uidn_2003(state); + return parse_uidn_2003(state, len); #elif PHP_HTTP_HAVE_LIBIDN return parse_gidn_2003(state, len); #elif PHP_HTTP_HAVE_LIBIDNKIT - return parse_kidn(state); + return parse_kidn(state, len); #endif return SUCCESS; @@ -1416,7 +1427,7 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt return FAILURE; } break; - } else if (!(mb = parse_mb(state, PARSE_HOSTINFO, ptr, end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) { + } else if (!(mb = parse_mb(state, PARSE_HOSTINFO, ptr, end, tmp, 0))) { if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { return FAILURE; } @@ -1538,7 +1549,7 @@ static const char *parse_path(struct parse_state *state) break; default: - if (!(mb = parse_mb(state, PARSE_PATH, state->ptr, state->end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) { + if (!(mb = parse_mb(state, PARSE_PATH, state->ptr, state->end, tmp, 0))) { if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { return NULL; } @@ -1628,7 +1639,7 @@ static const char *parse_query(struct parse_state *state) break; default: - if (!(mb = parse_mb(state, PARSE_QUERY, state->ptr, state->end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) { + if (!(mb = parse_mb(state, PARSE_QUERY, state->ptr, state->end, tmp, 0))) { if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { return NULL; } @@ -1725,7 +1736,7 @@ static const char *parse_fragment(struct parse_state *state) break; default: - if (!(mb = parse_mb(state, PARSE_FRAGMENT, state->ptr, state->end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) { + if (!(mb = parse_mb(state, PARSE_FRAGMENT, state->ptr, state->end, tmp, 0))) { if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) { return NULL; } @@ -1810,7 +1821,9 @@ php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags) state->maxlen = maxlen; if (!parse_scheme(state)) { - php_error_docref(NULL, E_WARNING, "Failed to parse URL scheme: '%s'", state->ptr); + if (!(flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, "Failed to parse URL scheme: '%s'", state->ptr); + } efree(state); return NULL; } @@ -1821,13 +1834,17 @@ php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags) } if (!parse_query(state)) { - php_error_docref(NULL, E_WARNING, "Failed to parse URL query: '%s'", state->ptr); + if (!(flags & PHP_HTTP_URL_SILENT_ERRORS)) { + 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, E_WARNING, "Failed to parse URL fragment: '%s'", state->ptr); + if (!(flags & PHP_HTTP_URL_SILENT_ERRORS)) { + php_error_docref(NULL, E_WARNING, "Failed to parse URL fragment: '%s'", state->ptr); + } efree(state); return NULL; } @@ -1896,9 +1913,7 @@ PHP_METHOD(HttpUrl, __construct) flags |= PHP_HTTP_URL_FROM_ENV; } - if (flags & PHP_HTTP_URL_SILENT_ERRORS) { - zend_replace_error_handling(EH_SUPPRESS, NULL, &zeh); - } else if (flags & PHP_HTTP_URL_IGNORE_ERRORS) { + if (flags & (PHP_HTTP_URL_SILENT_ERRORS|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); @@ -1950,9 +1965,7 @@ PHP_METHOD(HttpUrl, mod) php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "z!|l", &new_url, &flags), invalid_arg, return); - if (flags & PHP_HTTP_URL_SILENT_ERRORS) { - zend_replace_error_handling(EH_SUPPRESS, NULL, &zeh); - } else if (flags & PHP_HTTP_URL_IGNORE_ERRORS) { + if (flags & (PHP_HTTP_URL_SILENT_ERRORS|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); @@ -2022,7 +2035,7 @@ PHP_METHOD(HttpUrl, toArray) } static zend_function_entry php_http_url_methods[] = { - PHP_ME(HttpUrl, __construct, ai_HttpUrl___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(HttpUrl, __construct, ai_HttpUrl___construct, ZEND_ACC_PUBLIC) PHP_ME(HttpUrl, mod, ai_HttpUrl_mod, ZEND_ACC_PUBLIC) PHP_ME(HttpUrl, toString, ai_HttpUrl_toString, ZEND_ACC_PUBLIC) ZEND_MALIAS(HttpUrl, __toString, toString, ai_HttpUrl_toString, ZEND_ACC_PUBLIC)