zval *zoption;
int range_req = 0;
php_http_neon_request_t *neon = h->ctx;
+ TSRMLS_FETCH_FROM_CTX(h->ts);
/* proxy */
if ((zoption = get_option(&neon->options.cache, options, ZEND_STRS("proxyhost"), IS_STRING))) {
if (PHP_HTTP_BUFFER_LEN(&rs)) {
/* ignore last comma */
- php_http_buffer_appendf(&neon->options.headers, "Range: bytes=%.*s" PHP_HTTP_CRLF, rs.used - 1, rs.data);
+ int used = rs.used > INT_MAX ? INT_MAX : rs.used;
+ php_http_buffer_appendf(&neon->options.headers, "Range: bytes=%.*s" PHP_HTTP_CRLF, used - 1, rs.data);
range_req = 1;
}
php_http_buffer_dtor(&rs);
static void php_http_neon_request_dtor(php_http_request_t *h)
{
php_http_neon_request_t *ctx = h->ctx;
+ TSRMLS_FETCH_FROM_CTX(h->ts);
php_http_neon_request_reset(h);
php_http_buffer_dtor(&ctx->options.headers);
zend_hash_destroy(&ctx->options.cache);
- php_http_request_progress_dtor(&ctx->progress);
+ php_http_request_progress_dtor(&ctx->progress TSRMLS_CC);
efree(ctx);
h->ctx = NULL;
static STATUS php_http_neon_request_reset(php_http_request_t *h)
{
php_http_neon_request_t *neon = h->ctx;
+ TSRMLS_FETCH_FROM_CTX(h->ts);
php_http_buffer_reset(&neon->options.headers);
STR_SET(neon->options.useragent, NULL);
neon->options.timeout.read = 0;
neon->options.timeout.connect = 0;
- php_http_request_progress_dtor(&neon->progress);
+ php_http_request_progress_dtor(&neon->progress TSRMLS_CC);
return SUCCESS;
}
php_http_neon_request_t *neon = h->ctx;
TSRMLS_FETCH_FROM_CTX(h->ts);
- if (!(meth = php_http_request_method_name(meth_id))) {
+ if (!(meth = php_http_request_method_name(meth_id TSRMLS_CC))) {
php_http_error(HE_WARNING, PHP_HTTP_E_REQUEST_METHOD, "Unsupported request method: %d (%s)", meth, url);
return FAILURE;
}
static STATUS php_http_neon_request_setopt(php_http_request_t *h, php_http_request_setopt_opt_t opt, void *arg)
{
php_http_neon_request_t *neon = h->ctx;
+ TSRMLS_FETCH_FROM_CTX(h->ts);
switch (opt) {
case PHP_HTTP_REQUEST_OPT_SETTINGS: