X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_requestpool_object.c;h=48783c8d3c9f52158fb97f76c88a7a8d4f588131;hp=4a4293ba29549eed553b30540971e918bd8f42e6;hb=d98b2e7cdf369bf32149aa62484e576c02d4c67b;hpb=9e37263154391dec762b839cad4b7dd13e35467e

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index 4a4293b..48783c8 100644
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -173,8 +173,8 @@ PHP_METHOD(HttpRequestPool, __construct)
 		}
 	}
 	efree(argv);
-	SET_EH_NORMAL();
 	http_final(HTTP_EX_CE(request_pool));
+	SET_EH_NORMAL();
 }
 /* }}} */
 
@@ -407,7 +407,9 @@ PHP_METHOD(HttpRequestPool, getFinishedRequests)
 PHP_METHOD(HttpRequestPool, enablePipelining)
 {
 	zend_bool enable = 1;
+#if defined(HAVE_CURL_MULTI_SETOPT) && HTTP_CURL_VERSION(7,16,0)
 	getObject(http_requestpool_object, obj);
+#endif
 	
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable)) {
 		RETURN_FALSE;
@@ -426,7 +428,9 @@ PHP_METHOD(HttpRequestPool, enablePipelining)
 PHP_METHOD(HttpRequestPool, enableEvents)
 {
 	zend_bool enable = 1;
+#if defined(HTTP_HAVE_EVENT)
 	getObject(http_requestpool_object, obj);
+#endif
 	
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable)) {
 #if defined(HTTP_HAVE_EVENT)