HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, 0L);
HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, 0L);
HTTP_CURL_OPT(CURLOPT_REFERER, NULL);
- HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
+ HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_HTTP_VERSION " (PHP/" PHP_VERSION ")");
HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
HTTP_CURL_OPT(CURLOPT_COOKIE, NULL);
#if HTTP_CURL_VERSION(7,14,1)
if (!(storage = http_request_storage_get(request->ch))) {
return FAILURE;
}
-
+ storage->errorbuffer[0] = '\0';
/* set options */
if (storage->url) {
pefree(storage->url, 1);
if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &prs)) {
zend_hash_move_forward(Z_ARRVAL_P(zoption));
if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &pre)) {
- zval *prs_cpy = zval_copy(IS_LONG, *prs), *pre_cpy = zval_copy(IS_LONG, *pre);
+ zval *prs_cpy = *prs, *pre_cpy = *pre;
+ convert_to_long_ex(&prs_cpy);
+ convert_to_long_ex(&pre_cpy);
if (Z_LVAL_P(prs_cpy) && Z_LVAL_P(pre_cpy)) {
HTTP_CURL_OPT(CURLOPT_LOCALPORT, MIN(Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy)));
HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, labs(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L);
}
- zval_free(&prs_cpy);
- zval_free(&pre_cpy);
+ if (prs_cpy != *prs) {
+ zval_ptr_dtor(&prs_cpy);
+ }
+ if (pre_cpy != *pre) {
+ zval_ptr_dtor(&pre_cpy);
+ }
}
}
}
if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void *) &re, &pos2)) {
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 = zval_copy(IS_LONG, *rb), *rel = zval_copy(IS_LONG, *re);
+ zval *rbl = *rb, *rel = *re;
+ convert_to_long_ex(&rbl);
+ convert_to_long_ex(&rel);
if ((Z_LVAL_P(rbl) >= 0) && (Z_LVAL_P(rel) >= 0)) {
phpstr_appendf(&rs, "%ld-%ld,", Z_LVAL_P(rbl), Z_LVAL_P(rel));
}
- zval_free(&rbl);
- zval_free(&rel);
+ if (rbl != *rb) {
+ zval_ptr_dtor(&rbl);
+ }
+ if (rel != *re) {
+ zval_ptr_dtor(&rel);
+ }
}
}
}
FOREACH_KEYVAL(pos, zoption, cookie_key, cookie_val) {
if (cookie_key.type == HASH_KEY_IS_STRING) {
- zval *val = zval_copy(IS_STRING, *cookie_val);
+ zval *val = *cookie_val;
+ convert_to_string_ex(&val);
phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key.str, Z_STRVAL_P(val));
- zval_free(&val);
+ if (val != *cookie_val) {
+ zval_ptr_dtor(&val);
+ }
}
}
ulong h = zend_hash_func(key, keylen);
if (SUCCESS == zend_hash_quick_find(options, key, keylen, h, (void *) &zoption)) {
- return http_request_option_cache_ex(r, key, keylen, h, zval_copy(type, *zoption));
+ zval *copy;
+
+ MAKE_STD_ZVAL(copy);
+ ZVAL_ZVAL(copy, *zoption, 1, 0);
+
+ convert_to_type(type, copy);
+ http_request_option_cache_ex(r, key, keylen, h, copy);
+ zval_ptr_dtor(©);
+ return copy;
}
}