projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- (non-)ZTS fixes
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index dd49c6cfe6216760dff0d3e4ad259c2f41c290ce..4bd31d74c03829dec7033abc49f8264a5c0b3b5d 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.
2
.0dev"
+#define PHP_EXT_HTTP_VERSION "1.
3
.0dev"
#ifdef HAVE_CONFIG_H
# include "config.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
@@
-123,6
+123,15
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
void *entries;
} custom;
} methods;
void *entries;
} custom;
} methods;
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+ struct _http_globals_request_datashare {
+ zend_llist handles;
+ zend_bool cookie;
+ zend_bool dns;
+ zend_bool ssl;
+ zend_bool connect;
+ } datashare;
+#endif
} request;
#ifdef ZEND_ENGINE_2
} request;
#ifdef ZEND_ENGINE_2
@@
-151,7
+160,7
@@
ZEND_EXTERN_MODULE_GLOBALS(http);
# define HTTP_HAVE_SESSION
#endif
# define HTTP_HAVE_SESSION
#endif
-#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)
&& defined(HTTP_HAVE_PHP_HASH_H)
)
+#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)
) && defined(HTTP_HAVE_PHP_HASH_H
)
# define HTTP_HAVE_HASH
#endif
# define HTTP_HAVE_HASH
#endif