projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge branch 'v2.6.x' of ../ext-http
[m6w6/ext-http]
/
src
/
php_http_url.c
diff --git
a/src/php_http_url.c
b/src/php_http_url.c
index 3c68996689b0ce60c3b7005e63698831c95053a6..4d7629574993e365a6f1bead6cd4004701825103 100644
(file)
--- a/
src/php_http_url.c
+++ b/
src/php_http_url.c
@@
-854,7
+854,7
@@
static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt
break;
}
break;
}
- } while(++ptr
!=
end);
+ } while(++ptr
<
end);
state->buffer[state->offset++] = 0;
state->buffer[state->offset++] = 0;
@@
-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) {
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) {
}
# 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) {
}
# 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;
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;
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
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
# 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
# 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
#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
# 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
#endif
) {
#if HAVE_UIDNA_IDNTOASCII
@@
-1425,7
+1425,7
@@
static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt
label = ptr;
ptr += mb - 1;
}
label = ptr;
ptr += mb - 1;
}
- } while (++ptr
!=
end);
+ } while (++ptr
<
end);
if (!state->url.host) {
len = state->offset - len;
if (!state->url.host) {
len = state->offset - len;
@@
-1792,7
+1792,7
@@
static const char *parse_scheme(struct parse_state *state)
}
state->ptr += mb - 1;
}
}
state->ptr += mb - 1;
}
- } while (++state->ptr
!=
state->end);
+ } while (++state->ptr
<
state->end);
softfail:
state->offset = 0;
softfail:
state->offset = 0;