X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=dc673837a374377adf65a02e3f956767196c39b7;hp=efa9e3c473ab8957d0d04a541872f029f88faba0;hb=92d91587592727bbf0369e6eae8eba157063274d;hpb=a960f6fd6e637ffa03a87985a7df3bc9c98a360b diff --git a/php_http.h b/php_http.h index efa9e3c..dc67383 100644 --- a/php_http.h +++ b/php_http.h @@ -61,12 +61,14 @@ 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; + } 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 +80,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;