stas 2004/05/31 16:41:09
Modified: t/response/TestModperl post_utf8.pm
xs/APR/Bucket APR__Bucket.h
Log:
- bucket->read now sets the taint flag under -T
- fix the test to use Encode::decode to decode utf8 data (from bucket
read), utf8::decode() doesn't work under -T
Revision Changes Path
1.3 +4 -1 modperl-2.0/t/response/TestModperl/post_utf8.pm
Index: post_utf8.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/post_utf8.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- post_utf8.pm 30 Oct 2003 19:41:20 -0000 1.2
+++ post_utf8.pm 31 May 2004 23:41:09 -0000 1.3
@@ -34,7 +34,10 @@
have have_min_perl_version(5.008), have_perl('perlio');
my $received = ModPerl::Test::read_post($r) || "";
- utf8::decode($received); # assume that we know that it's utf8
+ # assume that we know that it's utf8
+ require Encode; # since 5.8.0
+ $received = Encode::decode('utf8', $received);
+ # utf8::decode() doesn't work under -T
my ($received_ascii, $received_utf8) = split /=/, $received;
ok t_cmp($expected_ascii, $received_ascii, "ascii");
1.8 +1 -3 modperl-2.0/xs/APR/Bucket/APR__Bucket.h
Index: APR__Bucket.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/Bucket/APR__Bucket.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- APR__Bucket.h 21 May 2004 18:35:23 -0000 1.7
+++ APR__Bucket.h 31 May 2004 23:41:09 -0000 1.8
@@ -54,9 +54,7 @@
buf = newSVpvn(str, len);
- /* XXX: must be on, but utf8::decode fails to parse it as UTF-8
- * flag in 5.8.4 if the input is utf8 */
- //SvTAINTED_on(buf);
+ SvTAINTED_on(buf);
return buf;
}
