header cleanups and fix some warnings

[m6w6/ext-http] / php_http.c

diff --git a/php_http.c b/php_http.c
index b71e6c26115722c305634811dbe31ef5909a1d96..cd95f48d1af30898bdea133b940514b0190cf964 100644 (file)
--- a/php_http.c
+++ b/php_http.c
@@ -10,9 +10,14 @@
     +--------------------------------------------------------------------+
 */
 
-#include "php_http.h"
+#include "php_http_api.h"
+
+#include <php_ini.h>
+#include <ext/standard/php_string.h>
+#include <ext/standard/info.h>
 
 #include <zlib.h>
+
 #if PHP_HTTP_HAVE_CURL
 #      include <curl/curl.h>
 #      if PHP_HTTP_HAVE_EVENT
@@ -20,16 +25,12 @@
 #      endif
 #endif
 #if PHP_HTTP_HAVE_NEON
-#      include "neon/ne_utils.h"
+#      include <neon/ne_utils.h>
 #endif
 #if PHP_HTTP_HAVE_SERF
-#      include "serf.h"
+#      include <serf.h>
 #endif
 
-#include <main/php_ini.h>
-#include <ext/standard/info.h>
-#include <Zend/zend_extensions.h>
-
 ZEND_DECLARE_MODULE_GLOBALS(php_http);
 
 #ifdef COMPILE_DL_HTTP
@@ -48,13 +49,13 @@ PHP_MINFO_FUNCTION(http);
 
 static zend_module_dep http_module_deps[] = {
        ZEND_MOD_REQUIRED("spl")
-#if PHP_HTTP_HAVE_HASH
+#ifdef PHP_HTTP_HAVE_HASH
        ZEND_MOD_REQUIRED("hash")
 #endif
-#if PHP_HTTP_HAVE_ICONV
+#ifdef PHP_HTTP_HAVE_ICONV
        ZEND_MOD_REQUIRED("iconv")
 #endif
-#if PHP_HTTP_HAVE_EVENT
+#ifdef PHP_HTTP_HAVE_EVENT
        ZEND_MOD_CONFLICTS("event")
 #endif
        {NULL, NULL, NULL, 0}
@@ -142,6 +143,7 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_cookie)
        || SUCCESS != PHP_MINIT_CALL(http_encoding)
        || SUCCESS != PHP_MINIT_CALL(http_filter)
+       || SUCCESS != PHP_MINIT_CALL(http_header)
        || SUCCESS != PHP_MINIT_CALL(http_message)
        || SUCCESS != PHP_MINIT_CALL(http_message_body)
        || SUCCESS != PHP_MINIT_CALL(http_property_proxy)
@@ -160,6 +162,7 @@ PHP_MINIT_FUNCTION(http)
        || SUCCESS != PHP_MINIT_CALL(http_url)
        || SUCCESS != PHP_MINIT_CALL(http_env)
        || SUCCESS != PHP_MINIT_CALL(http_env_response)
+       || SUCCESS != PHP_MINIT_CALL(http_params)
        ) {
                return FAILURE;
        }
@@ -251,6 +254,19 @@ PHP_MINFO_FUNCTION(http)
 #else
        php_info_print_table_row(3, "libevent", "disabled", "disabled");
 #endif
+
+#if PHP_HTTP_HAVE_SERF
+       {
+               int v[3];
+               char sl_v[16] = {0};
+
+               serf_lib_version(&v[0], &v[1], &v[2]);
+               slprintf(sl_v, lenof(sl_v), "%d.%d.%d", v[0], v[1], v[2]);
+               php_info_print_table_row(3, "libserf", SERF_VERSION_STRING, sl_v);
+       }
+#else
+       php_info_print_table_row(3, "libserf", "disabled", "disabled");
+#endif
        php_info_print_table_end();
        
        php_info_print_table_start();