diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x install-sh -x ltmain.sh -x php_config.h.in php-4.4.9.org/acinclude.m4 php-4.4.9.changed/acinclude.m4 --- php-4.4.9.org/acinclude.m4 2013-10-07 13:35:57.560042156 +0200 +++ php-4.4.9.changed/acinclude.m4 2013-10-07 13:35:39.659624293 +0200 @@ -2007,6 +2007,10 @@ ac_output=`$1 -v 2>&1` fi + if test -n "$FORCE_APACHE_VERSION"; then + ac_output="Server version: Apache/${FORCE_APACHE_VERSION} (PLD/Linux)" + fi + ac_IFS=$IFS IFS="- /. " diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x install-sh -x ltmain.sh -x php_config.h.in php-4.4.9.org/configure.in php-4.4.9.changed/configure.in --- php-4.4.9.org/configure.in 2013-10-07 13:35:57.586709445 +0200 +++ php-4.4.9.changed/configure.in 2013-10-07 13:34:26.551250929 +0200 @@ -1421,6 +1421,21 @@ X fi + if test "$PHP_SAPI" = "apache2handler" || test "$PHP_SAPI" = "apache2filter"; then + if test "$APACHE_VERSION" -ge 2004001; then + if test -z "$APACHE_THREADED_MPM"; then +cat <= 20060905 + return (char *) ap_get_server_banner(); +#else return (char *) ap_get_server_version(); +#endif } /* {{{ proto string apache_get_version(void) @@ -373,9 +373,13 @@ int n, max_requests; char *p; server_rec *serv = ((php_struct *) SG(server_context))->r->server; -#if !defined(WIN32) && !defined(WINNT) +#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; @@ -407,9 +407,13 @@ snprintf(tmp, sizeof(tmp), "%s:%u", serv->server_hostname, serv->port); php_info_print_table_row(2, "Hostname:Port", tmp); - -#if !defined(WIN32) && !defined(WINNT) + +#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