X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http.c;h=8cf8126ed44151efed4dfaf46a6fb8b035ef270e;hb=3d3727416df3f7b51b10a5c5d5af7249d5500222;hp=4130bce904c027369227bc119d7189ef59423da1;hpb=2e92ec70991d53cb3d6d710ae7a6b3a6b31ec978;p=m6w6%2Fext-http

diff --git a/src/php_http.c b/src/php_http.c
index 4130bce..8cf8126 100644
--- a/src/php_http.c
+++ b/src/php_http.c
@@ -31,16 +31,19 @@
 #if PHP_HTTP_HAVE_LIBICU
 #	include <unicode/uversion.h>
 #endif
+#if PHP_HTTP_HAVE_LIBIDN
+#	include <idna.h>
+#endif
 #if PHP_HTTP_HAVE_LIBIDN2
 #	include <idn2.h>
 #endif
-#if PHP_HTTP_HAVE_LIBIDN
-#	include <idna.h>
+#if PHP_HTTP_HAVE_LIBIDNKIT2 || PHP_HTTP_HAVE_LIBIDNKIT
+#include "idn/version.h"
 #endif
 
 ZEND_DECLARE_MODULE_GLOBALS(php_http);
 
-#ifdef COMPILE_DL_HTTP
+#if COMPILE_DL_HTTP
 ZEND_GET_MODULE(http)
 #endif
 
@@ -55,12 +58,11 @@ PHP_MINFO_FUNCTION(http);
 
 static zend_module_dep http_module_deps[] = {
 	ZEND_MOD_REQUIRED("raphf")
-	ZEND_MOD_REQUIRED("propro")
 	ZEND_MOD_REQUIRED("spl")
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
 	ZEND_MOD_REQUIRED("hash")
 #endif
-#ifdef PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
 	ZEND_MOD_REQUIRED("iconv")
 #endif
 	{NULL, NULL, NULL, 0}
@@ -134,6 +136,10 @@ PHP_MINIT_FUNCTION(http)
 	|| SUCCESS != PHP_MINIT_CALL(http_exception)
 	|| SUCCESS != PHP_MINIT_CALL(http_cookie)
 	|| SUCCESS != PHP_MINIT_CALL(http_encoding)
+	|| SUCCESS != PHP_MINIT_CALL(http_encoding_zlib)
+#if PHP_HTTP_HAVE_LIBBROTLI
+	|| SUCCESS != PHP_MINIT_CALL(http_encoding_brotli)
+#endif
 	|| SUCCESS != PHP_MINIT_CALL(http_filter)
 	|| SUCCESS != PHP_MINIT_CALL(http_header)
 	|| SUCCESS != PHP_MINIT_CALL(http_header_parser)
@@ -257,7 +263,16 @@ PHP_MINFO_FUNCTION(http)
 #else
 	php_info_print_table_row(3, "libidn (IDNA2003)", "disabled", "disabled");
 #endif
-
+#if PHP_HTTP_HAVE_LIBIDNKIT2
+	php_info_print_table_row(3, "libidnkit2 (IDNA2008)",  IDNKIT_VERSION_LIBIDN, idn_version_libidn());
+#else
+	php_info_print_table_row(3, "libidnkit2 (IDNA2008)", "disabled", "disabled");
+#endif
+#if PHP_HTTP_HAVE_LIBIDNKIT
+	php_info_print_table_row(3, "libidnkit (IDNA2003)",  IDNKIT_VERSION, idn_version_getstring());
+#else
+	php_info_print_table_row(3, "libidnkit (IDNA2003)", "disabled", "disabled");
+#endif
 	php_info_print_table_end();
 	
 	DISPLAY_INI_ENTRIES();