void *ch;
if ((ch = curl_easy_init())) {
- get_storage(ch);
+ php_http_curl_client_get_storage(ch);
return ch;
}
return NULL;
if ((ch = curl_easy_duphandle(handle))) {
curl_easy_reset(ch);
- get_storage(ch);
+ php_http_curl_client_get_storage(ch);
return ch;
}
return NULL;
static void php_http_curl_dtor(void *opaque, void *handle TSRMLS_DC)
{
- php_http_curl_client_storage_t *st = get_storage(handle);
+ php_http_curl_client_storage_t *st = php_http_curl_client_get_storage(handle);
curl_easy_cleanup(handle);
}
}
#endif
- add_assoc_string_ex(&array, "error", sizeof("error"), get_storage(ch)->errorbuffer, 1);
+ add_assoc_string_ex(&array, "error", sizeof("error"), php_http_curl_client_get_storage(ch)->errorbuffer, 1);
return SUCCESS;
}
CURL *ch = curl->handle;
if (val) {
- php_http_curl_client_storage_t *storage = get_storage(curl->handle);
+ php_http_curl_client_storage_t *storage = php_http_curl_client_get_storage(curl->handle);
if (storage->cookiestore) {
pefree(storage->cookiestore, 1);
}
php_http_buffer_fix(&curl->options.cookies);
- if (PHP_HTTP_BUFFER_LEN(&curl->options.cookies)) {
- if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIE, PHP_HTTP_BUFFER_VAL(&curl->options.cookies))) {
+ if (curl->options.cookies.used) {
+ if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIE, curl->options.cookies.data)) {
return FAILURE;
}
}
php_http_buffer_init(&header);
php_http_buffer_appendf(&header, is_quoted?"%s: %s":"%s: \"%s\"", curl->options.range_request?"If-Match":"If-None-Match", Z_STRVAL_P(val));
php_http_buffer_fix(&header);
- curl->options.headers = curl_slist_append(curl->options.headers, PHP_HTTP_BUFFER_VAL(&header));
+ curl->options.headers = curl_slist_append(curl->options.headers, header.data);
php_http_buffer_dtor(&header);
return SUCCESS;
}
FOREACH_VAL(pos, val, rr) {
if (Z_TYPE_PP(rr) == IS_ARRAY) {
- if (2 == php_http_array_list(*rr TSRMLS_CC, 2, &rb, &re)) {
+ if (2 == php_http_array_list(Z_ARRVAL_PP(rr) TSRMLS_CC, 2, &rb, &re)) {
if ( ((Z_TYPE_PP(rb) == IS_LONG) || ((Z_TYPE_PP(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(rb), Z_STRLEN_PP(rb), NULL, NULL, 1))) &&
((Z_TYPE_PP(re) == IS_LONG) || ((Z_TYPE_PP(re) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(re), Z_STRLEN_PP(re), NULL, NULL, 1)))) {
zval *rbl = php_http_ztyp(IS_LONG, *rb);
}
}
- if (PHP_HTTP_BUFFER_LEN(&curl->options.ranges)) {
+ if (curl->options.ranges.used) {
curl->options.range_request = 1;
/* ditch last comma */
- PHP_HTTP_BUFFER_VAL(&curl->options.ranges)[PHP_HTTP_BUFFER_LEN(&curl->options.ranges)-- -1] = '\0';
+ curl->options.ranges.data[curl->options.ranges.used - 1] = '\0';
}
}
- if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_RANGE, PHP_HTTP_BUFFER_VAL(&curl->options.ranges))) {
+ if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_RANGE, curl->options.ranges.data)) {
return FAILURE;
}
return SUCCESS;
if (val && Z_TYPE_P(val) != IS_NULL) {
zval **z_port_start, *zps_copy = NULL, **z_port_end, *zpe_copy = NULL;
- switch (php_http_array_list(val TSRMLS_CC, 2, &z_port_start, &z_port_end)) {
+ switch (php_http_array_list(Z_ARRVAL_P(val) TSRMLS_CC, 2, &z_port_start, &z_port_end)) {
case 2:
zps_copy = php_http_ztyp(IS_LONG, *z_port_start);
zpe_copy = php_http_ztyp(IS_LONG, *z_port_end);
return SUCCESS;
}
+#if PHP_HTTP_CURL_VERSION(7,21,3)
static STATUS php_http_curl_client_option_set_resolve(php_http_option_t *opt, zval *val, void *userdata)
{
php_http_client_t *h = userdata;
}
return SUCCESS;
}
+#endif
static void php_http_curl_client_options_init(php_http_options_t *registry TSRMLS_DC)
{
CURL *ch = curl->handle;
php_http_curl_client_storage_t *st;
- if ((st = get_storage(ch))) {
+ if ((st = php_http_curl_client_get_storage(ch))) {
if (st->url) {
pefree(st->url, 1);
st->url = NULL;
{
size_t body_size;
php_http_curl_client_t *curl = h->ctx;
- php_http_curl_client_storage_t *storage = get_storage(curl->handle);
+ php_http_curl_client_storage_t *storage = php_http_curl_client_get_storage(curl->handle);
TSRMLS_FETCH_FROM_CTX(h->ts);
/* request url */
php_http_buffer_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy));
php_http_buffer_fix(&header);
- curl->options.headers = curl_slist_append(curl->options.headers, PHP_HTTP_BUFFER_VAL(&header));
+ curl->options.headers = curl_slist_append(curl->options.headers, header.data);
php_http_buffer_reset(&header);
zval_ptr_dtor(&header_cpy);
uint tries = 0;
CURLcode result;
php_http_curl_client_t *curl = h->ctx;
- php_http_curl_client_storage_t *storage = get_storage(curl->handle);
+ php_http_curl_client_storage_t *storage = php_http_curl_client_get_storage(curl->handle);
TSRMLS_FETCH_FROM_CTX(h->ts);
if (SUCCESS != php_http_curl_client_prepare(h, msg)) {
case PHP_HTTP_CLIENT_OPT_COOKIES_ENABLE:
/* are cookies already enabled anyway? */
- if (!get_storage(curl->handle)->cookiestore) {
+ if (!php_http_curl_client_get_storage(curl->handle)->cookiestore) {
if (CURLE_OK != curl_easy_setopt(curl->handle, CURLOPT_COOKIEFILE, "")) {
return FAILURE;
}