Return-Path: X-Original-To: apmail-perl-dev-archive@www.apache.org Delivered-To: apmail-perl-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4AF0F7B26 for ; Thu, 28 Jul 2011 04:07:31 +0000 (UTC) Received: (qmail 7702 invoked by uid 500); 28 Jul 2011 04:07:29 -0000 Delivered-To: apmail-perl-dev-archive@perl.apache.org Received: (qmail 7685 invoked by uid 500); 28 Jul 2011 04:07:27 -0000 Mailing-List: contact dev-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@perl.apache.org Received: (qmail 7677 invoked by uid 99); 28 Jul 2011 04:07:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jul 2011 04:07:26 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [74.125.83.53] (HELO mail-gw0-f53.google.com) (74.125.83.53) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jul 2011 04:07:20 +0000 Received: by gwj20 with SMTP id 20so1844057gwj.26 for ; Wed, 27 Jul 2011 21:06:59 -0700 (PDT) MIME-Version: 1.0 Received: by 10.91.19.2 with SMTP id w2mr463112agi.54.1311826019089; Wed, 27 Jul 2011 21:06:59 -0700 (PDT) Received: by 10.147.82.17 with HTTP; Wed, 27 Jul 2011 21:06:58 -0700 (PDT) In-Reply-To: <20110727191503.9B83C2388894@eris.apache.org> References: <20110727191503.9B83C2388894@eris.apache.org> Date: Wed, 27 Jul 2011 21:06:58 -0700 Message-ID: Subject: Fwd: svn commit: r1151596 - in /perl/modperl/branches/1.x: Changes Symbol/Symbol.xs src/modules/perl/Constants.xs src/modules/perl/Log.xs src/modules/perl/mod_perl.c src/modules/perl/mod_perl.h src/modules/perl/perl_config.c From: Fred Moyer To: mod_perl Dev Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable I committed the 5.14 compatibility patch today. We have enough changes for a 1.32 release... ---------- Forwarded message ---------- From: Date: Wed, Jul 27, 2011 at 12:15 PM Subject: svn commit: r1151596 - in /perl/modperl/branches/1.x: Changes Symbol/Symbol.xs src/modules/perl/Constants.xs src/modules/perl/Log.xs src/modules/perl/mod_perl.c src/modules/perl/mod_perl.h src/modules/perl/perl_config.c To: modperl-cvs@perl.apache.org Author: phred Date: Wed Jul 27 19:15:01 2011 New Revision: 1151596 URL: http://svn.apache.org/viewvc?rev=3D1151596&view=3Drev Log: RT 64999 perl 5.14 compatibility, GvCV and GvGP lvalue changes in perl core Reported by: Dave Mitchell Fixed by: sendwade@hotmail.com Tested by: Perrin Harkins, Fred Moyer Modified: =A0 =A0perl/modperl/branches/1.x/Changes =A0 =A0perl/modperl/branches/1.x/Symbol/Symbol.xs =A0 =A0perl/modperl/branches/1.x/src/modules/perl/Constants.xs =A0 =A0perl/modperl/branches/1.x/src/modules/perl/Log.xs =A0 =A0perl/modperl/branches/1.x/src/modules/perl/mod_perl.c =A0 =A0perl/modperl/branches/1.x/src/modules/perl/mod_perl.h =A0 =A0perl/modperl/branches/1.x/src/modules/perl/perl_config.c Modified: perl/modperl/branches/1.x/Changes URL: http://svn.apache.org/viewvc/perl/modperl/branches/1.x/Changes?rev=3D1= 151596&r1=3D1151595&r2=3D1151596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- perl/modperl/branches/1.x/Changes (original) +++ perl/modperl/branches/1.x/Changes Wed Jul 27 19:15:01 2011 @@ -10,8 +10,11 @@ all changes without author attribution a =A0=3Ditem 1.32-dev +RT 64999, perl 5.14 compatibility, GvCV and GvGP lvalue changes in perl co= re +[] + =A0RT 40918, fix issue with sigils in perl binary path -[Slave Rezic ] +[Slaven Rezic ] =A0Work around a gcc optimization specific bug which =A0cuased seg faults on FreeBSD 7.x during mod_perl startup. Modified: perl/modperl/branches/1.x/Symbol/Symbol.xs URL: http://svn.apache.org/viewvc/perl/modperl/branches/1.x/Symbol/Symbol.x= s?rev=3D1151596&r1=3D1151595&r2=3D1151596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- perl/modperl/branches/1.x/Symbol/Symbol.xs (original) +++ perl/modperl/branches/1.x/Symbol/Symbol.xs Wed Jul 27 19:15:01 2011 @@ -30,7 +30,7 @@ static void undef(SV *ref) =A0 =A0 =A0 =A0 =A0 =A0has_proto =3D TRUE; =A0 =A0 =A0 =A0cv_undef(cv); - =A0 =A0 =A0 CvGV(cv) =3D gv; =A0 /* let user-undef'd sub keep its identit= y */ + =A0 =A0 =A0 =A0CvGV_set(cv, gv); /* let user-undef'd sub keep its identit= y */ =A0 =A0 =A0 =A0 if(has_proto) =A0 =A0 =A0 =A0 =A0 =A0 SvPOK_on(cv); /* otherwise we get `Prototype mismat= ch:' */ Modified: perl/modperl/branches/1.x/src/modules/perl/Constants.xs URL: http://svn.apache.org/viewvc/perl/modperl/branches/1.x/src/modules/per= l/Constants.xs?rev=3D1151596&r1=3D1151595&r2=3D1151596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- perl/modperl/branches/1.x/src/modules/perl/Constants.xs (original) +++ perl/modperl/branches/1.x/src/modules/perl/Constants.xs Wed Jul 27 19:15:01 2011 @@ -20,7 +20,7 @@ static void export_cv(SV *pclass, SV *ca =A0 =A0 =A0 =A0 =A0 =A0SvPVX(caller), sub, SvPVX(pclass), sub); =A0#endif =A0 =A0 gv =3D gv_fetchpv(form("%_::%s", caller, sub), TRUE, SVt_PVCV); - =A0 =A0GvCV(gv) =3D perl_get_cv(form("%_::%s", pclass, sub), TRUE); + =A0 =A0GvCV_set(gv, perl_get_cv(form("%_::%s", pclass, sub), TRUE)); =A0 =A0 GvIMPORTED_CV_on(gv); =A0} Modified: perl/modperl/branches/1.x/src/modules/perl/Log.xs URL: http://svn.apache.org/viewvc/perl/modperl/branches/1.x/src/modules/per= l/Log.xs?rev=3D1151596&r1=3D1151595&r2=3D1151596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- perl/modperl/branches/1.x/src/modules/perl/Log.xs (original) +++ perl/modperl/branches/1.x/src/modules/perl/Log.xs Wed Jul 27 19:15:01 2= 011 @@ -10,7 +10,7 @@ =A0static void perl_cv_alias(char *to, char *from) =A0{ =A0 =A0 GV *gp =3D gv_fetchpv(to, TRUE, SVt_PVCV); - =A0 =A0GvCV(gp) =3D perl_get_cv(from, TRUE); + =A0 =A0GvCV_set(gp, perl_get_cv(from, TRUE)); =A0} =A0static void ApacheLog(int level, SV *sv, SV *msg) Modified: perl/modperl/branches/1.x/src/modules/perl/mod_perl.c URL: http://svn.apache.org/viewvc/perl/modperl/branches/1.x/src/modules/per= l/mod_perl.c?rev=3D1151596&r1=3D1151595&r2=3D1151596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- perl/modperl/branches/1.x/src/modules/perl/mod_perl.c (original) +++ perl/modperl/branches/1.x/src/modules/perl/mod_perl.c Wed Jul 27 19:15:01 2011 @@ -791,8 +791,8 @@ void perl_startup (server_rec *s, pool * =A0 =A0 /* *CORE::GLOBAL::exit =3D \&Apache::exit */ =A0 =A0 if(gv_stashpv("CORE::GLOBAL", FALSE)) { =A0 =A0 =A0 =A0GV *exitgp =3D gv_fetchpv("CORE::GLOBAL::exit", TRUE, SVt_PV= CV); - =A0 =A0 =A0 GvCV(exitgp) =3D perl_get_cv("Apache::exit", TRUE); - =A0 =A0 =A0 GvIMPORTED_CV_on(exitgp); + =A0 =A0 =A0 GvCV_set(exitgp, perl_get_cv("Apache::exit", TRUE)); + =A0 =A0 =A0 GvIMPORTED_CV_on(exitgp); =A0 =A0 } =A0 =A0 ENTER_SAFE(s,p); Modified: perl/modperl/branches/1.x/src/modules/perl/mod_perl.h URL: http://svn.apache.org/viewvc/perl/modperl/branches/1.x/src/modules/per= l/mod_perl.h?rev=3D1151596&r1=3D1151595&r2=3D1151596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- perl/modperl/branches/1.x/src/modules/perl/mod_perl.h (original) +++ perl/modperl/branches/1.x/src/modules/perl/mod_perl.h Wed Jul 27 19:15:01 2011 @@ -1026,6 +1026,14 @@ else { \ =A0#define PERL_HEADER_PARSER_CREATE(s) =A0#endif +#ifndef GvCV_set +#define GvCV_set(gv, cv) (GvCV(gv) =3D (cv)) +#endif + +#ifndef GvCV_set +#define CvGV_set(gv, cv) (CvVG(gv) =3D (cv)) +#endif + =A0typedef struct { =A0 =A0 array_header *PerlPassEnv; =A0 =A0 array_header *PerlRequire; Modified: perl/modperl/branches/1.x/src/modules/perl/perl_config.c URL: http://svn.apache.org/viewvc/perl/modperl/branches/1.x/src/modules/per= l/perl_config.c?rev=3D1151596&r1=3D1151595&r2=3D1151596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- perl/modperl/branches/1.x/src/modules/perl/perl_config.c (original) +++ perl/modperl/branches/1.x/src/modules/perl/perl_config.c Wed Jul 27 19:15:01 2011 @@ -1720,7 +1720,7 @@ void perl_clear_symtab(HV *symtab) =A0 =A0 =A0 =A0if((cv =3D GvCV((GV*)val)) && (GvSTASH((GV*)val) =3D=3D GvST= ASH(CvGV(cv)))) { =A0 =A0 =A0 =A0 =A0 =A0 GV *gv =3D CvGV(cv); =A0 =A0 =A0 =A0 =A0 =A0 cv_undef(cv); - =A0 =A0 =A0 =A0 =A0 =A0CvGV(cv) =3D gv; + =A0 =A0 =A0 =A0 =A0 =A0CvGV_set(cv, gv); =A0 =A0 =A0 =A0 =A0 =A0 GvCVGEN(gv) =3D 1; /* invalidate method cache */ =A0 =A0 =A0 =A0 } =A0 =A0 } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org For additional commands, e-mail: dev-help@perl.apache.org