Author: stevehay
Date: Tue Mar 12 09:49:59 2013
New Revision: 1455469
URL: http://svn.apache.org/r1455469
Log:
Apply patch from RT 79977 to fix breakage caused by removal of PL_uid et al
from perl 5.16.0.
Not tested by committer (running on Windows, where the code is unused anyway),
but the same thing has already been done for trunk (mod_perl 2) in revision
1344224.
Modified:
perl/modperl/branches/1.x/Changes
perl/modperl/branches/1.x/src/modules/perl/perl_util.c
Modified: perl/modperl/branches/1.x/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/1.x/Changes?rev=1455469&r1=1455468&r2=1455469&view=diff
==============================================================================
--- perl/modperl/branches/1.x/Changes (original)
+++ perl/modperl/branches/1.x/Changes Tue Mar 12 09:49:59 2013
@@ -10,6 +10,10 @@ all changes without author attribution a
=item 1.32-dev
+Fix breakage caused by removal of PL_uid et al from perl 5.16.0. Patch from
+RT 79977.
+[Andreas Koenig <andreas.koenig.7os6v...@franz.ak.mind.de>]
+
Post RT 64999 typo spot in CvGV macro
[Salvador Ortiz Garcia <s...@msg.com.mx>]
Modified: perl/modperl/branches/1.x/src/modules/perl/perl_util.c
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/1.x/src/modules/perl/perl_util.c?rev=1455469&r1=1455468&r2=1455469&view=diff
==============================================================================
--- perl/modperl/branches/1.x/src/modules/perl/perl_util.c (original)
+++ perl/modperl/branches/1.x/src/modules/perl/perl_util.c Tue Mar 12 09:49:59
2013
@@ -670,6 +670,7 @@ void mod_perl_init_ids(void) /* $$, $>,
if(set_ids++) return;
sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), (I32)getpid());
#ifndef WIN32
+#if (PERL_REVISION == 5) && (PERL_VERSION <= 15)
uid = (int)getuid();
euid = (int)geteuid();
gid = (int)getgid();
@@ -678,6 +679,7 @@ void mod_perl_init_ids(void) /* $$, $>,
"perl_init_ids: uid=%d, euid=%d, gid=%d, egid=%d\n",
uid, euid, gid, egid));
#endif
+#endif
}
int perl_eval_ok(server_rec *s)
