/*
- +----------------------------------------------------------------------+
- | PECL :: http |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, that |
- | is bundled with this package in the file LICENSE, and is available |
- | through the world-wide-web at http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Copyright (c) 2004-2005 Michael Wallner <mike@php.net> |
- +----------------------------------------------------------------------+
+ +--------------------------------------------------------------------+
+ | PECL :: http |
+ +--------------------------------------------------------------------+
+ | Redistribution and use in source and binary forms, with or without |
+ | modification, are permitted provided that the conditions mentioned |
+ | in the accompanying LICENSE file are met. |
+ +--------------------------------------------------------------------+
+ | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
*/
/* $Id$ */
-
#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)
-#include "php_http_std_defs.h"
+#include "zend_interfaces.h"
+
#include "php_http_api.h"
-#include "php_http_requestpool_object.h"
-#include "php_http_request_pool_api.h"
-#include "php_http_request_object.h"
#include "php_http_exception_object.h"
+#include "php_http_request_api.h"
+#include "php_http_request_object.h"
+#include "php_http_request_pool_api.h"
+#include "php_http_requestpool_object.h"
-#include "zend_interfaces.h"
-
-#ifdef PHP_WIN32
-# include <winsock2.h>
+#if defined(HAVE_SPL) && !defined(WONKY)
+/* SPL doesn't install its headers */
+extern PHPAPI zend_class_entry *spl_ce_Countable;
#endif
-#include <curl/curl.h>
#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpRequestPool, method, 0, req_args)
#define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpRequestPool, method, ret_ref)
#define HTTP_REQPOOL_ME(method, visibility) PHP_ME(HttpRequestPool, method, HTTP_ARGS(HttpRequestPool, method), visibility)
-HTTP_BEGIN_ARGS_AR(HttpRequestPool, __construct, 0, 0)
+HTTP_BEGIN_ARGS(__construct, 0)
HTTP_ARG_OBJ(HttpRequest, request0, 0)
HTTP_ARG_OBJ(HttpRequest, request1, 0)
HTTP_ARG_OBJ(HttpRequest, requestN, 0)
HTTP_EMPTY_ARGS(next, 0);
HTTP_EMPTY_ARGS(rewind, 0);
+HTTP_EMPTY_ARGS(count, 0);
+
HTTP_EMPTY_ARGS(getAttachedRequests, 0);
HTTP_EMPTY_ARGS(getFinishedRequests, 0);
-HTTP_BEGIN_ARGS(setRequestOptions, 0)
- HTTP_ARG_VAL(options, 0)
-HTTP_END_ARGS;
-
#define http_requestpool_object_declare_default_properties() _http_requestpool_object_declare_default_properties(TSRMLS_C)
static inline void _http_requestpool_object_declare_default_properties(TSRMLS_D);
HTTP_REQPOOL_ME(socketPerform, ZEND_ACC_PROTECTED)
HTTP_REQPOOL_ME(socketSelect, ZEND_ACC_PROTECTED)
- /* implements Interator */
+ /* implements Iterator */
HTTP_REQPOOL_ME(valid, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(current, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(key, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(next, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(rewind, ZEND_ACC_PUBLIC)
+ /* implmenents Countable */
+ HTTP_REQPOOL_ME(count, ZEND_ACC_PUBLIC)
+
HTTP_REQPOOL_ME(getAttachedRequests, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(getFinishedRequests, ZEND_ACC_PUBLIC)
PHP_MINIT_FUNCTION(http_requestpool_object)
{
HTTP_REGISTER_CLASS_EX(HttpRequestPool, http_requestpool_object, NULL, 0);
+#if defined(HAVE_SPL) && !defined(WONKY)
+ zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 2, spl_ce_Countable, zend_ce_iterator);
+#else
zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 1, zend_ce_iterator);
+#endif
+
+ http_requestpool_object_handlers.clone_obj = NULL;
return SUCCESS;
}
#define http_requestpool_object_llist2array _http_requestpool_object_llist2array
static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_DC)
{
- zval_add_ref(req);
- zend_objects_store_add_ref(*req TSRMLS_CC);
+ ZVAL_ADDREF(*req);
add_next_index_zval(array, *req);
}
* able to send several HttpRequests in parallel.
*
* WARNING: Don't attach/detach HttpRequest objects to the HttpRequestPool
- * object while you're using the implemented Interator interface.
+ * object while you're using the implemented Iterator interface.
*
* Accepts virtual infinite optional parameters each referencing an
* HttpRequest object.
*
- * Throws HttpRequestException, HttpRequestPoolException, HttpInvalidParamException.
+ * Throws HttpRequestPoolException (HttpRequestException, HttpInvalidParamException).
*
* Example:
* <pre>
zval ***argv = safe_emalloc(argc, sizeof(zval *), 0);
getObject(http_requestpool_object, obj);
+ SET_EH_THROW_HTTP();
if (SUCCESS == zend_get_parameters_array_ex(argc, argv)) {
int i;
for (i = 0; i < argc; ++i) {
if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), http_request_object_ce TSRMLS_CC)) {
- http_request_pool_attach(&obj->pool, *(argv[i]));
+ http_request_pool_try {
+ http_request_pool_attach(&obj->pool, *(argv[i]));
+ } http_request_pool_catch();
}
}
+ http_request_pool_final();
}
efree(argv);
+ SET_EH_NORMAL();
}
/* }}} */
*
* Returns TRUE on success, or FALSE on failure.
*
- * Throws HttpSocketException, HttpRequestException,
- * HttpRequestPoolException, HttpMalformedHeaderException.
+ * Throws HttpRequestPoolException (HttpSocketException, HttpRequestException, HttpMalformedHeaderException).
*/
PHP_METHOD(HttpRequestPool, send)
{
* public function send()
* {
* while ($this->socketPerform()) {
- * $this->handleRequests();
* if (!$this->socketSelect()) {
* throw new HttpSocketExcpetion;
* }
* }
- * $this->handleRequests();
* }
*
- * private function handleRequests()
+ * protected final function socketPerform()
* {
+ * $result = parent::socketPerform();
* foreach ($this->getFinishedRequests() as $r) {
* $this->detach($r);
* // handle response of finished request
* }
+ * return $result;
* }
* }
* ?>
}
/* }}} */
+/* {{{ proto int HttpRequestPool::count()
+ *
+ * Implements Countable.
+ *
+ * Returns the number of attached HttpRequest objects.
+ */
+PHP_METHOD(HttpRequestPool, count)
+{
+ NO_ARGS {
+ getObject(http_requestpool_object, obj);
+ RETURN_LONG((long) zend_llist_count(&obj->pool.handles));
+ }
+}
+/* }}} */
+
+/* {{{ proto array HttpRequestPool::getAttachedRequests()
+ *
+ * Get attached HttpRequest objects.
+ *
+ * Returns an array containing all currently attached HttpRequest objects.
+ */
PHP_METHOD(HttpRequestPool, getAttachedRequests)
{
getObject(http_requestpool_object, obj);
(llist_apply_with_arg_func_t) http_requestpool_object_llist2array,
return_value TSRMLS_CC);
}
+/* }}} */
+/* {{{ proto array HttpRequestPool::getFinishedRequests()
+ *
+ * Get attached HttpRequest objects that already have finished their work.
+ *
+ * Returns an array containing all attached HttpRequest objects that
+ * already have finished their work.
+ */
PHP_METHOD(HttpRequestPool, getFinishedRequests)
{
getObject(http_requestpool_object, obj);
(llist_apply_with_arg_func_t) http_requestpool_object_llist2array,
return_value TSRMLS_CC);
}
+/* }}} */
#endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */
projects / m6w6 / ext-http / blobdiff