X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_requestpool_object.c;h=000a04478ebc36a3f81d1772d0248c287ccfbeaa;hb=3b8f17486dae1d9a0ea68e4c90efc5db30901a24;hp=09fc261045cbeac4469f52641b3c14921553daa2;hpb=76a1064dde808801f4988df89521a323661742aa;p=m6w6%2Fext-http diff --git a/http_requestpool_object.c b/http_requestpool_object.c index 09fc261..000a044 100644 --- a/http_requestpool_object.c +++ b/http_requestpool_object.c @@ -42,9 +42,15 @@ static inline void _http_requestpool_object_declare_default_properties(TSRMLS_D) zend_class_entry *http_requestpool_object_ce; zend_function_entry http_requestpool_object_fe[] = { PHP_ME(HttpRequestPool, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(HttpRequestPool, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) PHP_ME(HttpRequestPool, attach, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpRequestPool, detach, NULL, ZEND_ACC_PUBLIC) PHP_ME(HttpRequestPool, send, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HttpRequestPool, reset, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HttpRequestPool, socketSend, NULL, ZEND_ACC_PROTECTED) + PHP_ME(HttpRequestPool, socketSelect, NULL, ZEND_ACC_PROTECTED) + PHP_ME(HttpRequestPool, socketRead, NULL, ZEND_ACC_PROTECTED) {NULL, NULL, NULL} }; @@ -90,9 +96,7 @@ void _http_requestpool_object_free(zend_object *object TSRMLS_DC) zend_hash_destroy(OBJ_PROP(o)); FREE_HASHTABLE(OBJ_PROP(o)); } - if (o->pool.ch) { - curl_multi_cleanup(o->pool.ch); - } + http_request_pool_dtor(&o->pool); efree(o); }