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 max-age to http\Cookie
[m6w6/ext-http]
/
php_http_curl_client_pool.c
diff --git
a/php_http_curl_client_pool.c
b/php_http_curl_client_pool.c
index 6ae1da658ae99886433b3fb347fa106ee1fd749a..4edff74e99341166225dd26056bc13a46616c9d8 100644
(file)
--- a/
php_http_curl_client_pool.c
+++ b/
php_http_curl_client_pool.c
@@
-62,7
+62,7
@@
static void php_http_curl_client_pool_responsehandler(php_http_client_pool_t *po
zval **request;
if (CURLE_OK != msg->data.result) {
zval **request;
if (CURLE_OK != msg->data.result) {
- php_http_curl_client_storage_t *st = get_storage(msg->easy_handle);
+ php_http_curl_client_storage_t *st =
php_http_curl_client_
get_storage(msg->easy_handle);
php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "%s; %s (%s)", curl_easy_strerror(msg->data.result), STR_PTR(st->errorbuffer), STR_PTR(st->url));
}
php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "%s; %s (%s)", curl_easy_strerror(msg->data.result), STR_PTR(st->errorbuffer), STR_PTR(st->url));
}
@@
-556,16
+556,26
@@
PHP_MINIT_FUNCTION(http_curl_client_pool)
return SUCCESS;
}
return SUCCESS;
}
+#if PHP_HTTP_HAVE_EVENT
PHP_RINIT_FUNCTION(http_curl_client_pool)
{
PHP_RINIT_FUNCTION(http_curl_client_pool)
{
-#if PHP_HTTP_HAVE_EVENT
if (!PHP_HTTP_G->curl.event_base && !(PHP_HTTP_G->curl.event_base = event_base_new())) {
return FAILURE;
}
if (!PHP_HTTP_G->curl.event_base && !(PHP_HTTP_G->curl.event_base = event_base_new())) {
return FAILURE;
}
+ return SUCCESS;
+}
#endif
#endif
+#if PHP_HTTP_HAVE_EVENT
+PHP_RSHUTDOWN_FUNCTION(http_curl_client_pool)
+{
+ if (PHP_HTTP_G->curl.event_base) {
+ event_base_free(PHP_HTTP_G->curl.event_base);
+ PHP_HTTP_G->curl.event_base = NULL;
+ }
return SUCCESS;
}
return SUCCESS;
}
+#endif
#endif /* PHP_HTTP_HAVE_CURL */
#endif /* PHP_HTTP_HAVE_CURL */