http_curl_initbuf(); \
http_curl_setopts(ch, URL, options);
+#define http_curl_perform(ch, clean_curl) \
+ { \
+ CURLcode result; \
+ if (CURLE_OK != (result = curl_easy_perform(ch))) { \
+ http_curl_cleanup(ch, clean_curl); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request: %s", curl_easy_strerror(result)); \
+ return FAILURE; \
+ } \
+ }
#define http_curl_cleanup(ch, clean_curl) \
http_curl_freestr(); \
HTTP_G(curlbuf).size = 0;
#define http_curl_copybuf(data, size) \
- * size = HTTP_G(curlbuf).used; \
- * data = ecalloc(1, HTTP_G(curlbuf).used + 1); \
- memcpy(* data, HTTP_G(curlbuf).data, * size);
+ *size = HTTP_G(curlbuf).used; \
+ *data = ecalloc(1, HTTP_G(curlbuf).used + 1); \
+ memcpy(*data, HTTP_G(curlbuf).data, HTTP_G(curlbuf).used);
#define http_curl_sizebuf(for_size) \
{ \
http_curl_startup(ch, clean_curl, URL, options);
curl_easy_setopt(ch, CURLOPT_HTTPGET, 1);
-
- if (CURLE_OK != curl_easy_perform(ch)) {
- http_curl_cleanup(ch, clean_curl);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
- return FAILURE;
- }
+ http_curl_perform(ch, clean_curl);
if (info) {
http_curl_getinfo(ch, info);
http_curl_startup(ch, clean_curl, URL, options);
curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
-
- if (CURLE_OK != curl_easy_perform(ch)) {
- http_curl_cleanup(ch, clean_curl);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
- return FAILURE;
- }
+ http_curl_perform(ch, clean_curl);
if (info) {
http_curl_getinfo(ch, info);
curl_easy_setopt(ch, CURLOPT_POST, 1);
curl_easy_setopt(ch, CURLOPT_POSTFIELDS, postdata);
curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len);
-
- if (CURLE_OK != curl_easy_perform(ch)) {
- http_curl_cleanup(ch, clean_curl);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
- return FAILURE;
- }
+ http_curl_perform(ch, clean_curl);
if (info) {
http_curl_getinfo(ch, info);
http_curl_startup(ch, clean_curl, URL, options);
curl_easy_setopt(ch, CURLOPT_POST, 1);
curl_easy_setopt(ch, CURLOPT_HTTPPOST, curldata);
-
- if (CURLE_OK != curl_easy_perform(ch)) {
- http_curl_cleanup(ch, clean_curl);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
- return FAILURE;
- }
+ http_curl_perform(ch, clean_curl);
if (info) {
http_curl_getinfo(ch, info);