X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=48c1cde8a2995bb1496e9192e8373549cce4c350;hp=9abbc3a76bb3ec1fe87b7b1faa1a2b5a448bcd83;hb=d19eb84fa85cc82c46b943b49d906714e0a9b3c5;hpb=4e3211cfb2655e91693bbb139e3a32fb6825830d

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index 9abbc3a..48c1cde 100644
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -15,16 +15,16 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
+
+#define HTTP_WANT_CURL
+#include "php_http.h"
 
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_request_api.h"
-#include "php_http_request_pool_api.h"
 #include "php_http_request_object.h"
+#include "php_http_request_pool_api.h"
 #include "php_http_requestpool_object.h"
 
 #ifndef HTTP_DEBUG_REQPOOLS
@@ -269,7 +269,7 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
 	
 	while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished));
 	
-	while (msg = curl_multi_info_read(pool->ch, &remaining)) {
+	while ((msg = curl_multi_info_read(pool->ch, &remaining))) {
 		if (CURLMSG_DONE == msg->msg) {
 			if (CURLE_OK != msg->data.result) {
 				http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result));