X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Flive_engine_request_headers.t;h=9913ff30e2739099a3aebee7b214ab583bbe792b;hb=fcfe92b170baa438adf1ff92057ac007781d02b4;hp=551561e564c34e7e9a0172dcccd09b299aa9a604;hpb=ae29b412955743885e80350085167b54b69672da;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/live_engine_request_headers.t b/t/aggregate/live_engine_request_headers.t
index 551561e..9913ff3 100644
--- a/t/aggregate/live_engine_request_headers.t
+++ b/t/aggregate/live_engine_request_headers.t
@@ -1,12 +1,10 @@
-#!perl
-
 use strict;
 use warnings;
 
 use FindBin;
 use lib "$FindBin::Bin/../lib";
 
-use Test::More tests => 17;
+use Test::More tests => 18;
 use Catalyst::Test 'TestApp';
 
 use Catalyst::Request;
@@ -16,23 +14,25 @@ use HTTP::Request::Common;
 {
     my $creq;
 
-    my $request = GET( 'http://localhost/dump/request', 
+    my $request = GET( 'http://localhost/dump/request',
         'User-Agent'       => 'MyAgen/1.0',
         'X-Whats-Cool'     => 'Catalyst',
         'X-Multiple'       => [ 1 .. 5 ],
         'X-Forwarded-Host' => 'frontend.server.com',
         'X-Forwarded-For'  => '192.168.1.1, 1.2.3.4',
+        'X-Forwarded-Port' => 443
     );
- 
+
     ok( my $response = request($request), 'Request' );
     ok( $response->is_success, 'Response Successful 2xx' );
     is( $response->content_type, 'text/plain', 'Response Content-Type' );
     like( $response->content, qr/^bless\( .* 'Catalyst::Request' \)$/s, 'Content is a serialized Catalyst::Request' );
-    ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' );
+    ok( eval '$creq = ' . $response->content, 'Unserialize Catalyst::Request' ) or fail("Exception deseializing $@ from content " . $response->content);
     isa_ok( $creq, 'Catalyst::Request' );
+    ok( $creq->secure, 'Forwarded port sets secure' );
     isa_ok( $creq->headers, 'HTTP::Headers', 'Catalyst::Request->headers' );
     is( $creq->header('X-Whats-Cool'), $request->header('X-Whats-Cool'), 'Catalyst::Request->header X-Whats-Cool' );
-    
+
     { # Test that multiple headers are joined as per RFC 2616 4.2 and RFC 3875 4.1.18
 
         my $excpected = '1, 2, 3, 4, 5';
@@ -43,7 +43,7 @@ use HTTP::Request::Common;
 
     is( $creq->header('User-Agent'), $request->header('User-Agent'), 'Catalyst::Request->header User-Agent' );
 
-    my $host = sprintf( '%s:%d', $request->uri->host, $request->uri->port );
+    my $host = sprintf( '%s:%d', $request->header('X-Forwarded-Host'), $request->header('X-Forwarded-Port') );
     is( $creq->header('Host'), $host, 'Catalyst::Request->header Host' );
 
     SKIP:
@@ -51,7 +51,7 @@ use HTTP::Request::Common;
         if ( $ENV{CATALYST_SERVER} && $ENV{CATALYST_SERVER} !~ /127.0.0.1|localhost/ ) {
             skip "Using remote server", 2;
         }
-    
+
         is( $creq->base->host, 'frontend.server.com', 'Catalyst::Request proxied base' );
         is( $creq->address, '1.2.3.4', 'Catalyst::Request proxied address' );
     }