A few other minor fixes

diff --git a/ext/apache/apache.c b/ext/apache/apache.c
index d3a390eba653201c5f6bf6e932ec6da70b2cedf9..b174262060c92e392ca9864cfbcaf5ee263c5dbf 100644 (file)
--- a/ext/apache/apache.c
+++ b/ext/apache/apache.c
@@ -154,7 +154,8 @@ void php3_apache_note(INTERNAL_FUNCTION_PARAMETERS)
 }
 /* }}} */
 
-void php3_info_apache(ZEND_MODULE_INFO_FUNC_ARGS) {
+void php3_info_apache(ZEND_MODULE_INFO_FUNC_ARGS)
+{
        module *modp = NULL;
 #if !defined(WIN32) && !defined(WINNT)
        char name[64];

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index f71b129a1782b1aa54424f003f3772abcfe93975..9dd0ef3a896c4d27a2cb0abbcd6ea91874a3b6ae 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -178,7 +178,8 @@ int php3_minit_gd(INIT_FUNC_ARGS)
        return SUCCESS;
 }
 
-void php3_info_gd(ZEND_MODULE_INFO_FUNC_ARGS) {
+void php3_info_gd(ZEND_MODULE_INFO_FUNC_ARGS)
+{
        /* need to use a PHPAPI function here because it is external module in windows */
 #if HAVE_LIBGD13
        php3_printf("Version 1.3");

diff --git a/ext/gd/php3_gd.h b/ext/gd/php3_gd.h
index ea25c06aca67b0f1931c377e88a634c80ce3f240..c0a90272302980c609ca004d69717dae256fe747 100644 (file)
--- a/ext/gd/php3_gd.h
+++ b/ext/gd/php3_gd.h
@@ -47,7 +47,7 @@ extern php3_module_entry gd_module_entry;
 #define phpext_gd_ptr &gd_module_entry
 
 /* gd.c functions */
-extern void php3_info_gd(void);
+extern void php3_info_gd(ZEND_MODULE_INFO_FUNC_ARGS);
 extern int php3_minit_gd(INIT_FUNC_ARGS);
 extern int php3_mend_gd(SHUTDOWN_FUNC_ARGS);
 extern int gdImageColorResolve(gdImagePtr, int, int, int);

diff --git a/ext/standard/post.c b/ext/standard/post.c
index 7be502ff69e9ad2d6a4f7ddab54c0b1396912bd7..7edcc70788d53ae17961fd7a345576c506bd4a8a 100644 (file)
--- a/ext/standard/post.c
+++ b/ext/standard/post.c
@@ -42,7 +42,7 @@
  * This reads the post form data into a string.
  * Remember to free this pointer when done with it.
  */
-#if APACHE
+#if 0
 static char *php3_getpost(pval *http_post_vars PLS_DC)
 {
        char *buf = NULL;

diff --git a/main/php_ini.h b/main/php_ini.h
index de9a994858a3be4e93bebbbd9a470200355bcb38..09a9f62c1bbd6b86cb437a00fa25af06b9dbb4a4 100644 (file)
--- a/main/php_ini.h
+++ b/main/php_ini.h
@@ -102,7 +102,7 @@ PHPAPI PHP_INI_DISP(php_ini_color_displayer_cb);
 
 #define REGISTER_INI_ENTRIES() php_register_ini_entries(ini_entries, module_number)
 #define UNREGISTER_INI_ENTRIES() php_unregister_ini_entries(module_number)
-#define DISPLAY_INI_ENTRIES() display_ini_entries(module)
+#define DISPLAY_INI_ENTRIES() display_ini_entries(zend_module)
 
 #define REGISTER_INI_DISPLAYER(name, displayer) php_ini_register_displayer((name), sizeof(name), displayer)
 #define REGISTER_INI_BOOLEAN(name) REGISTER_INI_DISPLAYER(name, php_ini_boolean_displayer_cb)

diff --git a/request_info.c b/request_info.c
index 86a56f7c3086f246caa6f3495b27387ba13dc4a1..884b184c31a780b4737bbe9145ea5597a44d75fc 100644 (file)
--- a/request_info.c
+++ b/request_info.c
@@ -105,7 +105,7 @@ int php3_init_request_info(void *conf)
 
        request_info.filename = r->filename;
        SG(request_info).request_method = r->method;
-       request_info.content_type = table_get(r->subprocess_env, "CONTENT_TYPE");
+       SG(request_info).content_type = table_get(r->subprocess_env, "CONTENT_TYPE");
 
        buf = table_get(r->subprocess_env, "CONTENT_LENGTH");
        SG(request_info).content_length = (buf ? atoi(buf) : 0);