X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client_curl.c;h=501c2521e7aff2acd3773d71740c7731195c8cb6;hp=77c6123e434bbc0b9a3d941f531d48f1474e8a27;hb=refs%2Fheads%2Fv2.0.x;hpb=332d72ecbd00cc25b97932b8d8facf9b21dbc55e

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 77c6123..501c252 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -176,9 +176,13 @@ static size_t php_http_curle_read_callback(void *data, size_t len, size_t n, voi
 {
 	php_http_message_body_t *body = ctx;
 
-	if (body) {
-		TSRMLS_FETCH_FROM_CTX(body->ts);
-		return php_stream_read(php_http_message_body_stream(body), data, len * n);
+	if (body && body->stream_id) {
+		php_stream *s = php_http_message_body_stream(body);
+
+		if (s) {
+			TSRMLS_FETCH_FROM_CTX(body->ts);
+			return php_stream_read(s, data, len * n);
+		} else abort();
 	}
 	return 0;
 }
@@ -254,6 +258,8 @@ static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data,
 				h->progress.info = "blacklist check";
 			} else if (php_memnstr(data, ZEND_STRL("SSL"), data + length)) {
 				h->progress.info = "ssl negotiation";
+			} else if (php_memnstr(data, ZEND_STRL("upload"), data + length)) {
+				h->progress.info = "uploaded";
 			} else if (php_memnstr(data, ZEND_STRL("left intact"), data + length)) {
 				h->progress.info = "not disconnected";
 			} else if (php_memnstr(data, ZEND_STRL("closed"), data + length)) {
@@ -265,6 +271,7 @@ static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data,
 			} else {
 #if PHP_DEBUG
 				h->progress.info = data;
+				data[length - 1] = '\0';
 #endif
 			}
 			if (h->client->callback.progress.func) {
@@ -1096,7 +1103,11 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 	/* useragent */
 	if ((opt = php_http_option_register(registry, ZEND_STRL("useragent"), CURLOPT_USERAGENT, IS_STRING))) {
 		/* don't check strlen, to allow sending no useragent at all */
-		ZVAL_STRING(&opt->defval, "PECL::HTTP/" PHP_PECL_HTTP_VERSION " (PHP/" PHP_VERSION ")", 0);
+		ZVAL_STRING(&opt->defval,
+				"PECL_HTTP/" PHP_PECL_HTTP_VERSION " "
+				"PHP/" PHP_VERSION " "
+				"libcurl/" LIBCURL_VERSION
+			, 0);
 	}
 
 	/* resume */
@@ -1488,8 +1499,8 @@ static STATUS php_http_client_curl_handler_prepare(php_http_client_curl_handler_
 			}
 		}
 		php_http_buffer_dtor(&header);
-		curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, curl->options.headers);
 	}
+	curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, curl->options.headers);
 
 	/* attach request body */
 	if ((body_size = php_http_message_body_size(msg->body))) {
@@ -1504,6 +1515,11 @@ static STATUS php_http_client_curl_handler_prepare(php_http_client_curl_handler_
 		curl_easy_setopt(curl->handle, CURLOPT_READDATA, msg->body);
 		curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, body_size);
 		curl_easy_setopt(curl->handle, CURLOPT_POSTFIELDSIZE, body_size);
+	} else {
+		curl_easy_setopt(curl->handle, CURLOPT_IOCTLDATA, NULL);
+		curl_easy_setopt(curl->handle, CURLOPT_READDATA, NULL);
+		curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, 0L);
+		curl_easy_setopt(curl->handle, CURLOPT_POSTFIELDSIZE, 0L);
 	}
 
 	php_http_options_apply(&php_http_curle_options, enqueue->options, curl);
@@ -1798,7 +1814,7 @@ static STATUS php_http_client_curl_exec(php_http_client_t *h)
 				/* see http://msdn.microsoft.com/library/en-us/winsock/winsock/windows_sockets_error_codes_2.asp */
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "WinSock error: %d", WSAGetLastError());
 #else
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, strerror(errno));
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
 #endif
 				return FAILURE;
 			}