- fix request pool issues

[m6w6/ext-http] / http_methods.c

diff --git a/http_methods.c b/http_methods.c
index a8f5d9489da81df92d4ce113213badc2074d1e93..f844c055ba06f3606be5a5281cfba399f771877b 100644 (file)
--- a/http_methods.c
+++ b/http_methods.c
@@ -27,6 +27,7 @@
 #include "php_http_api.h"
 #include "php_http_cache_api.h"
 #include "php_http_request_api.h"
+#include "php_http_request_pool_api.h"
 #include "php_http_date_api.h"
 #include "php_http_headers_api.h"
 #include "php_http_message_api.h"
@@ -2125,15 +2126,13 @@ PHP_METHOD(HttpRequest, send)
        }
 
        if (SUCCESS == (status = http_request_object_requesthandler(obj, getThis(), &body))) {
-               zval *info = GET_PROP(obj, responseInfo);
-               status = http_request_exec(obj->ch, Z_ARRVAL_P(info));
-               SET_PROP(obj, responseInfo, info);
+               status = http_request_exec(obj->ch, NULL);
        }
        http_request_body_dtor(&body);
 
        /* final data handling */
        if (SUCCESS == status) {
-               status = http_request_object_responsehandler(obj, getThis(), NULL);
+               status = http_request_object_responsehandler(obj, getThis());
        }
 
        SET_EH_NORMAL();
@@ -2163,7 +2162,7 @@ PHP_METHOD(HttpRequestPool, __destruct)
 
        NO_ARGS;
 
-       http_request_pool_detach_all(&obj->pool);
+       //http_request_pool_detach_all(&obj->pool);
 }
 /* }}} */
 
@@ -2237,15 +2236,15 @@ PHP_METHOD(HttpRequestPool, send)
  *
  * Usage:
  * <pre>
- *     <?php
- *             while ($pool->socketSend()) {
- *                     do_something_else();
- *                     if (!$pool->socketSelect()) {
- *                             die('Socket error');
- *                     }
- *             }
- *             $pool->socketRead();
- *     ?>
+ * <?php
+ *     while ($pool->socketSend()) {
+ *         do_something_else();
+ *         if (!$pool->socketSelect()) {
+ *             die('Socket error');
+ *         }
+ *     }
+ *     $pool->socketRead();
+ * ?>
  * </pre>
  */
 PHP_METHOD(HttpRequestPool, socketSend)
@@ -2284,6 +2283,7 @@ PHP_METHOD(HttpRequestPool, socketRead)
 
        zend_llist_apply(&obj->pool.handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
 }
+/* }}} */
 
 /* }}} */