* change shutdown order because of resource factory

diff --git a/php_http.c b/php_http.c
index 5ce8aa4a0372c779c7147932f48da25e6e4a4975..e5456c4cfbb4151fe08e7528f8fe52bba8e13b1c 100644 (file)
--- a/php_http.c
+++ b/php_http.c
@@ -92,7 +92,7 @@ void _dpf(int type, const char *data, size_t length)
                }
                fprintf(stderr, "\n");
        } else {
-               fprintf(stderr, "# %.*s\n", (long) length, data);
+               fprintf(stderr, "# %.*s\n", (int) length, data);
        }
 }
 #endif
@@ -112,7 +112,7 @@ static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC)
 
 #if defined(ZTS) && defined(PHP_DEBUG)
 #if ZTS && PHP_DEBUG
-zend_http_globals *php_http_globals(void)
+zend_php_http_globals *php_http_globals(void)
 {
        TSRMLS_FETCH();
        return PHP_HTTP_G;
@@ -180,8 +180,8 @@ PHP_MSHUTDOWN_FUNCTION(http)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_neon)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
-       || SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
        || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory)
+       || SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
        ) {
                return FAILURE;
        }
@@ -264,8 +264,8 @@ PHP_MINFO_FUNCTION(http)
                                        FOREACH_KEYVAL(pos2, *val, ident, sub) {
                                                if (    SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("used"), (void *) &zused) &&
                                                                SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("free"), (void *) &zfree)) {
-                                                       zval *used = php_http_zsep(IS_STRING, *zused);
-                                                       zval *free = php_http_zsep(IS_STRING, *zfree);
+                                                       zval *used = php_http_ztyp(IS_STRING, *zused);
+                                                       zval *free = php_http_ztyp(IS_STRING, *zfree);
                                                        php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_P(used), Z_STRVAL_P(free));
                                                        zval_ptr_dtor(&used);
                                                        zval_ptr_dtor(&free);

diff --git a/php_http.h b/php_http.h
index d9906ef5c72d118952e464183543c8aa8b882361..822ac1d9b013c456e0b400254e6cfea2f46aec76 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -100,6 +100,7 @@ extern void _dpf(int type, const char *data, size_t length);
 #include "php_http_negotiate.h"
 #include "php_http_object.h"
 #include "php_http_params.h"
+#include "php_http_resource_factory.h"
 #include "php_http_persistent_handle.h"
 #include "php_http_property_proxy.h"
 #include "php_http_querystring.h"
@@ -117,14 +118,16 @@ ZEND_BEGIN_MODULE_GLOBALS(php_http)
        struct php_http_env_globals env;
        struct php_http_persistent_handle_globals persistent_handle;
        struct php_http_request_datashare_globals request_datashare;
+#ifdef PHP_HTTP_HAVE_EVENT
        struct php_http_request_pool_globals request_pool;
+#endif
 ZEND_END_MODULE_GLOBALS(php_http)
 
 ZEND_EXTERN_MODULE_GLOBALS(php_http);
 
 #ifdef ZTS
 #      include "TSRM/TSRM.h"
-#      define PHP_HTTP_G ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
+#      define PHP_HTTP_G ((php_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(php_http_globals_id)])
 #      undef TSRMLS_FETCH_FROM_CTX
 #      define TSRMLS_FETCH_FROM_CTX(ctx) ((ctx)?(ctx):ts_resource_ex(0, NULL))
 #else