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 b4ed0dfbdcd06083c61ef621912b0900522ba7b6..74d92b227d480b730d5102cc9e6e6293904668eb 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-14,6
+14,7
@@
#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
+#define HTTP_WANT_EVENT
#define HTTP_WANT_ZLIB
#define HTTP_WANT_MAGIC
#include "php_http.h"
#define HTTP_WANT_ZLIB
#define HTTP_WANT_MAGIC
#include "php_http.h"
@@
-140,6
+141,9
@@
static zend_module_dep http_module_deps[] = {
# ifdef HTTP_HAVE_ICONV
ZEND_MOD_REQUIRED("iconv")
# endif
# ifdef HTTP_HAVE_ICONV
ZEND_MOD_REQUIRED("iconv")
# endif
+# ifdef HTTP_HAVE_EVENT
+ ZEND_MOD_CONFLICTS("event")
+#endif
{NULL, NULL, NULL, 0}
};
#endif
{NULL, NULL, NULL, 0}
};
#endif
@@
-160,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
};
/* }}} */
@@
-363,6
+367,9
@@
PHP_RINIT_FUNCTION(http)
#endif
#ifdef HTTP_HAVE_CURL
# ifdef ZEND_ENGINE_2
#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
|| SUCCESS != PHP_RINIT_CALL(http_request_datashare)
# endif
#endif
@@
-404,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"
@@
-447,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