| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
HTTP_EMPTY_ARGS(send);
HTTP_EMPTY_ARGS(socketPerform);
-HTTP_EMPTY_ARGS(socketSelect);
+HTTP_BEGIN_ARGS(socketSelect, 0)
+ HTTP_ARG_VAL(timeout, 0)
+HTTP_END_ARGS;
HTTP_EMPTY_ARGS(valid);
HTTP_EMPTY_ARGS(current);
http_request_pool_init(&o->pool);
+#ifdef ZEND_ENGINE_2_4
+ zend_object_std_init(o, ce TSRMLS_CC);
+ object_properties_init(o, ce);
+#else
ALLOC_HASHTABLE(OBJ_PROP(o));
zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+#endif
ov.handle = putObject(http_requestpool_object, o);
ov.handlers = &http_requestpool_object_handlers;
}
}
efree(argv);
- SET_EH_NORMAL();
http_final(HTTP_EX_CE(request_pool));
+ SET_EH_NORMAL();
}
/* }}} */
}
/* }}} */
-/* {{{ proto protected bool HttpRequestPool::socketSelect() */
+/* {{{ proto protected bool HttpRequestPool::socketSelect([double timeout]) */
PHP_METHOD(HttpRequestPool, socketSelect)
{
+ double timeout = 0;
+ struct timeval custom_timeout, *custom_timeout_ptr = NULL;
getObject(http_requestpool_object, obj);
- NO_ARGS;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|d", &timeout)) {
+ RETURN_FALSE;
+ }
+ if (ZEND_NUM_ARGS() && timeout > 0) {
+ custom_timeout.tv_sec = (time_t) timeout;
+ custom_timeout.tv_usec = HTTP_USEC(timeout) % HTTP_MCROSEC;
+ custom_timeout_ptr = &custom_timeout;
+ }
- RETURN_SUCCESS(http_request_pool_select(&obj->pool));
+ RETURN_SUCCESS(http_request_pool_select_ex(&obj->pool, custom_timeout_ptr));
}
/* }}} */
PHP_METHOD(HttpRequestPool, enablePipelining)
{
zend_bool enable = 1;
+#if defined(HAVE_CURL_MULTI_SETOPT) && HTTP_CURL_VERSION(7,16,0)
getObject(http_requestpool_object, obj);
+#endif
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable)) {
RETURN_FALSE;
PHP_METHOD(HttpRequestPool, enableEvents)
{
zend_bool enable = 1;
+#if defined(HTTP_HAVE_EVENT)
getObject(http_requestpool_object, obj);
+#endif
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable)) {
#if defined(HTTP_HAVE_EVENT)