uri_unescape PATH_INFO

diff --git a/Changes b/Changes
index 9a86b34..30d3048 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,13 +1,16 @@
 This file documents the revision history for Perl extension HTTP::Request::AsCGI.
 
-0.6 2009-04-29
+0.7 2009-04-26
+    - PATH_INFO is now uri_unescaped
+
+0.6 2009-04-26
     - Fix long-standing 'enviroment' typo
     - Switch to Dist::Zilla
 
-0.5_03 2009-04-29
+0.5_03 2009-04-26
     - RT#18075: Play more nicely with Perl 5.6's open(). (hdp)
 
-0.5_02 2009-04-29
+0.5_02 2009-04-26
     - Avoid mixing buffered and unbuffered IO and flush STDIN after writing
       request content to it. (hdp)
 

diff --git a/dist.ini b/dist.ini
index 7e6a193..7d6861b 100644 (file)
--- a/dist.ini
+++ b/dist.ini
@@ -12,6 +12,7 @@ HTTP::Request = 0
 HTTP::Response = 1.53
 IO::File = 0
 Test::More = 0
+URI::Escape = 0
 
 [@Classic]
 

diff --git a/lib/HTTP/Request/AsCGI.pm b/lib/HTTP/Request/AsCGI.pm
index 4356c93..bd8e387 100644 (file)
--- a/lib/HTTP/Request/AsCGI.pm
+++ b/lib/HTTP/Request/AsCGI.pm
@@ -9,6 +9,7 @@ use Carp;
 use HTTP::Response;
 use IO::Handle;
 use IO::File;
+use URI::Escape ();
 
 __PACKAGE__->mk_accessors(qw[ environment request stdin stdout stderr ]);
 
@@ -49,7 +50,7 @@ sub new {
         GATEWAY_INTERFACE => 'CGI/1.1',
         HTTP_HOST         => $uri->host_port,
         HTTPS             => ( $uri->scheme eq 'https' ) ? 'ON' : 'OFF',  # not in RFC 3875
-        PATH_INFO         => $uri->path,
+        PATH_INFO         => URI::Escape::uri_unescape($uri->path),
         QUERY_STRING      => $uri->query || '',
         SCRIPT_NAME       => '/',
         SERVER_NAME       => $uri->host,

diff --git a/t/05env.t b/t/05env.t
index 209d61e..ca6719f 100644 (file)
--- a/t/05env.t
+++ b/t/05env.t
@@ -8,7 +8,7 @@ use warnings;
 use HTTP::Request;
 use HTTP::Request::AsCGI;
 
-my $r = HTTP::Request->new( GET => 'http://www.host.com/cgi-bin/script.cgi/my/path/?a=1&b=2', [ 'X-Test' => 'Test' ] );
+my $r = HTTP::Request->new( GET => 'http://www.host.com/cgi-bin/script.cgi/my%20path/?a=1&b=2', [ 'X-Test' => 'Test' ] );
 my %e = ( SCRIPT_NAME => '/cgi-bin/script.cgi' );
 my $c = HTTP::Request::AsCGI->new( $r, %e );
 $c->stdout(undef);
@@ -18,7 +18,7 @@ $c->setup;
 is( $ENV{GATEWAY_INTERFACE}, 'CGI/1.1', 'GATEWAY_INTERFACE' );
 is( $ENV{HTTP_HOST}, 'www.host.com:80', 'HTTP_HOST' );
 is( $ENV{HTTP_X_TEST}, 'Test', 'HTTP_X_TEST' );
-is( $ENV{PATH_INFO}, '/my/path/', 'PATH_INFO' );
+is( $ENV{PATH_INFO}, '/my path/', 'PATH_INFO' );
 is( $ENV{QUERY_STRING}, 'a=1&b=2', 'QUERY_STRING' );
 is( $ENV{SCRIPT_NAME}, '/cgi-bin/script.cgi', 'SCRIPT_NAME' );
 is( $ENV{REQUEST_METHOD}, 'GET', 'REQUEST_METHOD' );