perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tors...@apache.org
Subject svn commit: r1062458 - in /perl/modperl/branches/threading: ./ Changes lib/ModPerl/Manifest.pm src/modules/perl/modperl_const.c src/modules/perl/modperl_perl.c src/modules/perl/modperl_perl.h t/apache/content_length_header.t
Date Sun, 23 Jan 2011 15:59:25 GMT
Author: torsten
Date: Sun Jan 23 15:59:25 2011
New Revision: 1062458

URL: http://svn.apache.org/viewvc?rev=1062458&view=rev
Log:
Merged revisions 1062311,1062443-1062444,1062448 via svnmerge from 
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk

........
  r1062311 | phred | 2011-01-23 03:22:25 +0100 (Sun, 23 Jan 2011) | 7 lines
  
  RT #48103
  https://rt.cpan.org/Ticket/Display.html?id=48103
  
  Reported by:  MARKLE@cpan.org
  Resolved by:  Fred Moyer
  Tested by:    Fred Moyer
........
  r1062443 | torsten | 2011-01-23 16:02:19 +0100 (Sun, 23 Jan 2011) | 3 lines
  
  With Perl 5.13.x using GvGP and GvSV as an lvalue has become invalid.
  See https://rt.cpan.org/Ticket/Display.html?id=64999
........
  r1062444 | torsten | 2011-01-23 16:03:01 +0100 (Sun, 23 Jan 2011) | 1 line
  
  forgot about Changes
........
  r1062448 | torsten | 2011-01-23 16:13:18 +0100 (Sun, 23 Jan 2011) | 1 line
  
  another 5.14 fix
........

Modified:
    perl/modperl/branches/threading/   (props changed)
    perl/modperl/branches/threading/Changes
    perl/modperl/branches/threading/lib/ModPerl/Manifest.pm   (contents, props changed)
    perl/modperl/branches/threading/src/modules/perl/modperl_const.c
    perl/modperl/branches/threading/src/modules/perl/modperl_perl.c
    perl/modperl/branches/threading/src/modules/perl/modperl_perl.h
    perl/modperl/branches/threading/t/apache/content_length_header.t

Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 23 15:59:25 2011
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448

Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jan 23 15:59:25 2011
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-1052502
+/perl/modperl/trunk:1-712967,712969-1062457

Modified: perl/modperl/branches/threading/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/Changes?rev=1062458&r1=1062457&r2=1062458&view=diff
==============================================================================
--- perl/modperl/branches/threading/Changes (original)
+++ perl/modperl/branches/threading/Changes Sun Jan 23 15:59:25 2011
@@ -10,7 +10,7 @@ Also refer to the Apache::Test changes l
 
 =over 3
 
-=item 2.0.5-threading1 (Rev 672738)
+=item 2.0.6-threading
 
 PerlInterpScope is now more advisory. Using $(c|r)->pnotes will bind
 the current interpreter to that object for it's lifetime.
@@ -29,7 +29,13 @@ via ModPerl::TiPool and modperl_tipool_c
 
 Expose modperl_interp_t via ModPerl::Interpreter [Torsten Foertsch]
 
-=item 2.0.5-dev
+=item 2.0.5-rc1
+
+Perpare modperl for the upcoming perl 5.14 [Torsten Foertsch]
+
+Add lib/ModPerl/MethodLookup.pm to MANIFEST via lib/ModPerl/Manifest.pm
+RT #48103 reported by MARKLE@cpan.org
+[Fred Moyer]
 
 PerlIOApache_write() now throws an APR::Error object, rather than just a string
 error, if modperl_wbucket_write() fails.

Modified: perl/modperl/branches/threading/lib/ModPerl/Manifest.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/lib/ModPerl/Manifest.pm?rev=1062458&r1=1062457&r2=1062458&view=diff
==============================================================================
--- perl/modperl/branches/threading/lib/ModPerl/Manifest.pm (original)
+++ perl/modperl/branches/threading/lib/ModPerl/Manifest.pm Sun Jan 23 15:59:25 2011
@@ -53,7 +53,7 @@ sub get_svn_files {
     }
 
     # files to add which aren't under svn
-    push @files, qw(lib/ModPerl/DummyVersions.pm);
+    push @files, qw(lib/ModPerl/DummyVersions.pm lib/ModPerl/MethodLookup.pm);
 
     return @files;
 }

Propchange: perl/modperl/branches/threading/lib/ModPerl/Manifest.pm
------------------------------------------------------------------------------
    show = BuildMM.pm

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_const.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_const.c?rev=1062458&r1=1062457&r2=1062458&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_const.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_const.c Sun Jan 23 15:59:25 2011
@@ -51,7 +51,7 @@ static void new_constsub(pTHX_ constants
             gv_init(alias, caller_stash, name, name_len, TRUE);
         }
 
-        GvCV(alias) = GvCV(*gvp);
+        GvCV_set(alias, GvCV(*gvp));
     }
 }
 

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_perl.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_perl.c?rev=1062458&r1=1062457&r2=1062458&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_perl.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_perl.c Sun Jan 23 15:59:25 2011
@@ -55,7 +55,7 @@ void modperl_perl_core_global_init(pTHX)
 
     while (cglobals->name) {
         GV *gv = gv_fetchpv(cglobals->core_name, TRUE, SVt_PVCV);
-        GvCV(gv) = get_cv(cglobals->sub_name, TRUE);
+        GvCV_set(gv, get_cv(cglobals->sub_name, TRUE));
         GvIMPORTED_CV_on(gv);
         cglobals++;
     }

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_perl.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_perl.h?rev=1062458&r1=1062457&r2=1062458&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_perl.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_perl.h Sun Jan 23 15:59:25 2011
@@ -47,6 +47,13 @@ void modperl_hash_seed_init(apr_pool_t *
 
 void modperl_hash_seed_set(pTHX);
 
+#ifndef GvCV_set
+#    define GvCV_set(gv, cv) (GvCV(gv)=(cv))
+#endif
+#ifndef GvGP_set
+#    define GvGP_set(gv, gp) (GvGP(gv)=(gp))
+#endif
+
 #endif /* MODPERL_PERL_H */
 
 /*

Modified: perl/modperl/branches/threading/t/apache/content_length_header.t
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/apache/content_length_header.t?rev=1062458&r1=1062457&r2=1062458&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/apache/content_length_header.t (original)
+++ perl/modperl/branches/threading/t/apache/content_length_header.t Sun Jan 23 15:59:25 2011
@@ -31,7 +31,7 @@ my $location = "/TestApache__content_len
 # are using HEAD requests in the wild
 #   http://bugzilla.mozilla.org/show_bug.cgi?id=245447
 
-foreach my $method qw(GET HEAD) {
+foreach my $method (qw(GET HEAD)) {
 
     no strict qw(refs);
 



Mime
View raw message