- use zend_hash_find() instead of FOREACH in http_match_request_header() (don't ask)

[m6w6/ext-http] / http_requestpool_object.c

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index 0bb585974c64e8ba0e5f462659f49e2fa9859bb5..263be82524f24a559b01931c61b79304619ff122 100644 (file)
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -28,9 +28,9 @@
 #include "php_http_exception_object.h"
 
 #include "zend_interfaces.h"
-#ifdef HAVE_SPL
-#      include "ext/spl/spl_array.h"
-#      include "ext/spl/spl_iterators.h"
+#if defined(HAVE_SPL) && !defined(WONKY)
+/* SPL doesn't install its headers */
+extern PHPAPI zend_class_entry *spl_ce_Countable;
 #endif
 
 #ifdef PHP_WIN32
@@ -109,8 +109,8 @@ static zend_object_handlers http_requestpool_object_handlers;
 PHP_MINIT_FUNCTION(http_requestpool_object)
 {
        HTTP_REGISTER_CLASS_EX(HttpRequestPool, http_requestpool_object, NULL, 0);
-#ifdef HAVE_SPL
-       zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 2, spl_ce_Countable, spl_ce_Iterator);
+#if defined(HAVE_SPL) && !defined(WONKY)
+       zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 2, spl_ce_Countable, zend_ce_iterator);
 #else
        zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 1, zend_ce_iterator);
 #endif