projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
add missing test
[m6w6/ext-http]
/
php_http.c
diff --git
a/php_http.c
b/php_http.c
index f7a0b8698f03012f2d8460532fcdb37504ea5649..2ff20f105321e0ba4271480d3695570ecaf60e88 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);
@@
-44,7
+46,6
@@
zend_function_entry http_functions[] = {
PHP_MINIT_FUNCTION(http);
PHP_MSHUTDOWN_FUNCTION(http);
PHP_MINIT_FUNCTION(http);
PHP_MSHUTDOWN_FUNCTION(http);
-PHP_RINIT_FUNCTION(http);
PHP_RSHUTDOWN_FUNCTION(http);
PHP_MINFO_FUNCTION(http);
PHP_RSHUTDOWN_FUNCTION(http);
PHP_MINFO_FUNCTION(http);
@@
-57,9
+58,6
@@
static zend_module_dep http_module_deps[] = {
#endif
#ifdef PHP_HTTP_HAVE_ICONV
ZEND_MOD_REQUIRED("iconv")
#endif
#ifdef PHP_HTTP_HAVE_ICONV
ZEND_MOD_REQUIRED("iconv")
-#endif
-#ifdef PHP_HTTP_HAVE_JSON
- ZEND_MOD_REQUIRED("json")
#endif
{NULL, NULL, NULL, 0}
};
#endif
{NULL, NULL, NULL, 0}
};
@@
-72,7
+70,7
@@
zend_module_entry http_module_entry = {
http_functions,
PHP_MINIT(http),
PHP_MSHUTDOWN(http),
http_functions,
PHP_MINIT(http),
PHP_MSHUTDOWN(http),
-
PHP_RINIT(http)
,
+
NULL
,
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
PHP_PECL_HTTP_VERSION,
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
PHP_PECL_HTTP_VERSION,
@@
-141,6
+139,7
@@
PHP_MINIT_FUNCTION(http)
|| SUCCESS != PHP_MINIT_CALL(http_encoding)
|| SUCCESS != PHP_MINIT_CALL(http_filter)
|| SUCCESS != PHP_MINIT_CALL(http_header)
|| SUCCESS != PHP_MINIT_CALL(http_encoding)
|| SUCCESS != PHP_MINIT_CALL(http_filter)
|| SUCCESS != PHP_MINIT_CALL(http_header)
+ || SUCCESS != PHP_MINIT_CALL(http_header_parser)
|| SUCCESS != PHP_MINIT_CALL(http_message)
|| SUCCESS != PHP_MINIT_CALL(http_message_parser)
|| SUCCESS != PHP_MINIT_CALL(http_message_body)
|| SUCCESS != PHP_MINIT_CALL(http_message)
|| SUCCESS != PHP_MINIT_CALL(http_message_parser)
|| SUCCESS != PHP_MINIT_CALL(http_message_body)
@@
-184,17
+183,6
@@
PHP_MSHUTDOWN_FUNCTION(http)
return SUCCESS;
}
return SUCCESS;
}
-PHP_RINIT_FUNCTION(http)
-{
- if (0
- || SUCCESS != PHP_RINIT_CALL(http_env)
- ) {
- return FAILURE;
- }
-
- return SUCCESS;
-}
-
PHP_RSHUTDOWN_FUNCTION(http)
{
if (0
PHP_RSHUTDOWN_FUNCTION(http)
{
if (0
@@
-241,6
+229,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();