@@ -117,31 +117,28 @@ class CGI {
# RAKUDO: This could also be rewritten as a single .subst :g call.
# ...when the semantics of .subst is revised to change $/,
# that is.
- # PARROT BUG: TT #752
- # (https://trac.parrot.org/parrot/ticket/752)
- # otherwise the solution is just .subst with a call to decode_urle...
- my $buff = '';
- my $more = 0;
- my @chars;
- for $string.comb -> $c {
- if $c eq '%' { $buff ~= $c ; $more=2 ; next }
- if $more { $buff ~= $c ; $more-- ; next }
- if $buff { @chars.push: decode_urlencoded_utf8($buff); $buff='' }
- @chars.push: $c;
+ # The percent_hack can be removed once the bug is fixed and :g is
+ # added
+ while $string ~~ / ( [ '%' <[0..9A..F]>**2 ]+ ) / {
+ $string .= subst( ~$0,
+ percent_hack_start( decode_urlencoded_utf8( ~$0 ) ) );
}
- @chars.push: decode_urlencoded_utf8($buff) if $buff;
-
- # This is the evil hack, we can't join our decoded chars, we have to
- # write them to a file so they all get the same encoding and charset
- my $file_name = '/tmp/friggin_decode_problem';
- my $fh = open($file_name, :w);
- $fh.print(@chars);
- $fh.close;
- return slurp( $file_name );
+ return percent_hack_end( $string );
+ }
+
+ sub percent_hack_start($str is rw) {
+ if $str ~~ '%' {
+ $str = '___PERCENT_HACK___';
+ }
+ return $str;
+ }
+
+ sub percent_hack_end($str) {
+ return $str.subst('___PERCENT_HACK___', '%', :g);
}
sub decode_urlencoded_utf8($str) {
- my @returns = ();
+ my $r = '';
my @chars = map { :16($_) }, $str.split('%').grep({$^w});
while @chars {
my $bytes = 1;
@@ -153,10 +150,9 @@ class CGI {
}
my @shift = (^$bytes).reverse.map(**6);
my @mask = $mask, 0x3F xx $bytes-1;
- @returns.push:
- chr( [+] @chars.splice(0,$bytes) »+&« @mask »+<« @shift );
+ $r ~= chr( [+] @chars.splice(0,$bytes) »+&« @mask »+<« @shift );
}
- return @returns;
+ return $r;
}
method add_param ( Str $key, $value ) {
lib/CGI.pm
@@ -4,17 +4,28 @@ use Test;
use CGI;
my @t =
- '%61' => 'a',
- '%C3%A5' => 'å',
- '%C4%AC' => 'Ĭ',
- '%C7%82' => 'ǂ',
- '%E2%98%BA' => '☺',
- '%E2%98%BB' => '☻';
+ '%61' => 'a',
+ '%C3%A5' => 'å',
+ '%C4%AC' => 'Ĭ',
+ '%C7%82' => 'ǂ',
+ '%E2%98%BA' => '☺',
+ '%E2%98%BB' => '☻',
+ 'alla+snubbar' => 'alla snubbar',
+ 'text%61+abc' => 'texta abc',
+ 'unicode+%C7%82%C3%A5' => 'unicode ǂå',
+ '%25' => '%',
+ '%25+25' => '% 25',
+ '%25rr' => '%rr',
+ '%2561' => '%61',
+ ;
plan +@t;
for @t {
- ok( CGI::decode_urlencoded_utf8( .key ) eq .value, 'Decoding ' ~ .key );
+ my $ans = CGI::unescape( ~.key );
+ ok( $ans eq .value, 'Decoding ' ~ .key )
+ or say "GOT: {$ans.perl}\nEXPECTED: {.value.perl}";
+
}
# vim: ft=perl6
t/cgi/03-urlencoded.t
3be6afd61e505a25998b4afa6f6ec4dae945d2f0
Johan Viklund
johan.viklund@gmail.com
http://github.com/viklund/november/commit/e5984250deb4079b267ef458ff6b4d156beb7727
e5984250deb4079b267ef458ff6b4d156beb7727
2009-06-28T10:27:27-07:00
2009-06-28T10:27:27-07:00
Removed workaround for Parrot TT #752
d0bceb0b14b53498e0cf33f374728a59fc830396
Johan Viklund
johan.viklund@gmail.com