apache-mod_perl/0015-unixd_config-renamed-to-ap_unixd_config.patch

31 lines
1.3 KiB
Diff

From 7b3c626470ad4ed907ef7581d7c9af805f18d1dd Mon Sep 17 00:00:00 2001
From: Jan Kaluza <hanzz.k@gmail.com>
Date: Mon, 4 Jun 2012 13:14:52 +0200
Subject: [PATCH 15/28] unixd_config renamed to ap_unixd_config
---
xs/Apache2/ServerUtil/Apache2__ServerUtil.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h b/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
index e222c1b..f000502 100644
--- a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
+++ b/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
@@ -162,8 +162,13 @@ SV *mpxs_Apache2__ServerRec_get_handlers(pTHX_ server_rec *s,
#define mpxs_Apache2__ServerUtil_server(classname) modperl_global_get_server_rec()
#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#if AP_SERVER_MAJORVERSION_NUMBER >= 2 && AP_SERVER_MINORVERSION_NUMBER >= 4
+#define mpxs_Apache2__ServerUtil_user_id(classname) ap_unixd_config.user_id
+#define mpxs_Apache2__ServerUtil_group_id(classname) ap_unixd_config.group_id
+#else
#define mpxs_Apache2__ServerUtil_user_id(classname) unixd_config.user_id
#define mpxs_Apache2__ServerUtil_group_id(classname) unixd_config.group_id
+#endif
#else
#define mpxs_Apache2__ServerUtil_user_id(classname) 0
#define mpxs_Apache2__ServerUtil_group_id(classname) 0
--
1.7.11.4