X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_pool_api.c;h=0faf2756c13f5fae199891bfd1eb94e73c9d60f6;hb=f0d2eafadc9967abd53546c6b7f395ce095255e9;hp=d8aae7c004f8c924a7bfb962ec7855f49cad760a;hpb=f1df16d07b48a2561ec8c3065e094f3f17c09889;p=m6w6%2Fext-http

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index d8aae7c..0faf275 100644
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -105,7 +102,7 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 				zend_llist_add_element(&pool->handles, &request);
 				zend_llist_add_element(&pool->bodies, &body);
 
-				zval_add_ref(&request);
+				ZVAL_ADDREF(request);
 				Z_OBJ_ADDREF_P(request);
 
 #if HTTP_DEBUG_REQPOOLS
@@ -242,6 +239,12 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC)
 }
 /* }}} */
 
+#ifdef PHP_WIN32
+#	define SELECT_ERROR SOCKET_ERROR
+#else
+#	define SELECT_ERROR -1
+#endif
+
 /* {{{ STATUS http_request_pool_select(http_request_pool *) */
 PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
 {
@@ -253,8 +256,12 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
 	FD_ZERO(&W);
 	FD_ZERO(&E);
 
-	curl_multi_fdset(pool->ch, &R, &W, &E, &MAX);
-	return (-1 != select(MAX + 1, &R, &W, &E, &timeout)) ? SUCCESS : FAILURE;
+	if (CURLM_OK == curl_multi_fdset(pool->ch, &R, &W, &E, &MAX)) {
+		if (MAX == -1 || SELECT_ERROR != select(MAX + 1, &R, &W, &E, &timeout)) {
+			return SUCCESS;
+		}
+	}
+	return FAILURE;
 }
 /* }}} */
 
@@ -268,11 +275,9 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
 	
 	while (msg = curl_multi_info_read(pool->ch, &remaining)) {
 		if (CURLMSG_DONE == msg->msg) {
-
-#if HTTP_DEBUG_REQPOOLS
-			fprintf(stderr, "Done CURL handle: %p (remaining: %d)\n", msg->easy_handle, remaining);
-#endif
-			
+			if (CURLE_OK != msg->data.result) {
+				http_error(HE_WARNING, HTTP_E_REQUEST, curl_easy_strerror(msg->data.result));
+			}
 			zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_responsehandler, msg->easy_handle TSRMLS_CC);
 		}
 	}
@@ -304,7 +309,7 @@ void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC)
 		fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_PP(req), obj, obj->pool);
 #endif
 		
-		zval_add_ref(req);
+		ZVAL_ADDREF(*req);
 		Z_OBJ_ADDREF_PP(req);
 		zend_llist_add_element(&obj->pool->finished, req);
 		http_request_object_responsehandler(obj, *req);