diff options
| author | Scott MacVicar <scottmac@php.net> | 2009-01-19 19:32:40 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2009-01-19 19:32:40 +0000 |
| commit | 390ccd899d73101ad5ddcfc46074a6c83ec178e8 (patch) | |
| tree | e1eeae178133b7d47f8f643d740d6c206c6a8e0b /sapi/apache2handler/php_functions.c | |
| parent | 65e3d00366677ff0e012893d529f449777ea06fb (diff) | |
| download | php-git-390ccd899d73101ad5ddcfc46074a6c83ec178e8.tar.gz | |
MFH Fix apache2handler under Apache 2.3.0-alpha
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 45f7ac348d..3b9321a2eb 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -372,8 +372,12 @@ PHP_MINFO_FUNCTION(apache) char *p; server_rec *serv = ((php_struct *) SG(server_context))->r->server; #if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE) +#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) { char *s = (char *) ap_loaded_modules[n]->name; @@ -403,7 +407,11 @@ PHP_MINFO_FUNCTION(apache) php_info_print_table_row(2, "Hostname:Port", tmp); #if !defined(WIN32) && !defined(WINNT) && !defined(NETWARE) +#if MODULE_MAGIC_NUMBER_MAJOR >= 20081201 + snprintf(tmp, sizeof(tmp), "%s(%d)/%d", ap_unixd_config.user_name, ap_unixd_config.user_id, ap_unixd_config.group_id); +#else snprintf(tmp, sizeof(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 |