- fixed a gotcha in http_chunked_decode (-size_t is always > 0)

[m6w6/ext-http] / http_requestpool_object.c

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index e01e26d21db5f8066a0119572b48c69fd3628664..f312b7fad55664945205def9337f28af62fa38a3 100644 (file)
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -58,9 +58,8 @@ HTTP_BEGIN_ARGS(detach, 1)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(send, 0);
 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(socketSelect, 0);

-HTTP_EMPTY_ARGS(socketRead, 0);

 
 HTTP_EMPTY_ARGS(valid, 0);
 HTTP_EMPTY_ARGS(current, 1);
 
 HTTP_EMPTY_ARGS(valid, 0);
 HTTP_EMPTY_ARGS(current, 1);


@@ -80,9 +79,8 @@ zend_function_entry http_requestpool_object_fe[] = {
        HTTP_REQPOOL_ME(send, ZEND_ACC_PUBLIC)
        HTTP_REQPOOL_ME(reset, ZEND_ACC_PUBLIC)
 
        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(socketSelect, ZEND_ACC_PROTECTED)

-       HTTP_REQPOOL_ME(socketRead, ZEND_ACC_PROTECTED)

 
        /* implements Interator */
        HTTP_REQPOOL_ME(valid, ZEND_ACC_PUBLIC)
 
        /* implements Interator */
        HTTP_REQPOOL_ME(valid, ZEND_ACC_PUBLIC)


@@ -91,7 +89,7 @@ zend_function_entry http_requestpool_object_fe[] = {
        HTTP_REQPOOL_ME(next, ZEND_ACC_PUBLIC)
        HTTP_REQPOOL_ME(rewind, 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;
 
 };
 static zend_object_handlers http_requestpool_object_handlers;
 


@@ -110,7 +108,6 @@ zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC)
        o->zo.ce = ce;
 
        http_request_pool_init(&o->pool);
        o->zo.ce = ce;
 
        http_request_pool_init(&o->pool);

-       o->iterator.pos = 0;

 
        ALLOC_HASHTABLE(OBJ_PROP(o));
        zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
 
        ALLOC_HASHTABLE(OBJ_PROP(o));
        zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);


@@ -279,29 +276,33 @@ PHP_METHOD(HttpRequestPool, send)
  * Usage:
  * <pre>
  * <?php
  * Usage:
  * <pre>
  * <?php

- *     while ($pool->socketSend()) {
+ *     while ($pool->socketPerform()) {

  *         do_something_else();
  *         if (!$pool->socketSelect()) {
  *             die('Socket error');
  *         }
  *     }
  *         do_something_else();
  *         if (!$pool->socketSelect()) {
  *             die('Socket error');
  *         }
  *     }

- *     $pool->socketRead();

  * ?>
  * </pre>
  */
  * ?>
  * </pre>
  */

-PHP_METHOD(HttpRequestPool, socketSend)
+PHP_METHOD(HttpRequestPool, socketPerform)

 {
        getObject(http_requestpool_object, obj);
 
        NO_ARGS;
 
 {
        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()
  *
 }
 /* }}} */
 
 /* {{{ proto protected bool HttpRequestPool::socketSelect()
  *

- * See HttpRequestPool::socketSend().
+ * See HttpRequestPool::socketPerform().

  */
 PHP_METHOD(HttpRequestPool, socketSelect)
 {
  */
 PHP_METHOD(HttpRequestPool, socketSelect)
 {


@@ -313,20 +314,6 @@ 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 */
 
 /* {{{ proto bool HttpRequestPool::valid()