- another piece of apache 2.4 support

diff --git a/php-apache24.patch b/php-apache24.patch
index 068b9a1f26ec4d53596c6ff843b4fe7ae48c9522..78f6dd3a588edf2d6218966b4b2fdd5c32f6c18f 100644 (file)
--- a/php-apache24.patch
+++ b/php-apache24.patch
@@ -138,3 +138,38 @@ index 2f2084c..d09e165 100644
  IFS="- /.
  "
 
+commit 390ccd899d73101ad5ddcfc46074a6c83ec178e8
+Author: Scott MacVicar <scottmac@php.net>
+Date:   Mon Jan 19 19:32:40 2009 +0000
+
+    MFH Fix apache2handler under Apache 2.3.0-alpha
+
+diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
+index 45f7ac3..3b9321a 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
+