projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
3bd2c5e
)
fix ICU ifdefs
author
Michael Wallner
<mike@php.net>
Fri, 21 Oct 2016 08:50:42 +0000
(10:50 +0200)
committer
Michael Wallner
<mike@php.net>
Fri, 21 Oct 2016 08:50:53 +0000
(10:50 +0200)
src/php_http_url.c
patch
|
blob
|
history
diff --git
a/src/php_http_url.c
b/src/php_http_url.c
index 5e8592ed8c7c0ae28adb95c19ba068ed172e40b2..ce09754a91874f44fe6e32f1306cdcaa131610c9 100644
(file)
--- a/
src/php_http_url.c
+++ b/
src/php_http_url.c
@@
-972,9
+972,7
@@
static ZEND_RESULT_CODE parse_gidn_2003(struct parse_state *state, size_t prev_l
#endif
#if HAVE_UIDNA_IDNTOASCII
#endif
#if HAVE_UIDNA_IDNTOASCII
-# if PHP_HTTP_HAVE_LIBICU
-# include <unicode/uidna.h>
-# 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);
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);
@@
-1034,10
+1032,7
@@
static ZEND_RESULT_CODE parse_uidn_2003(struct parse_state *state)
}
#endif
}
#endif
-#if HAVE_UIDNA_IDNTOASCII
-# if PHP_HTTP_HAVE_LIBICU
-# include <unicode/uidna.h>
-# endif
+#if PHP_HTTP_HAVE_LIBICU && HAVE_UIDNA_NAMETOASCII_UTF8
static ZEND_RESULT_CODE parse_uidn_2008(struct parse_state *state)
{
char *host_ptr, *error = NULL, ebuf[64] = {0};
static ZEND_RESULT_CODE parse_uidn_2008(struct parse_state *state)
{
char *host_ptr, *error = NULL, ebuf[64] = {0};
@@
-1194,7
+1189,7
@@
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
) {
|| (state->flags & PHP_HTTP_URL_PARSE_TOIDN_2003) != PHP_HTTP_URL_PARSE_TOIDN_2003
# endif
) {
-#if HAVE_UIDNA_NAMETOASCII_UTF8
+#if
PHP_HTTP_HAVE_LIBICU &&
HAVE_UIDNA_NAMETOASCII_UTF8
return parse_uidn_2008(state);
#elif PHP_HTTP_HAVE_LIBIDN2
return parse_gidn_2008(state, len);
return parse_uidn_2008(state);
#elif PHP_HTTP_HAVE_LIBIDN2
return parse_gidn_2008(state, len);
@@
-1224,7
+1219,7
@@
static ZEND_RESULT_CODE parse_idna(struct parse_state *state, size_t len)
return parse_widn_2003(state);
#endif
return parse_widn_2003(state);
#endif
-#if HAVE_UIDNA_NAMETOASCII_UTF8
+#if
PHP_HTTP_HAVE_LIBICU &&
HAVE_UIDNA_NAMETOASCII_UTF8
return parse_uidn_2008(state);
#elif PHP_HTTP_HAVE_LIBIDN2
return parse_gidn_2008(state, len);
return parse_uidn_2008(state);
#elif PHP_HTTP_HAVE_LIBIDN2
return parse_gidn_2008(state, len);