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 17d9925b5af8d3b01409b613aeb2dca69f76545b..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);
@@
-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,
@@
-108,23
+106,15
@@
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
-#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()
@@
-136,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)
@@
-185,17
+176,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
@@
-242,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();