#endif
#ifdef PHP_WIN32
-# define _WINSOCKAPI_
-# define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
# include <winsock2.h>
-# include <sys/types.h>
#endif
#include <curl/curl.h>
-#include <curl/easy.h>
#include "php.h"
#include "php_http.h"
# define http_curl_reset(ch)
#endif
+#if LIBCURL_VERSION_NUM < 0x070c00
+# define curl_easy_strerror(code) "unkown error"
+#endif
+
#define http_curl_startup(ch, clean_curl, URL, options) \
if (!ch) { \
if (!(ch = curl_easy_init())) { \
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(); \
#define http_curl_freestr() \
zend_llist_clean(&HTTP_G(to_free))
-#define http_curl_initbuf() http_curl_initbuf_ex(0)
+#define http_curl_initbuf() \
+ http_curl_initbuf_ex(0)
#define http_curl_initbuf_ex(chunk_size) \
{ \
- size_t size = (chunk_size > 0) ? chunk_size : HTTP_CURLBUF_SIZE; \
+ size_t size = chunk_size; \
+ if (size < 1) { \
+ size = HTTP_CURLBUF_SIZE; \
+ } \
http_curl_freebuf(); \
HTTP_G(curlbuf).data = emalloc(size); \
HTTP_G(curlbuf).free = size; \
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) \
{ \
static inline char *_http_curl_copystr(const char *str TSRMLS_DC);
#define http_curl_setopts(c, u, o) _http_curl_setopts((c), (u), (o) TSRMLS_CC)
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC);
+static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC);
#define http_curl_getopt(o, k) _http_curl_getopt((o), (k) TSRMLS_CC, 0)
#define http_curl_getopt1(o, k, t1) _http_curl_getopt((o), (k) TSRMLS_CC, 1, (t1))
}
/* }}} */
-/* {{{ static inline void http_curl_setopts(CURL *, char *, HashTable *) */
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC)
+/* {{{ static void http_curl_setopts(CURL *, char *, HashTable *) */
+static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC)
{
zval *zoption;
zend_bool range_req = 0;
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);