projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
codename: client meltdown
[m6w6/ext-http]
/
php_http.c
diff --git
a/php_http.c
b/php_http.c
index 95f8ad57233f54fb46f9afa6cf7fe436943a3c88..914d6953ca95cfa5b2d7a540a70009558c53174f 100644
(file)
--- a/
php_http.c
+++ b/
php_http.c
@@
-45,6
+45,7
@@
PHP_MINFO_FUNCTION(http);
static zend_module_dep http_module_deps[] = {
ZEND_MOD_REQUIRED("raphf")
static zend_module_dep http_module_deps[] = {
ZEND_MOD_REQUIRED("raphf")
+ ZEND_MOD_REQUIRED("propro")
ZEND_MOD_REQUIRED("spl")
#ifdef PHP_HTTP_HAVE_HASH
ZEND_MOD_REQUIRED("hash")
ZEND_MOD_REQUIRED("spl")
#ifdef PHP_HTTP_HAVE_HASH
ZEND_MOD_REQUIRED("hash")
@@
-165,20
+166,13
@@
PHP_MINIT_FUNCTION(http)
|| SUCCESS != PHP_MINIT_CALL(http_header)
|| SUCCESS != PHP_MINIT_CALL(http_message)
|| SUCCESS != PHP_MINIT_CALL(http_message_body)
|| SUCCESS != PHP_MINIT_CALL(http_header)
|| SUCCESS != PHP_MINIT_CALL(http_message)
|| SUCCESS != PHP_MINIT_CALL(http_message_body)
- || SUCCESS != PHP_MINIT_CALL(http_property_proxy)
|| SUCCESS != PHP_MINIT_CALL(http_querystring)
|| SUCCESS != PHP_MINIT_CALL(http_querystring)
- || SUCCESS != PHP_MINIT_CALL(http_client_interface)
|| SUCCESS != PHP_MINIT_CALL(http_client)
|| SUCCESS != PHP_MINIT_CALL(http_client_request)
|| SUCCESS != PHP_MINIT_CALL(http_client_response)
|| SUCCESS != PHP_MINIT_CALL(http_client)
|| SUCCESS != PHP_MINIT_CALL(http_client_request)
|| SUCCESS != PHP_MINIT_CALL(http_client_response)
- || SUCCESS != PHP_MINIT_CALL(http_client_datashare)
- || SUCCESS != PHP_MINIT_CALL(http_client_pool)
- || SUCCESS != PHP_MINIT_CALL(http_client_factory)
#if PHP_HTTP_HAVE_CURL
|| SUCCESS != PHP_MINIT_CALL(http_curl)
#if PHP_HTTP_HAVE_CURL
|| SUCCESS != PHP_MINIT_CALL(http_curl)
- || SUCCESS != PHP_MINIT_CALL(http_curl_client)
- || SUCCESS != PHP_MINIT_CALL(http_curl_client_pool)
- || SUCCESS != PHP_MINIT_CALL(http_curl_client_datashare)
+ || SUCCESS != PHP_MINIT_CALL(http_client_curl)
#endif
|| SUCCESS != PHP_MINIT_CALL(http_url)
|| SUCCESS != PHP_MINIT_CALL(http_env)
#endif
|| SUCCESS != PHP_MINIT_CALL(http_url)
|| SUCCESS != PHP_MINIT_CALL(http_env)
@@
-201,10
+195,10
@@
PHP_MSHUTDOWN_FUNCTION(http)
if (0
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
#if PHP_HTTP_HAVE_CURL
if (0
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
#if PHP_HTTP_HAVE_CURL
- || SUCCESS != PHP_MSHUTDOWN_CALL(http_c
url_client
)
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_c
lient_curl
)
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
#endif
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
#endif
- || SUCCESS != PHP_MSHUTDOWN_CALL(http_client
_factory
)
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_client)
) {
return FAILURE;
}
) {
return FAILURE;
}
@@
-219,7
+213,7
@@
PHP_RINIT_FUNCTION(http)
if (0
|| SUCCESS != PHP_RINIT_CALL(http_env)
#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
if (0
|| SUCCESS != PHP_RINIT_CALL(http_env)
#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- || SUCCESS != PHP_RINIT_CALL(http_c
url_client_poo
l)
+ || SUCCESS != PHP_RINIT_CALL(http_c
lient_cur
l)
#endif
) {
return FAILURE;
#endif
) {
return FAILURE;
@@
-232,7
+226,7
@@
PHP_RSHUTDOWN_FUNCTION(http)
{
if (0
#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
{
if (0
#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
- || SUCCESS != PHP_RSHUTDOWN_CALL(http_c
url_client_poo
l)
+ || SUCCESS != PHP_RSHUTDOWN_CALL(http_c
lient_cur
l)
#endif
|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
) {
#endif
|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
) {