projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag 'RELEASE_0_24_0'.
[m6w6/ext-http]
/
http_requestpool_object.c
diff --git
a/http_requestpool_object.c
b/http_requestpool_object.c
index 06733d2adbd918090ddef4f2559217608cead609..fed57219ac4ae05d98dce1c773f126f7236182fd 100644
(file)
--- a/
http_requestpool_object.c
+++ b/
http_requestpool_object.c
@@
-6,50
+6,43
@@
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-200
5
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-200
6
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
+--------------------------------------------------------------------+
*/
/* $Id$ */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include "php.h"
+#define HTTP_WANT_CURL
+#include "php_http.h"
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
-#include "php_http_std_defs.h"
+#include "zend_interfaces.h"
+
#include "php_http_api.h"
#include "php_http_api.h"
-#include "php_http_requestpool_object.h"
-#include "php_http_request_pool_api.h"
-#include "php_http_request_object.h"
#include "php_http_exception_object.h"
#include "php_http_exception_object.h"
+#include "php_http_request_api.h"
+#include "php_http_request_object.h"
+#include "php_http_request_pool_api.h"
+#include "php_http_requestpool_object.h"
-#include "zend_interfaces.h"
#if defined(HAVE_SPL) && !defined(WONKY)
#if defined(HAVE_SPL) && !defined(WONKY)
-# include "ext/spl/spl_array.h"
-# include "ext/spl/spl_iterators.h"
+/* SPL doesn't install its headers */
+extern PHPAPI zend_class_entry *spl_ce_Countable;
#endif
#endif
-#ifdef PHP_WIN32
-# include <winsock2.h>
-#endif
-#include <curl/curl.h>
-
#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpRequestPool, method, 0, req_args)
#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpRequestPool, method, 0, req_args)
-#define HTTP_EMPTY_ARGS(method
, ret_ref) HTTP_EMPTY_ARGS_EX(HttpRequestPool, method, ret_ref
)
+#define HTTP_EMPTY_ARGS(method
) HTTP_EMPTY_ARGS_EX(HttpRequestPool, method, 0
)
#define HTTP_REQPOOL_ME(method, visibility) PHP_ME(HttpRequestPool, method, HTTP_ARGS(HttpRequestPool, method), visibility)
#define HTTP_REQPOOL_ME(method, visibility) PHP_ME(HttpRequestPool, method, HTTP_ARGS(HttpRequestPool, method), visibility)
-HTTP_BEGIN_ARGS
_AR(HttpRequestPool, __construct, 0
, 0)
+HTTP_BEGIN_ARGS
(__construct
, 0)
HTTP_ARG_OBJ(HttpRequest, request0, 0)
HTTP_ARG_OBJ(HttpRequest, request1, 0)
HTTP_ARG_OBJ(HttpRequest, requestN, 0)
HTTP_END_ARGS;
HTTP_ARG_OBJ(HttpRequest, request0, 0)
HTTP_ARG_OBJ(HttpRequest, request1, 0)
HTTP_ARG_OBJ(HttpRequest, requestN, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(__destruct
, 0
);
-HTTP_EMPTY_ARGS(reset
, 0
);
+HTTP_EMPTY_ARGS(__destruct);
+HTTP_EMPTY_ARGS(reset);
HTTP_BEGIN_ARGS(attach, 1)
HTTP_ARG_OBJ(HttpRequest, request, 0)
HTTP_BEGIN_ARGS(attach, 1)
HTTP_ARG_OBJ(HttpRequest, request, 0)
@@
-59,20
+52,20
@@
HTTP_BEGIN_ARGS(detach, 1)
HTTP_ARG_OBJ(HttpRequest, request, 0)
HTTP_END_ARGS;
HTTP_ARG_OBJ(HttpRequest, request, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(send
, 0
);
-HTTP_EMPTY_ARGS(socketPerform
, 0
);
-HTTP_EMPTY_ARGS(socketSelect
, 0
);
+HTTP_EMPTY_ARGS(send);
+HTTP_EMPTY_ARGS(socketPerform);
+HTTP_EMPTY_ARGS(socketSelect);
-HTTP_EMPTY_ARGS(valid
, 0
);
-HTTP_EMPTY_ARGS(current
, 1
);
-HTTP_EMPTY_ARGS(key
, 0
);
-HTTP_EMPTY_ARGS(next
, 0
);
-HTTP_EMPTY_ARGS(rewind
, 0
);
+HTTP_EMPTY_ARGS(valid);
+HTTP_EMPTY_ARGS(current);
+HTTP_EMPTY_ARGS(key);
+HTTP_EMPTY_ARGS(next);
+HTTP_EMPTY_ARGS(rewind);
-HTTP_EMPTY_ARGS(count
, 0
);
+HTTP_EMPTY_ARGS(count);
-HTTP_EMPTY_ARGS(getAttachedRequests
, 0
);
-HTTP_EMPTY_ARGS(getFinishedRequests
, 0
);
+HTTP_EMPTY_ARGS(getAttachedRequests);
+HTTP_EMPTY_ARGS(getFinishedRequests);
#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);
#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);
@@
-89,7
+82,7
@@
zend_function_entry http_requestpool_object_fe[] = {
HTTP_REQPOOL_ME(socketPerform, ZEND_ACC_PROTECTED)
HTTP_REQPOOL_ME(socketSelect, ZEND_ACC_PROTECTED)
HTTP_REQPOOL_ME(socketPerform, ZEND_ACC_PROTECTED)
HTTP_REQPOOL_ME(socketSelect, ZEND_ACC_PROTECTED)
- /* implements I
n
terator */
+ /* implements Iterator */
HTTP_REQPOOL_ME(valid, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(current, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(key, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(valid, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(current, ZEND_ACC_PUBLIC)
HTTP_REQPOOL_ME(key, ZEND_ACC_PUBLIC)
@@
-110,7
+103,7
@@
PHP_MINIT_FUNCTION(http_requestpool_object)
{
HTTP_REGISTER_CLASS_EX(HttpRequestPool, http_requestpool_object, NULL, 0);
#if defined(HAVE_SPL) && !defined(WONKY)
{
HTTP_REGISTER_CLASS_EX(HttpRequestPool, http_requestpool_object, NULL, 0);
#if defined(HAVE_SPL) && !defined(WONKY)
- zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 2, spl_ce_Countable,
spl_ce_I
terator);
+ zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 2, spl_ce_Countable,
zend_ce_i
terator);
#else
zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 1, zend_ce_iterator);
#endif
#else
zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 1, zend_ce_iterator);
#endif
@@
-173,12
+166,12
@@
static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_
* able to send several HttpRequests in parallel.
*
* WARNING: Don't attach/detach HttpRequest objects to the HttpRequestPool
* able to send several HttpRequests in parallel.
*
* WARNING: Don't attach/detach HttpRequest objects to the HttpRequestPool
- * object while you're using the implemented I
n
terator interface.
+ * object while you're using the implemented Iterator interface.
*
* Accepts virtual infinite optional parameters each referencing an
* HttpRequest object.
*
*
* Accepts virtual infinite optional parameters each referencing an
* HttpRequest object.
*
- * Throws HttpRequest
Exception, HttpRequestPoolException, HttpInvalidParamException
.
+ * Throws HttpRequest
PoolException (HttpRequestException, HttpInvalidParamException)
.
*
* Example:
* <pre>
*
* Example:
* <pre>
@@
-208,16
+201,21
@@
PHP_METHOD(HttpRequestPool, __construct)
zval ***argv = safe_emalloc(argc, sizeof(zval *), 0);
getObject(http_requestpool_object, obj);
zval ***argv = safe_emalloc(argc, sizeof(zval *), 0);
getObject(http_requestpool_object, obj);
+ SET_EH_THROW_HTTP();
if (SUCCESS == zend_get_parameters_array_ex(argc, argv)) {
int i;
for (i = 0; i < argc; ++i) {
if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), http_request_object_ce TSRMLS_CC)) {
if (SUCCESS == zend_get_parameters_array_ex(argc, argv)) {
int i;
for (i = 0; i < argc; ++i) {
if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), http_request_object_ce TSRMLS_CC)) {
- http_request_pool_attach(&obj->pool, *(argv[i]));
+ http_request_pool_try {
+ http_request_pool_attach(&obj->pool, *(argv[i]));
+ } http_request_pool_catch();
}
}
}
}
+ http_request_pool_final();
}
efree(argv);
}
efree(argv);
+ SET_EH_NORMAL();
}
/* }}} */
}
/* }}} */
@@
-254,7
+252,7
@@
PHP_METHOD(HttpRequestPool, reset)
* Attach an HttpRequest object to this HttpRequestPool.
* WARNING: set all options prior attaching!
*
* Attach an HttpRequest object to this HttpRequestPool.
* WARNING: set all options prior attaching!
*
- * Expects the parameter to be an HttpRequest object not alread attached to
+ * Expects the parameter to be an HttpRequest object not alread
y
attached to
* antother HttpRequestPool object.
*
* Returns TRUE on success, or FALSE on failure.
* antother HttpRequestPool object.
*
* Returns TRUE on success, or FALSE on failure.
@@
-314,8
+312,7
@@
PHP_METHOD(HttpRequestPool, detach)
*
* Returns TRUE on success, or FALSE on failure.
*
*
* Returns TRUE on success, or FALSE on failure.
*
- * Throws HttpSocketException, HttpRequestException,
- * HttpRequestPoolException, HttpMalformedHeaderException.
+ * Throws HttpRequestPoolException (HttpSocketException, HttpRequestException, HttpMalformedHeaderException).
*/
PHP_METHOD(HttpRequestPool, send)
{
*/
PHP_METHOD(HttpRequestPool, send)
{
@@
-429,7
+426,7
@@
PHP_METHOD(HttpRequestPool, current)
current && obj->iterator.pos != pos++;
current = zend_llist_get_next_ex(&obj->pool.handles, &lpos));
if (current) {
current && obj->iterator.pos != pos++;
current = zend_llist_get_next_ex(&obj->pool.handles, &lpos));
if (current) {
- RETURN_OBJECT(*current);
+ RETURN_OBJECT(*current
, 1
);
}
}
RETURN_NULL();
}
}
RETURN_NULL();