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 'master' into phpng
[m6w6/ext-http]
/
php_http.c
diff --git
a/php_http.c
b/php_http.c
index bd7baff1078fffbad0a4cb5bd1b3e7be73b6c497..6d4384d71133a22095cef60e3b5a1237057b7ac8 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);
@@
-113,14
+115,6
@@
static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC)
}
#endif
}
#endif
-#if ZTS && PHP_DEBUG && !HAVE_GCOV
-zend_php_http_globals *php_http_globals(void)
-{
- TSRMLS_FETCH();
- return PHP_HTTP_G;
-}
-#endif
-
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode, zend_php_http_globals, php_http_globals)
PHP_INI_END()
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode, zend_php_http_globals, php_http_globals)
PHP_INI_END()
@@
-132,6
+126,7
@@
PHP_MINIT_FUNCTION(http)
REGISTER_INI_ENTRIES();
if (0
REGISTER_INI_ENTRIES();
if (0
+ || SUCCESS != PHP_MINIT_CALL(http_object)
|| SUCCESS != PHP_MINIT_CALL(http_exception)
|| SUCCESS != PHP_MINIT_CALL(http_cookie)
|| SUCCESS != PHP_MINIT_CALL(http_encoding)
|| SUCCESS != PHP_MINIT_CALL(http_exception)
|| SUCCESS != PHP_MINIT_CALL(http_cookie)
|| SUCCESS != PHP_MINIT_CALL(http_encoding)
@@
-227,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();