From 8514a96c9921700232bf59aa49bd8f8749bbeae1 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sat, 12 Jul 2008 21:20:10 +0000 Subject: [PATCH] - MFB: Fixed bug #45220 (curl_read callback returns -1 when needs to return size_t (unsigned)) --- ext/curl/interface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index b2f3cbeb35..f06e5e83e3 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -785,7 +785,7 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx) { php_curl *ch = (php_curl *) ctx; php_curl_read *t = ch->handlers->read; - int length = -1; + int length = 0; switch (t->method) { case PHP_CURL_DIRECT: @@ -832,7 +832,9 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx) ch->in_callback = 0; if (error == FAILURE) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot call the CURLOPT_READFUNCTION"); - length = -1; +#if LIBCURL_VERSION_NUM >= 0x070c01 /* 7.12.1 */ + length = CURL_READFUNC_ABORT; +#endif } else if (retval_ptr) { if (Z_TYPE_P(retval_ptr) == IS_STRING) { length = MIN(size * nmemb, Z_STRLEN_P(retval_ptr)); -- 2.50.1