Fix apache2handler under Apache 2.3.0-alpha

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index e7dd7fed1b647211bb62843700cbcb4224eabe19..b65395fd0b65216a620f983e94ef417feff23b78 100644 (file)
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -372,7 +372,11 @@ PHP_MINFO_FUNCTION(apache)
        char *p;
        server_rec *serv = ((php_struct *) SG(server_context))->r->server;
 #if !defined(WIN32) && !defined(WINNT)
+#if MODULE_MAGIC_NUMBER_MAJOR >= 20081201
+       AP_DECLARE_DATA extern unixd_config_rec ap_unixd_config;
+#else
        AP_DECLARE_DATA extern unixd_config_rec unixd_config;
+#endif
 #endif
        
        for (n = 0; ap_loaded_modules[n]; ++n) {
@@ -403,7 +407,11 @@ PHP_MINFO_FUNCTION(apache)
        php_info_print_table_row(2, "Hostname:Port", tmp);
        
 #if !defined(WIN32) && !defined(WINNT)
+#if MODULE_MAGIC_NUMBER_MAJOR >= 20081201
+       sprintf(tmp, "%s(%d)/%d", ap_unixd_config.user_name, ap_unixd_config.user_id, ap_unixd_config.group_id);
+#else
        sprintf(tmp, "%s(%d)/%d", unixd_config.user_name, unixd_config.user_id, unixd_config.group_id);
+#endif
        php_info_print_table_row(2, "User/Group", tmp);
 #endif