projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
8b0dab3
)
- even simpler MINFO
author
Michael Wallner
<mike@php.net>
Mon, 5 Sep 2005 15:29:45 +0000
(15:29 +0000)
committer
Michael Wallner
<mike@php.net>
Mon, 5 Sep 2005 15:29:45 +0000
(15:29 +0000)
http.c
patch
|
blob
|
history
diff --git
a/http.c
b/http.c
index 627f5b70dedf9b89c2e94809e8a3f4276fc57319..72c7c2a532dd022be5cb7429dce34afd71c6a921 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-57,6
+57,9
@@
# endif
# include <curl/curl.h>
#endif
# endif
# include <curl/curl.h>
#endif
+#ifdef HTTP_HAVE_MHASH
+# include <mhash.h>
+#endif
#include <ctype.h>
#include <ctype.h>
@@
-319,26
+322,17
@@
PHP_RSHUTDOWN_FUNCTION(http)
/* {{{ PHP_MINFO_FUNCTION */
PHP_MINFO_FUNCTION(http)
{
/* {{{ PHP_MINFO_FUNCTION */
PHP_MINFO_FUNCTION(http)
{
-#ifdef HTTP_HAVE_CURL
-# define HTTP_CURL_VERSION curl_version()
-#else
-# define HTTP_CURL_VERSION "libcurl not available"
-#endif
-
php_info_print_table_start();
{
php_info_print_table_start();
{
- char full_version_string[1024] = {0};
- snprintf(full_version_string, 1023, "%s (%s)", HTTP_PEXT_VERSION, HTTP_CURL_VERSION);
-
php_info_print_table_row(2, "Extended HTTP support:", "enabled");
php_info_print_table_row(2, "Extended HTTP support:", "enabled");
- php_info_print_table_row(2, "Extension Version:",
full_version_string
);
+ php_info_print_table_row(2, "Extension Version:",
HTTP_PEXT_VERSION
);
#ifdef HTTP_HAVE_CURL
#ifdef HTTP_HAVE_CURL
- php_info_print_table_row(2, "cURL HTTP Requests:",
"enabled"
);
+ php_info_print_table_row(2, "cURL HTTP Requests:",
curl_version()
);
#else
php_info_print_table_row(2, "cURL HTTP Requests:", "disabled");
#endif
#ifdef HTTP_HAVE_MHASH
#else
php_info_print_table_row(2, "cURL HTTP Requests:", "disabled");
#endif
#ifdef HTTP_HAVE_MHASH
- php_info_print_table_row(2, "mhash ETag Generator:",
"enabled"
);
+ php_info_print_table_row(2, "mhash ETag Generator:",
MHASH_API_VERSION
);
#else
php_info_print_table_row(2, "mhash ETag Generator:", "disabled");
#endif
#else
php_info_print_table_row(2, "mhash ETag Generator:", "disabled");
#endif