projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- parameter to set*() and add*() methods is optional
[m6w6/ext-http]
/
php_http.h
diff --git
a/php_http.h
b/php_http.h
index 49b79e699d466b67ce22e6b951725bd01dbdc905..1b0f21329b27fdf32f3b1717f789180fc9dd4132 100644
(file)
--- a/
php_http.h
+++ b/
php_http.h
@@
-18,7
+18,7
@@
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
#ifndef PHP_EXT_HTTP_H
#define PHP_EXT_HTTP_H
-#define HTTP_PEXT_VERSION "0.
9
.0dev"
+#define HTTP_PEXT_VERSION "0.
12
.0dev"
/* make compile on Win32 */
#ifdef HTTP_HAVE_CURL
/* make compile on Win32 */
#ifdef HTTP_HAVE_CURL
@@
-37,6
+37,9
@@
extern int http_module_number;
ZEND_BEGIN_MODULE_GLOBALS(http)
ZEND_BEGIN_MODULE_GLOBALS(http)
+#ifdef ZEND_ENGINE_2
+ zend_bool only_exceptions;
+#endif
struct _http_globals_etag {
zend_bool started;
PHP_MD5_CTX md5ctx;
struct _http_globals_etag {
zend_bool started;
PHP_MD5_CTX md5ctx;
@@
-64,6
+67,8
@@
ZEND_BEGIN_MODULE_GLOBALS(http)
struct _http_globlas_request_copies {
zend_llist strings;
zend_llist slists;
struct _http_globlas_request_copies {
zend_llist strings;
zend_llist slists;
+ zend_llist contexts;
+ zend_llist convs;
} copies;
# if LIBCURL_VERSION_NUM < 0x070c00
char error[CURL_ERROR_SIZE + 1];
} copies;
# if LIBCURL_VERSION_NUM < 0x070c00
char error[CURL_ERROR_SIZE + 1];
@@
-79,7
+84,7
@@
ZEND_END_MODULE_GLOBALS(http)
# define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
#else
# define HTTP_G(v) (http_globals.v)
# define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
#else
# define HTTP_G(v) (http_globals.v)
-# define HTTP_GLOBALS
http_globals
+# define HTTP_GLOBALS
(&http_globals)
#endif
#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
#endif
#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
@@
-103,8
+108,10
@@
PHP_FUNCTION(http_send_file);
PHP_FUNCTION(http_send_stream);
PHP_FUNCTION(http_chunked_decode);
PHP_FUNCTION(http_split_response);
PHP_FUNCTION(http_send_stream);
PHP_FUNCTION(http_chunked_decode);
PHP_FUNCTION(http_split_response);
+PHP_FUNCTION(http_parse_message);
PHP_FUNCTION(http_parse_headers);
PHP_FUNCTION(http_get_request_headers);
PHP_FUNCTION(http_parse_headers);
PHP_FUNCTION(http_get_request_headers);
+PHP_FUNCTION(http_get_request_body);
PHP_FUNCTION(http_match_request_header);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get);
PHP_FUNCTION(http_match_request_header);
#ifdef HTTP_HAVE_CURL
PHP_FUNCTION(http_get);