remove FluentlyCallable interface

[m6w6/ext-http] / php_http.c

diff --git a/php_http.c b/php_http.c
index 5ce8aa4a0372c779c7147932f48da25e6e4a4975..fb49548a7ce8a9d19a2a3179ed77fb733d277a9c 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,19 +112,13 @@ 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;
 }
 #endif
 #endif
-PHP_INI_MH(http_update_persistent_handle_ident)
-{
-       PHP_HTTP_G->persistent_handle.ident.h = zend_hash_func(new_value, PHP_HTTP_G->persistent_handle.ident.l = new_value_length+1);
-       return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
-}
-
 PHP_INI_BEGIN()
        PHP_HTTP_INI_ENTRY("http.etag.mode", "md5", PHP_INI_ALL, OnUpdateString, env.etag_mode)
        PHP_HTTP_INI_ENTRY("http.request_datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.cookie)
@@ -132,7 +126,6 @@ PHP_INI_BEGIN()
        PHP_HTTP_INI_ENTRY("http.request_datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.ssl)
        PHP_HTTP_INI_ENTRY("http.request_datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.connect)
        PHP_HTTP_INI_ENTRY("http.persistent_handle.limit", "-1", PHP_INI_SYSTEM, OnUpdateLong, persistent_handle.limit)
-       PHP_HTTP_INI_ENTRY("http.persistent_handle.ident", "GLOBAL", PHP_INI_ALL, http_update_persistent_handle_ident, persistent_handle.ident.s)
 PHP_INI_END()
 
 PHP_MINIT_FUNCTION(http)
@@ -142,7 +135,6 @@ PHP_MINIT_FUNCTION(http)
        REGISTER_INI_ENTRIES();
        
        if (0
-       || SUCCESS != PHP_MINIT_CALL(http_fluently_callable)
        || SUCCESS != PHP_MINIT_CALL(http_object)
        || SUCCESS != PHP_MINIT_CALL(http_exception)
        || SUCCESS != PHP_MINIT_CALL(http_persistent_handle)
@@ -162,6 +154,7 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_request_pool)
        || SUCCESS != PHP_MINIT_CALL(http_url)
        || SUCCESS != PHP_MINIT_CALL(http_env)
+       || SUCCESS != PHP_MINIT_CALL(http_env_response)
        ) {
                return FAILURE;
        }
@@ -180,8 +173,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 +257,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);