X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=2cc6d5867f5aa4cfe510507ae1dc7aaf204711eb;hp=efa9e3c473ab8957d0d04a541872f029f88faba0;hb=3177ba2e5ef642f38c01568afcaa547df65f3e74;hpb=a960f6fd6e637ffa03a87985a7df3bc9c98a360b diff --git a/php_http.h b/php_http.h index efa9e3c..2cc6d58 100644 --- a/php_http.h +++ b/php_http.h @@ -18,7 +18,7 @@ #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 @@ -37,6 +37,9 @@ extern int http_module_number; 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; @@ -61,12 +64,15 @@ ZEND_BEGIN_MODULE_GLOBALS(http) } methods; #ifdef HTTP_HAVE_CURL - struct _http_globals_request_curl { - zend_llist copies; + 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]; + char error[CURL_ERROR_SIZE + 1]; # endif - } curl; #endif /* HTTP_HAVE_CURL */ } request; @@ -78,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 http_globals +# define HTTP_GLOBALS (&http_globals) #endif #define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS; @@ -104,6 +110,7 @@ PHP_FUNCTION(http_chunked_decode); PHP_FUNCTION(http_split_response); 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);