projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
remove unsued _to_struct
[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 ddac5c18552f015b13047694fb009dbb7c9bb7a3..5f175699fdf9e99086691a6e3f38708eec54247e 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));
}
@@
-527,11
+527,7
@@
zend_object_value php_http_curl_client_pool_object_new_ex(zend_class_entry *ce,
o = ecalloc(1, sizeof(php_http_client_pool_object_t));
zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
o = ecalloc(1, sizeof(php_http_client_pool_object_t));
zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
-#if PHP_VERSION_ID < 50339
- zend_hash_copy(((zend_object *) o)->properties, &(ce->default_properties), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval*));
-#else
object_properties_init((zend_object *) o, ce);
object_properties_init((zend_object *) o, ce);
-#endif
if (!(o->pool = p)) {
o->pool = php_http_client_pool_init(NULL, &php_http_curl_client_pool_ops, NULL, NULL TSRMLS_CC);
if (!(o->pool = p)) {
o->pool = php_http_client_pool_init(NULL, &php_http_curl_client_pool_ops, NULL, NULL TSRMLS_CC);
@@
-560,16
+556,25
@@
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);
+ }
return SUCCESS;
}
return SUCCESS;
}
+#endif
#endif /* PHP_HTTP_HAVE_CURL */
#endif /* PHP_HTTP_HAVE_CURL */