#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
+#define HTTP_WANT_EVENT
#define HTTP_WANT_ZLIB
#define HTTP_WANT_MAGIC
#include "php_http.h"
# ifdef HTTP_HAVE_ICONV
ZEND_MOD_REQUIRED("iconv")
# endif
+# ifdef HTTP_HAVE_EVENT
+ ZEND_MOD_CONFLICTS("event")
+#endif
{NULL, NULL, NULL, 0}
};
#endif
PHP_RINIT(http),
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
- PHP_EXT_HTTP_VERSION,
+ PHP_HTTP_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
#endif
#ifdef HTTP_HAVE_CURL
# ifdef ZEND_ENGINE_2
+# ifdef HTTP_HAVE_EVENT
+ || SUCCESS != PHP_RINIT_CALL(http_request_pool)
+# endif
|| SUCCESS != PHP_RINIT_CALL(http_request_datashare)
# endif
#endif
{
php_info_print_table_start();
{
- php_info_print_table_row(2, "HTTP Support", "enabled");
- php_info_print_table_row(2, "Extension Version", PHP_EXT_HTTP_VERSION);
+ php_info_print_table_header(2, "HTTP Support", "enabled");
+ php_info_print_table_row(2, "Extension Version", PHP_HTTP_VERSION);
php_info_print_table_row(2, "Registered Classes",
#ifndef ZEND_ENGINE_2
"none"
#else
php_info_print_table_row(2, "libcurl", "disabled", "disabled");
#endif
+#ifdef HTTP_HAVE_EVENT
+ php_info_print_table_row(3, "libevent", HTTP_EVENT_VERSION, event_get_version());
+#else
+ php_info_print_table_row(3, "libevent", "disabled", "disabled");
+#endif
#ifdef HTTP_HAVE_ZLIB
php_info_print_table_row(3, "libz", ZLIB_VERSION, zlibVersion());
#else
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)) {
- convert_to_string(*zused);
- convert_to_string(*zfree);
- php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_PP(zused), Z_STRVAL_PP(zfree));
+ zval *used = http_zsep(IS_STRING, *zused);
+ zval *free = http_zsep(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);
} else {
php_info_print_table_row(4, provider.str, ident.str, "0", "0");
}