projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- module/includes cleanup
[m6w6/ext-http]
/
http_request_pool_api.c
diff --git
a/http_request_pool_api.c
b/http_request_pool_api.c
index 0faf2756c13f5fae199891bfd1eb94e73c9d60f6..48c1cde8a2995bb1496e9192e8373549cce4c350 100644
(file)
--- a/
http_request_pool_api.c
+++ b/
http_request_pool_api.c
@@
-15,16
+15,16
@@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#include "php_http.h"
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
-#include "php_http.h"
-#include "php_http_std_defs.h"
#include "php_http_api.h"
#include "php_http_request_api.h"
#include "php_http_api.h"
#include "php_http_request_api.h"
-#include "php_http_request_pool_api.h"
#include "php_http_request_object.h"
#include "php_http_request_object.h"
+#include "php_http_request_pool_api.h"
#include "php_http_requestpool_object.h"
#ifndef HTTP_DEBUG_REQPOOLS
#include "php_http_requestpool_object.h"
#ifndef HTTP_DEBUG_REQPOOLS
@@
-103,7
+103,6
@@
PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
zend_llist_add_element(&pool->bodies, &body);
ZVAL_ADDREF(request);
zend_llist_add_element(&pool->bodies, &body);
ZVAL_ADDREF(request);
- Z_OBJ_ADDREF_P(request);
#if HTTP_DEBUG_REQPOOLS
fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool);
#if HTTP_DEBUG_REQPOOLS
fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool);
@@
-121,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
@@
-134,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;
}
@@
-273,7
+269,7
@@
PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished));
while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished));
- while (
msg = curl_multi_info_read(pool->ch, &remaining
)) {
+ while (
(msg = curl_multi_info_read(pool->ch, &remaining)
)) {
if (CURLMSG_DONE == msg->msg) {
if (CURLE_OK != msg->data.result) {
http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result));
if (CURLMSG_DONE == msg->msg) {
if (CURLE_OK != msg->data.result) {
http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result));
@@
-310,7
+306,6
@@
void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC)
#endif
ZVAL_ADDREF(*req);
#endif
ZVAL_ADDREF(*req);
- Z_OBJ_ADDREF_PP(req);
zend_llist_add_element(&obj->pool->finished, req);
http_request_object_responsehandler(obj, *req);
}
zend_llist_add_element(&obj->pool->finished, req);
http_request_object_responsehandler(obj, *req);
}