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 R_2_5
[m6w6/ext-http]
/
php_http.c
diff --git
a/php_http.c
b/php_http.c
index d430e1f13538fce89cfb75a8005e18a0c5e6d6ad..f9bb4d09c886f4e049e852d9b983e38194821eee 100644
(file)
--- a/
php_http.c
+++ b/
php_http.c
@@
-28,8
+28,10
@@
# endif
# endif
#endif
# endif
# endif
#endif
-#if PHP_HTTP_HAVE_SERF
-# include <serf.h>
+#if PHP_HTTP_HAVE_IDN2
+# include <idn2.h>
+#elif PHP_HTTP_HAVE_IDN
+# include <idna.h>
#endif
ZEND_DECLARE_MODULE_GLOBALS(php_http);
#endif
ZEND_DECLARE_MODULE_GLOBALS(php_http);
@@
-104,11
+106,11
@@
static void php_http_globals_init_once(zend_php_http_globals *G)
}
#if 0
}
#if 0
-static inline void php_http_globals_init(zend_php_http_globals *G
TSRMLS_DC
)
+static inline void php_http_globals_init(zend_php_http_globals *G)
{
}
{
}
-static inline void php_http_globals_free(zend_php_http_globals *G
TSRMLS_DC
)
+static inline void php_http_globals_free(zend_php_http_globals *G)
{
}
#endif
{
}
#endif
@@
-220,6
+222,12
@@
PHP_MINFO_FUNCTION(http)
php_info_print_table_row(3, "libevent", "disabled", "disabled");
#endif
php_info_print_table_row(3, "libevent", "disabled", "disabled");
#endif
+#if PHP_HTTP_HAVE_IDN2
+ php_info_print_table_row(3, "libidn2 (IDNA2008)", IDN2_VERSION, idn2_check_version(NULL));
+#elif PHP_HTTP_HAVE_IDN
+ php_info_print_table_row(3, "libidn (IDNA2003)", PHP_HTTP_LIBIDN_VERSION, "unknown");
+#endif
+
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
php_info_print_table_end();
DISPLAY_INI_ENTRIES();