HTTP_END_ARGS;
HTTP_EMPTY_ARGS(send, 0);
-HTTP_EMPTY_ARGS(socketSend, 0);
+HTTP_EMPTY_ARGS(socketPerform, 0);
HTTP_EMPTY_ARGS(socketSelect, 0);
-HTTP_EMPTY_ARGS(socketRead, 0);
HTTP_EMPTY_ARGS(valid, 0);
HTTP_EMPTY_ARGS(current, 1);
HTTP_REQPOOL_ME(send, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(reset, ZEND_ACC_PUBLIC)
- HTTP_REQPOOL_ME(socketSend, ZEND_ACC_PROTECTED)
+ HTTP_REQPOOL_ME(socketPerform, ZEND_ACC_PROTECTED)
HTTP_REQPOOL_ME(socketSelect, ZEND_ACC_PROTECTED)
- HTTP_REQPOOL_ME(socketRead, ZEND_ACC_PROTECTED)
/* implements Interator */
HTTP_REQPOOL_ME(valid, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(next, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(rewind, ZEND_ACC_PUBLIC)
- {NULL, NULL, NULL}
+ EMPTY_FUNCTION_ENTRY
};
static zend_object_handlers http_requestpool_object_handlers;
* $pool->send();
* foreach($pool as $request) {
* printf("%s is %s (%d)\n",
- * $request->getResponseInfo('effective_url'),
+ * $request->getUrl(),
* $request->getResponseCode() ? 'alive' : 'not alive',
* $request->getResponseCode()
* );
* Usage:
* <pre>
* <?php
- * while ($pool->socketSend()) {
+ * while ($pool->socketPerform()) {
* do_something_else();
* if (!$pool->socketSelect()) {
* die('Socket error');
* }
* }
- * $pool->socketRead();
* ?>
* </pre>
*/
-PHP_METHOD(HttpRequestPool, socketSend)
+PHP_METHOD(HttpRequestPool, socketPerform)
{
getObject(http_requestpool_object, obj);
NO_ARGS;
- RETURN_BOOL(0 < http_request_pool_perform(&obj->pool));
+ if (0 < http_request_pool_perform(&obj->pool)) {
+ RETURN_TRUE;
+ } else {
+ zend_llist_apply(&obj->pool.handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
+ RETURN_FALSE;
+ }
}
/* }}} */
/* {{{ proto protected bool HttpRequestPool::socketSelect()
*
- * See HttpRequestPool::socketSend().
+ * See HttpRequestPool::socketPerform().
*/
PHP_METHOD(HttpRequestPool, socketSelect)
{
}
/* }}} */
-/* {{{ proto protected void HttpRequestPool::socketRead()
- *
- * See HttpRequestPool::socketSend().
- */
-PHP_METHOD(HttpRequestPool, socketRead)
-{
- getObject(http_requestpool_object, obj);
-
- NO_ARGS;
-
- zend_llist_apply(&obj->pool.handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
-}
-/* }}} */
-
/* implements Iterator */
/* {{{ proto bool HttpRequestPool::valid()
+ *
+ * Implements Iterator::valid().
*/
PHP_METHOD(HttpRequestPool, valid)
{
/* }}} */
/* {{{ proto HttpRequest HttpRequestPool::current()
+ *
+ * Implements Iterator::current().
*/
PHP_METHOD(HttpRequestPool, current)
{
getObject(http_requestpool_object, obj);
if (obj->iterator.pos < zend_llist_count(&obj->pool.handles)) {
- for ( current = zend_llist_get_first_ex(&obj->pool.handles, &lpos);
- current && obj->iterator.pos != pos++;
+ for ( current = zend_llist_get_first_ex(&obj->pool.handles, &lpos);
+ current && obj->iterator.pos != pos++;
current = zend_llist_get_next_ex(&obj->pool.handles, &lpos));
if (current) {
RETURN_OBJECT(*current);
/* }}} */
/* {{{ proto long HttpRequestPool::key()
+ *
+ * Implements Iterator::key().
*/
PHP_METHOD(HttpRequestPool, key)
{
/* }}} */
/* {{{ proto void HttpRequestPool::next()
+ *
+ * Implements Iterator::next().
*/
PHP_METHOD(HttpRequestPool, next)
{
/* }}} */
/* {{{ proto void HttpRequestPool::rewind()
+ *
+ * Implements Iterator::rewind().
*/
PHP_METHOD(HttpRequestPool, rewind)
{