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 2ed94c8e1bf78cdf231445735a29ec05ffc64d70..2ff20f105321e0ba4271480d3695570ecaf60e88 100644
(file)
--- a/
php_http.c
+++ b/
php_http.c
@@
-6,7
+6,7
@@
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-201
3
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-201
4
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
@@
-20,11
+20,18
@@
#if PHP_HTTP_HAVE_CURL
# include <curl/curl.h>
# if PHP_HTTP_HAVE_EVENT
#if PHP_HTTP_HAVE_CURL
# include <curl/curl.h>
# if PHP_HTTP_HAVE_EVENT
-# include <event.h>
+# if PHP_HTTP_HAVE_EVENT2
+# include <event2/event.h>
+# include <event2/event_struct.h>
+# else
+# include <event.h>
+# 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);
@@
-39,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);
@@
-52,12
+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
-#ifdef PHP_HTTP_HAVE_EVENT
- ZEND_MOD_CONFLICTS("event")
#endif
{NULL, NULL, NULL, 0}
};
#endif
{NULL, NULL, NULL, 0}
};
@@
-70,10
+70,10
@@
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_RSHUTDOWN(http),
PHP_MINFO(http),
- PHP_
HTTP_EXT
_VERSION,
+ PHP_
PECL_HTTP
_VERSION,
STANDARD_MODULE_PROPERTIES
};
STANDARD_MODULE_PROPERTIES
};
@@
-139,7
+139,9
@@
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)
+ || SUCCESS != PHP_MINIT_CALL(http_message_parser)
|| SUCCESS != PHP_MINIT_CALL(http_message_body)
|| SUCCESS != PHP_MINIT_CALL(http_querystring)
|| SUCCESS != PHP_MINIT_CALL(http_client)
|| SUCCESS != PHP_MINIT_CALL(http_message_body)
|| SUCCESS != PHP_MINIT_CALL(http_querystring)
|| SUCCESS != PHP_MINIT_CALL(http_client)
@@
-181,26
+183,9
@@
PHP_MSHUTDOWN_FUNCTION(http)
return SUCCESS;
}
return SUCCESS;
}
-PHP_RINIT_FUNCTION(http)
-{
- if (0
- || SUCCESS != PHP_RINIT_CALL(http_env)
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- || SUCCESS != PHP_RINIT_CALL(http_client_curl)
-#endif
- ) {
- return FAILURE;
- }
-
- return SUCCESS;
-}
-
PHP_RSHUTDOWN_FUNCTION(http)
{
if (0
PHP_RSHUTDOWN_FUNCTION(http)
{
if (0
-#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- || SUCCESS != PHP_RSHUTDOWN_CALL(http_client_curl)
-#endif
|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
) {
return FAILURE;
|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
) {
return FAILURE;
@@
-217,7
+202,7
@@
PHP_MINFO_FUNCTION(http)
php_info_print_table_start();
php_info_print_table_header(2, "HTTP Support", "enabled");
php_info_print_table_start();
php_info_print_table_header(2, "HTTP Support", "enabled");
- php_info_print_table_row(2, "Extension Version", PHP_
HTTP_EXT
_VERSION);
+ php_info_print_table_row(2, "Extension Version", PHP_
PECL_HTTP
_VERSION);
php_info_print_table_end();
php_info_print_table_start();
php_info_print_table_end();
php_info_print_table_start();
@@
-244,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();