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_1_5_0_RC1'.
[m6w6/ext-http]
/
php_http_requestpool_object.h
diff --git
a/php_http_requestpool_object.h
b/php_http_requestpool_object.h
index cd5914f85a3061b9caa73e1bd8f65733385cff61..ba0c900db901b5b40901a99934469ec567a5fe1a 100644
(file)
--- a/
php_http_requestpool_object.h
+++ b/
php_http_requestpool_object.h
@@
-6,7
+6,7
@@
| 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
7
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
@@
-17,15
+17,7
@@
#ifdef HTTP_HAVE_CURL
#ifdef ZEND_ENGINE_2
#ifdef HTTP_HAVE_CURL
#ifdef ZEND_ENGINE_2
-#ifdef PHP_WIN32
-# include <winsock2.h>
-#endif
-
-#include <curl/curl.h>
-
-#include "php_http_request_pool_api.h"
-
-typedef struct {
+typedef struct _http_requestpool_object_t {
zend_object zo;
http_request_pool pool;
struct {
zend_object zo;
http_request_pool pool;
struct {
@@
-38,9
+30,9
@@
extern zend_function_entry http_requestpool_object_fe[];
extern PHP_MINIT_FUNCTION(http_requestpool_object);
extern PHP_MINIT_FUNCTION(http_requestpool_object);
-#define http_requestpool_object_new
_http_requestpool_object_new
+#define http_requestpool_object_new
(ce) _http_requestpool_object_new(ce TSRMLS_CC)
extern zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC);
extern zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC);
-#define http_requestpool_object_free
_http_requestpool_object_free
+#define http_requestpool_object_free
(o) _http_requestpool_object_free(o TSRMLS_CC)
extern void _http_requestpool_object_free(zend_object *object TSRMLS_DC);
PHP_METHOD(HttpRequestPool, __construct);
extern void _http_requestpool_object_free(zend_object *object TSRMLS_DC);
PHP_METHOD(HttpRequestPool, __construct);
@@
-56,8
+48,10
@@
PHP_METHOD(HttpRequestPool, current);
PHP_METHOD(HttpRequestPool, key);
PHP_METHOD(HttpRequestPool, next);
PHP_METHOD(HttpRequestPool, rewind);
PHP_METHOD(HttpRequestPool, key);
PHP_METHOD(HttpRequestPool, next);
PHP_METHOD(HttpRequestPool, rewind);
+PHP_METHOD(HttpRequestPool, count);
PHP_METHOD(HttpRequestPool, getAttachedRequests);
PHP_METHOD(HttpRequestPool, getFinishedRequests);
PHP_METHOD(HttpRequestPool, getAttachedRequests);
PHP_METHOD(HttpRequestPool, getFinishedRequests);
+PHP_METHOD(HttpRequestPool, enablePipelining);
#endif
#endif
#endif
#endif