| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
PHP_FE(http_negotiate_language, http_arg_pass_ref_2)
PHP_FE(http_negotiate_charset, http_arg_pass_ref_2)
PHP_FE(http_negotiate_content_type, http_arg_pass_ref_2)
+ PHP_FE(http_negotiate, http_arg_pass_ref_3)
PHP_FE(http_redirect, NULL)
PHP_FE(http_throttle, NULL)
PHP_FE(http_send_status, NULL)
PHP_RINIT(http),
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
- PHP_EXT_HTTP_VERSION,
+ PHP_HTTP_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
# endif
#endif
+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_message_object)
|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle) /* last */
) {
return FAILURE;
{
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"
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");
}