X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_url.c;h=cead8c8ddc95c026d090d0e56391f269773eb3a3;hp=3c68996689b0ce60c3b7005e63698831c95053a6;hb=96202e444961b5df27adacae7b155312d038dd87;hpb=80bb9787a447fd8443b824f4b3f38ecf87eca9b6

diff --git a/src/php_http_url.c b/src/php_http_url.c
index 3c68996..cead8c8 100644
--- a/src/php_http_url.c
+++ b/src/php_http_url.c
@@ -947,11 +947,11 @@ static ZEND_RESULT_CODE parse_gidn_2003(struct parse_state *state, size_t prev_l
 	int rv = -1;
 
 	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);
 	}
 #	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) {
@@ -1043,7 +1043,7 @@ 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|UIDNA_USE_STD3_RULES, &rc);
+	UIDNA *uidna = uidna_openUTS46(UIDNA_ALLOW_UNASSIGNED, &rc);
 
 	if (!uidna || U_FAILURE(rc)) {
 		return FAILURE;
@@ -1189,9 +1189,9 @@ static ZEND_RESULT_CODE parse_widn_2003(struct parse_state *state)
 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)
+	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)
+	||	(state->flags & PHP_HTTP_URL_PARSE_TOIDN_2003) != PHP_HTTP_URL_PARSE_TOIDN_2003
 #	endif
 	) {
 #if HAVE_UIDNA_NAMETOASCII_UTF8
@@ -1205,9 +1205,9 @@ static ZEND_RESULT_CODE parse_idna(struct parse_state *state, size_t len)
 #endif
 
 #if PHP_HTTP_HAVE_IDNA2003
-	if ((state->flags & PHP_HTTP_URL_PARSE_TOIDN_2003)
+	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)
+	||	(state->flags & PHP_HTTP_URL_PARSE_TOIDN_2008) != PHP_HTTP_URL_PARSE_TOIDN_2008
 #endif
 	) {
 #if HAVE_UIDNA_IDNTOASCII