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 ws
[m6w6/ext-http]
/
php_http.c
diff --git
a/php_http.c
b/php_http.c
index 2ed94c8e1bf78cdf231445735a29ec05ffc64d70..c3838b80b905ac7dee1e6bb4df2af603c438a1e8 100644
(file)
--- a/
php_http.c
+++ b/
php_http.c
@@
-20,7
+20,12
@@
#if PHP_HTTP_HAVE_CURL
# include <curl/curl.h>
# if PHP_HTTP_HAVE_EVENT
#if PHP_HTTP_HAVE_CURL
# include <curl/curl.h>
# if PHP_HTTP_HAVE_EVENT
-# include <event.h>
+# if PHP_HTTP_HAVE_EVENT2
+# include <event2/event.h>
+# include <event2/event_struct.h>
+# else
+# include <event.h>
+# endif
# endif
#endif
#if PHP_HTTP_HAVE_SERF
# endif
#endif
#if PHP_HTTP_HAVE_SERF
@@
-73,7
+78,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_
HTTP_EXT
_VERSION,
+ PHP_
PECL_HTTP
_VERSION,
STANDARD_MODULE_PROPERTIES
};
STANDARD_MODULE_PROPERTIES
};
@@
-217,7
+222,7
@@
PHP_MINFO_FUNCTION(http)
php_info_print_table_start();
php_info_print_table_header(2, "HTTP Support", "enabled");
php_info_print_table_start();
php_info_print_table_header(2, "HTTP Support", "enabled");
- php_info_print_table_row(2, "Extension Version", PHP_
HTTP_EXT
_VERSION);
+ php_info_print_table_row(2, "Extension Version", PHP_
PECL_HTTP
_VERSION);
php_info_print_table_end();
php_info_print_table_start();
php_info_print_table_end();
php_info_print_table_start();