only WebSocket handshakes have redirects

mojolicious · Jul 31, 2013 · 3ca79dc · 3ca79dc
1 parent b25c38e
commit 3ca79dc
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 29 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,6 @@
 
 4.23  2013-07-31
-  - Added redirects method to Mojo::Transaction.
+  - Added redirects method to Mojo::Transaction::HTTP.
 
 4.22  2013-07-30
   - Improved Mojo::Server to use FindBin more defensively.

diff --git a/lib/Mojo/Headers.pm b/lib/Mojo/Headers.pm
@@ -454,6 +454,7 @@ Shortcut for the C<Location> header.
 
 Return a list of all currently defined headers.
 
+  # Names of all headers
   say for @{$headers->names};
 
 =head2 origin

diff --git a/lib/Mojo/Transaction.pm b/lib/Mojo/Transaction.pm
@@ -5,7 +5,7 @@ use Carp 'croak';
 use Mojo::Message::Request;
 use Mojo::Message::Response;
 
-has [qw(kept_alive local_address local_port previous remote_port)];
+has [qw(kept_alive local_address local_port remote_port)];
 has req => sub { Mojo::Message::Request->new };
 has res => sub { Mojo::Message::Response->new };
 
@@ -38,13 +38,6 @@ sub is_websocket {undef}
 
 sub is_writing { (shift->{state} // 'write') eq 'write' }
 
-sub redirects {
-  my $previous = shift;
-  my @redirects;
-  unshift @redirects, $previous while $previous = $previous->previous;
-  return \@redirects;
-}
-
 sub remote_address {
   my $self = shift;
 
@@ -157,16 +150,6 @@ Local interface address.
 
 Local interface port.
 
-=head2 previous
-
-  my $previous = $tx->previous;
-  $tx          = $tx->previous(Mojo::Transaction->new);
-
-Previous transaction that triggered this followup transaction.
-
-  # Path of previous request
-  say $tx->previous->req->url->path;
-
 =head2 remote_port
 
   my $port = $tx->remote_port;
@@ -251,15 +234,6 @@ Check if transaction is writing.
 
 Resume transaction.
 
-=head2 redirects
-
-  my $redirects = $tx->redirects;
-
-Return a list of all previous transactions that preceded this followup
-transaction.
-
-  say $_->req->url for @{$tx->redirects};
-
 =head2 remote_address
 
   my $address = $tx->remote_address;

diff --git a/lib/Mojo/Transaction/HTTP.pm b/lib/Mojo/Transaction/HTTP.pm
@@ -3,6 +3,8 @@ use Mojo::Base 'Mojo::Transaction';
 
 use Mojo::Transaction::WebSocket;
 
+has 'previous';
+
 sub client_read {
   my ($self, $chunk) = @_;
 
@@ -40,6 +42,13 @@ sub keep_alive {
   return !($req->version eq '1.0' || $res->version eq '1.0');
 }
 
+sub redirects {
+  my $previous = shift;
+  my @redirects;
+  unshift @redirects, $previous while $previous = $previous->previous;
+  return \@redirects;
+}
+
 sub server_read {
   my ($self, $chunk) = @_;
 
@@ -247,7 +256,18 @@ object.
 
 =head1 ATTRIBUTES
 
-L<Mojo::Transaction::HTTP> inherits all attributes from L<Mojo::Transaction>.
+L<Mojo::Transaction::HTTP> inherits all attributes from L<Mojo::Transaction>
+and implements the following new ones.
+
+=head2 previous
+
+  my $previous = $tx->previous;
+  $tx          = $tx->previous(Mojo::Transaction->new);
+
+Previous transaction that triggered this followup transaction.
+
+  # Path of previous request
+  say $tx->previous->req->url->path;
 
 =head1 METHODS
 
@@ -278,6 +298,16 @@ Check transaction for C<HEAD> request and C<1xx>, C<204> or C<304> response.
 
 Check if connection can be kept alive.
 
+=head2 redirects
+
+  my $redirects = $tx->redirects;
+
+Return a list of all previous transactions that preceded this followup
+transaction.
+
+  # Paths of all previous requests
+  say $_->req->url->path for @{$tx->redirects};
+
 =head2 server_read
 
   $tx->server_read($bytes);