X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http.h;h=6df82088bbae7cb3ed25aade59d8dde1cd900ffe;hb=0861238aa4d158d0f8b6123ea9c6532be5d531bf;hp=4aa2679dd2ccb5a7b76574c7422f0ba43085dd7c;hpb=bf86dcdcd68677a8c4b7c8193388c529a55a3503;p=m6w6%2Fext-http diff --git a/php_http.h b/php_http.h index 4aa2679..6df8208 100644 --- a/php_http.h +++ b/php_http.h @@ -15,7 +15,7 @@ #ifndef PHP_EXT_HTTP_H #define PHP_EXT_HTTP_H -#define PHP_EXT_HTTP_VERSION "0.23.0dev" +#define PHP_EXT_HTTP_VERSION "0.23.1" #ifdef HAVE_CONFIG_H # include "config.h" @@ -35,7 +35,7 @@ # define HTTP_HAVE_SAPI_RTIME # define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C) # else -# define HTTP_GET_REQUEST_TIME() HTTP_G(request_time) +# define HTTP_GET_REQUEST_TIME() HTTP_G->request_time # endif # include "SAPI.h" #endif @@ -139,13 +139,10 @@ ZEND_EXTERN_MODULE_GLOBALS(http); #ifdef ZTS # include "TSRM.h" -# define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v) -# define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)]) +# define HTTP_G ((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_G (&http_globals) #endif -#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS PHP_FUNCTION(http_test); PHP_FUNCTION(http_date);