Author: torsten
Date: Tue Sep 30 00:30:04 2008
New Revision: 700370
URL: http://svn.apache.org/viewvc?rev=700370&view=rev
Log:
Merged revisions 700369 via svnmerge from
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........
r700369 | torsten | 2008-09-30 09:28:54 +0200 (Tue, 30 Sep 2008) | 4 lines
Perl 5.8 and 5.10 differ in how they handle attempts to sysread into various
readonly variables. This change makes the test less rigid to take that into
account.
........
Modified:
perl/modperl/branches/threading/ (props changed)
perl/modperl/branches/threading/t/response/TestApache/read4.pm
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 30 00:30:04 2008
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 30 00:30:04 2008
@@ -1 +1 @@
-/perl/modperl/trunk:1-700359
+/perl/modperl/trunk:1-700369
Modified: perl/modperl/branches/threading/t/response/TestApache/read4.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestApache/read4.pm?rev=700370&r1=700369&r2=700370&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestApache/read4.pm (original)
+++ perl/modperl/branches/threading/t/response/TestApache/read4.pm Tue Sep 30
00:30:04 2008
@@ -19,12 +19,15 @@
"123456".("\0"x(1000-length("123456")))."bar",
"123f",
"23f\0\0o",
- qr/Can't coerce readonly REF to string in/,
+ qr/\bread-?only\b/,
$^V,
"ARo",
- qr/Modification of a read-only value attempted/,
+ qr/\bread-?only\b/,
".........",
- "\0\0ar",
+ # Reading into $1 (the test above) eats up input since perl
+ # 5.10. This was also the version that blessed $^V as a
+ # "version" object.
+ (ref $^V ? "\0\0ar" : "\0\0bar"),
"12",
"");
