X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_url.c;h=2055df7a33890724162dd292e4f085f06e071ee6;hp=ad4f14cb87d222c47c227602dd7c418b74d23d10;hb=d5d03014cff8c8ca80ee7866af100d3ceae1bd8f;hpb=13662c61792685435496cd25c95ee1c1950cd9d7

diff --git a/src/php_http_url.c b/src/php_http_url.c
index ad4f14c..2055df7 100644
--- a/src/php_http_url.c
+++ b/src/php_http_url.c
@@ -19,6 +19,7 @@
 #	include <idn2.h>
 #endif
 #if PHP_HTTP_HAVE_LIBICU
+#	include <unicode/uchar.h>
 #	include <unicode/uidna.h>
 #endif
 #if PHP_HTTP_HAVE_LIBIDNKIT || PHP_HTTP_HAVE_LIBIDNKIT2
@@ -742,7 +743,11 @@ static inline size_t parse_mb(struct parse_state *state, parse_mb_what_t what, c
 			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
@@ -2030,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)