scottmac Mon Jan 19 19:32:40 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache2handler php_functions.c
Log:
MFH Fix apache2handler under Apache 2.3.0-alpha
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6.2.5.2.10&r2=1.18.2.6.2.5.2.11&diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.10
php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.11
--- php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.10 Mon Jan
5 16:24:25 2009
+++ php-src/sapi/apache2handler/php_functions.c Mon Jan 19 19:32:40 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.18.2.6.2.5.2.10 2009/01/05 16:24:25 iliaa Exp $ */
+/* $Id: php_functions.c,v 1.18.2.6.2.5.2.11 2009/01/19 19:32:40 scottmac Exp $
*/
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -372,8 +372,12 @@
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_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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
