projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix bug#15495 HttpMessage::setHttpVersion segfault
[m6w6/ext-http]
/
http.c
diff --git
a/http.c
b/http.c
index f6b21189a48136400cdedb1e2c685af1e9559504..74d92b227d480b730d5102cc9e6e6293904668eb 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-164,7
+164,7
@@
zend_module_entry http_module_entry = {
PHP_RINIT(http),
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
PHP_RINIT(http),
PHP_RSHUTDOWN(http),
PHP_MINFO(http),
- PHP_
EXT_
HTTP_VERSION,
+ PHP_HTTP_VERSION,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@
-411,8
+411,8
@@
PHP_MINFO_FUNCTION(http)
{
php_info_print_table_start();
{
{
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"
php_info_print_table_row(2, "Registered Classes",
#ifndef ZEND_ENGINE_2
"none"
@@
-454,6
+454,11
@@
PHP_MINFO_FUNCTION(http)
#else
php_info_print_table_row(2, "libcurl", "disabled", "disabled");
#endif
#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
#ifdef HTTP_HAVE_ZLIB
php_info_print_table_row(3, "libz", ZLIB_VERSION, zlibVersion());
#else