You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by jo...@apache.org on 2012/11/16 17:14:48 UTC

svn commit: r1410427 - in /perl/modperl/trunk: src/modules/perl/modperl_apache_compat.h xs/Apache2/ServerUtil/Apache2__ServerUtil.h

Author: jorton
Date: Fri Nov 16 16:14:47 2012
New Revision: 1410427

URL: http://svn.apache.org/viewvc?rev=1410427&view=rev
Log:
Fix use of unixd_conifg for 2.4.

Obtained from: branches/httpd24
Submitted by: torsten

Modified:
    perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h
    perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h

Modified: perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h?rev=1410427&r1=1410426&r2=1410427&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h Fri Nov 16 16:14:47 2012
@@ -93,6 +93,8 @@ AP_DECLARE(const char *) ap_get_server_v
 #define mp_loglevel(s) ((s)->loglevel)
 #define mp_module_index_
 
+#define ap_unixd_config unixd_config
+
 #endif
 
 #ifndef PROXYREQ_RESPONSE

Modified: perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h?rev=1410427&r1=1410426&r2=1410427&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h (original)
+++ perl/modperl/trunk/xs/Apache2/ServerUtil/Apache2__ServerUtil.h Fri Nov 16 16:14:47 2012
@@ -162,8 +162,8 @@ SV *mpxs_Apache2__ServerRec_get_handlers
 #define mpxs_Apache2__ServerUtil_server(classname) modperl_global_get_server_rec()
 
 #if !defined(OS2) && !defined(WIN32) && !defined(BEOS)  && !defined(NETWARE)
-#define mpxs_Apache2__ServerUtil_user_id(classname)  unixd_config.user_id
-#define mpxs_Apache2__ServerUtil_group_id(classname) unixd_config.group_id
+#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)  0
 #define mpxs_Apache2__ServerUtil_group_id(classname) 0