X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_api.h;h=d8dac5e06fc617f80589b500596b167160da8940;hp=5666fecbdc09fa181a176799ca6d3200644deebe;hb=df36ec0caf7186c3bcb55580601183a864579fa0;hpb=dd199f9961262ed43fa544240df15a9d6d7d0f08 diff --git a/php_http_request_api.h b/php_http_request_api.h index 5666fec..d8dac5e 100644 --- a/php_http_request_api.h +++ b/php_http_request_api.h @@ -48,14 +48,16 @@ typedef struct _http_request_t { void ***tsrm_ls; #endif + uint _in_progress_cb:1; + } http_request; #define http_curl_init(r) http_curl_init_ex(NULL, (r)) -#define http_curl_init_ex(c, r) _http_curl_init_ex((c), (r)) -PHP_HTTP_API CURL *_http_curl_init_ex(CURL *ch, http_request *request); +#define http_curl_init_ex(c, r) _http_curl_init_ex((c), (r) TSRMLS_CC) +PHP_HTTP_API CURL *_http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC); -#define http_curl_free(c) _http_curl_free(c) -PHP_HTTP_API void _http_curl_free(CURL **ch); +#define http_curl_free(c) _http_curl_free((c) TSRMLS_CC) +PHP_HTTP_API void _http_curl_free(CURL **ch TSRMLS_DC); #define http_request_new() _http_request_init_ex(NULL, NULL, 0, NULL ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) #define http_request_init(r) _http_request_init_ex((r), NULL, 0, NULL ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) @@ -74,8 +76,8 @@ PHP_HTTP_API void _http_request_reset(http_request *r); #define http_request_enable_cookies(r) _http_request_enable_cookies(r) PHP_HTTP_API STATUS _http_request_enable_cookies(http_request *request); -#define http_request_reset_cookies(r) _http_request_reset_cookies(r) -PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request); +#define http_request_reset_cookies(r, s) _http_request_reset_cookies((r), (s)) +PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request, int session_only); #define http_request_defaults(r) _http_request_defaults(r) PHP_HTTP_API void _http_request_defaults(http_request *request);