archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix apache2handler under Apache 2.3.0-alpha

Browse source
This commit is contained in:
Scott MacVicar 2009-01-19 19:31:45 +00:00
parent 1770e94d92
commit 381f6e28ba
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sapi/apache2handler/php_functions.c
View file

@ -372,7 +372,11 @@ PHP_MINFO_FUNCTION(apache)
char *p; char *p;
server_rec *serv = ((php_struct *) SG(server_context))->r->server; server_rec *serv = ((php_struct *) SG(server_context))->r->server;
#if !defined(WIN32) && !defined(WINNT) #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; AP_DECLARE_DATA extern unixd_config_rec unixd_config;
#endif
#endif #endif
for (n = 0; ap_loaded_modules[n]; ++n) { 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); php_info_print_table_row(2, "Hostname:Port", tmp);
#if !defined(WIN32) && !defined(WINNT) #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); 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); php_info_print_table_row(2, "User/Group", tmp);
#endif #endif