projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- provide persistent storage for things curl might use on curl_easy_cleanup
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index a9ebaa52b18aa0d5ef3bfa61c174350c7290253e..2d3e9482d11991d03ea676c636daef3443b7df8d 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-15,7
+15,7
@@
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define PHP_EXT_HTTP_VERSION "1.
5.0
"
+#define PHP_EXT_HTTP_VERSION "1.
6.0b2
"
#ifdef HAVE_CONFIG_H
# include "config.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
@@
-57,6
+57,10
@@
# endif
# include <curl/curl.h>
# define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
# endif
# include <curl/curl.h>
# define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
+#
+# if defined(HTTP_WANT_EVENT) && defined(HTTP_HAVE_EVENT)
+# include <event.h>
+# endif
#endif
#if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
#endif
#if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
@@
-120,12
+124,9
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
time_t time;
HashTable *headers;
struct _http_globals_request_methods {
time_t time;
HashTable *headers;
struct _http_globals_request_methods {
+ HashTable registered;
char *allowed;
char *allowed;
- struct _http_globals_request_methods_custom {
- char *ini;
- int count;
- void *entries;
- } custom;
+ char *custom;
} methods;
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
struct _http_globals_request_datashare {
} methods;
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
struct _http_globals_request_datashare {
@@
-135,6
+136,13
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
zend_bool ssl;
zend_bool connect;
} datashare;
zend_bool ssl;
zend_bool connect;
} datashare;
+#endif
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_EVENT)
+ struct _http_globals_request_pool {
+ struct _http_globals_request_pool_event {
+ void *base;
+ } event;
+ } pool;
#endif
} request;
#endif
} request;