X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_requestpool_object.c;h=9c008a6c406bd3e1ccf56dd84c3567c8a3f4329d;hp=c0ae1357d3e9ca9126a11907faaff40af9c951b4;hb=d7b22bfb4a76664b4dcffa8644e19aba2e5338ab;hpb=f1df16d07b48a2561ec8c3065e094f3f17c09889

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index c0ae135..9c008a6 100644
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | 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$ */
@@ -104,6 +101,7 @@ PHP_MINIT_FUNCTION(http_requestpool_object)
 {
 	HTTP_REGISTER_CLASS_EX(HttpRequestPool, http_requestpool_object, NULL, 0);
 	zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 1, zend_ce_iterator);
+	http_requestpool_object_handlers.clone_obj = NULL;
 	return SUCCESS;
 }
 
@@ -149,8 +147,7 @@ void _http_requestpool_object_free(zend_object *object TSRMLS_DC)
 #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);
-	Z_OBJ_ADDREF_PP(req);
+	ZVAL_ADDREF(*req);
 	add_next_index_zval(array, *req);
 }
 
@@ -333,20 +330,20 @@ 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;
  *     }
  * } 
  * ?>