projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
* zval_add_ref() expects zval **
[m6w6/ext-http]
/
http_curl_api.c
diff --git
a/http_curl_api.c
b/http_curl_api.c
index 08d543dbae5c82acf53c0d077ffc813eb1bb612e..3dc462cdc95a3f8d539121b0efdfc2d23fcd4802 100644
(file)
--- a/
http_curl_api.c
+++ b/
http_curl_api.c
@@
-20,14
+20,10
@@
#endif
#ifdef PHP_WIN32
#endif
#ifdef PHP_WIN32
-# define _WINSOCKAPI_
-# define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
# include <winsock2.h>
# include <winsock2.h>
-# include <sys/types.h>
#endif
#include <curl/curl.h>
#endif
#include <curl/curl.h>
-#include <curl/easy.h>
#include "php.h"
#include "php_http.h"
#include "php.h"
#include "php_http.h"
@@
-49,6
+45,11
@@
ZEND_DECLARE_MODULE_GLOBALS(http)
# define http_curl_reset(ch)
#endif
# define http_curl_reset(ch)
#endif
+/* FIXXME: correct version where strerror is supported! */
+#if LIBCURL_VERSION_NUM < 0x070b01
+# define curl_easy_strerror(code) "unkown error"
+#endif
+
#define http_curl_startup(ch, clean_curl, URL, options) \
if (!ch) { \
if (!(ch = curl_easy_init())) { \
#define http_curl_startup(ch, clean_curl, URL, options) \
if (!ch) { \
if (!(ch = curl_easy_init())) { \
@@
-83,11
+84,15
@@
ZEND_DECLARE_MODULE_GLOBALS(http)
#define http_curl_freestr() \
zend_llist_clean(&HTTP_G(to_free))
#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) \
{ \
#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_curl_freebuf(); \
HTTP_G(curlbuf).data = emalloc(size); \
HTTP_G(curlbuf).free = size; \