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 example scripts, as those can be extracted from tutorial.txt with extract.php
[m6w6/ext-http]
/
http_request_pool_api.c
diff --git
a/http_request_pool_api.c
b/http_request_pool_api.c
index 188bb9d326aea647f94dd678ea8463ef33c8e973..9abbc3a76bb3ec1fe87b7b1faa1a2b5a448bcd83 100644
(file)
--- a/
http_request_pool_api.c
+++ b/
http_request_pool_api.c
@@
-120,6
+120,7
@@
PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
/* {{{ STATUS http_request_pool_detach(http_request_pool *, zval *) */
PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC)
{
/* {{{ STATUS http_request_pool_detach(http_request_pool *, zval *) */
PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC)
{
+ CURLMcode code;
getObjectEx(http_request_object, req, request);
#if HTTP_DEBUG_REQPOOLS
getObjectEx(http_request_object, req, request);
#if HTTP_DEBUG_REQPOOLS
@@
-133,22
+134,18
@@
PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req
#endif
} else if (req->pool != pool) {
http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is not attached to this HttpRequestPool", Z_OBJ_HANDLE_P(request));
#endif
} else if (req->pool != pool) {
http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is not attached to this HttpRequestPool", Z_OBJ_HANDLE_P(request));
+ } else if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->ch))) {
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code));
} else {
} else {
- CURLMcode code;
-
req->pool = NULL;
req->pool = NULL;
- zend_llist_del_element(&pool->handles, request, http_request_pool_compare_handles);
zend_llist_del_element(&pool->finished, request, http_request_pool_compare_handles);
zend_llist_del_element(&pool->finished, request, http_request_pool_compare_handles);
+ zend_llist_del_element(&pool->handles, request, http_request_pool_compare_handles);
#if HTTP_DEBUG_REQPOOLS
fprintf(stderr, "> %d HttpRequests remaining in pool %p\n", zend_llist_count(&pool->handles), pool);
#endif
#if HTTP_DEBUG_REQPOOLS
fprintf(stderr, "> %d HttpRequests remaining in pool %p\n", zend_llist_count(&pool->handles), pool);
#endif
-
- if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->ch))) {
- http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object from the HttpRequestPool: %s", curl_multi_strerror(code));
- } else {
- return SUCCESS;
- }
+
+ return SUCCESS;
}
return FAILURE;
}
}
return FAILURE;
}