commit 04a6c4d9d2a008994fd885daf4c1ab23a9ca0c31
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Nov 14 20:51:12 2013 +0100
- another piece of apache 2.4 support
php-apache24.patch | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
---
diff --git a/php-apache24.patch b/php-apache24.patch
index 068b9a1..78f6dd3 100644
--- a/php-apache24.patch
+++ b/php-apache24.patch
@@ -138,3 +138,38 @@ index 2f2084c..d09e165 100644
IFS="- /.
"
+commit 390ccd899d73101ad5ddcfc46074a6c83ec178e8
+Author: Scott MacVicar <[email protected]>
+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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/04a6c4d9d2a008994fd885daf4c1ab23a9ca0c31
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
