- relicense with a BSD style license

[m6w6/ext-http] / http_requestpool_object.c

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index f9f463cb0888bcb7438e3747fca167c84e89c24b..cbbd6f0fb9164f3d229e7b24a241e0d27863215e 100644 (file)
--- 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$ */
@@ -71,10 +68,6 @@ HTTP_EMPTY_ARGS(rewind, 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);
 
@@ -153,8 +146,8 @@ 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);
-       zend_objects_store_add_ref(*req TSRMLS_CC);
+       ZVAL_ADDREF(*req);
+       Z_OBJ_ADDREF_PP(req);
        add_next_index_zval(array, *req);
 }
 
@@ -337,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;
  *     }
  * } 
  * ?>
@@ -471,6 +464,12 @@ PHP_METHOD(HttpRequestPool, rewind)
 }
 /* }}} */
 
+/* {{{ 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);
@@ -482,7 +481,15 @@ PHP_METHOD(HttpRequestPool, getAttachedRequests)
                (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);
@@ -494,6 +501,7 @@ PHP_METHOD(HttpRequestPool, getFinishedRequests)
                (llist_apply_with_arg_func_t) http_requestpool_object_llist2array,
                return_value TSRMLS_CC);
 }
+/* }}} */
 
 #endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */