fixed typo in error structure

mojolicious · May 29, 2014 · d2a4eb5 · d2a4eb5
1 parent 3c74b0e
commit d2a4eb5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/lib/Mojo/Message.pm b/lib/Mojo/Message.pm
@@ -174,7 +174,7 @@ sub parse {
 
   # Check buffer size
   return $self->error(
-    {message => 'Maximum buffer size exceeded', advise => 400})
+    {message => 'Maximum buffer size exceeded', advice => 400})
     if $self->content->is_limit_exceeded;
 
   return $self->emit('progress')->content->is_finished ? $self->finish : $self;
@@ -249,7 +249,7 @@ sub _cache {
 sub _limit {
   my ($self, $msg, $code) = @_;
   $self->{limit} = 1;
-  $self->error({message => $msg, advise => $code});
+  $self->error({message => $msg, advice => $code});
 }
 
 sub _parse_formdata {
@@ -491,7 +491,7 @@ make sure it is not excessively large, there's a 10MB limit by default.
 =head2 error
 
   my $err = $msg->error;
-  $msg    = $msg->error({message => 'Parser error', advise => 500});
+  $msg    = $msg->error({message => 'Parser error', advice => 500});
 
 Message error.
 

diff --git a/lib/Mojo/Message/Request.pm b/lib/Mojo/Message/Request.pm
@@ -61,7 +61,7 @@ sub extract_start_line {
   return undef unless $$bufref =~ s/^\s*(.*?)\x0d?\x0a//;
 
   # We have a (hopefully) full request line
-  $self->error({message => 'Bad request start line', advise => 400})
+  $self->error({message => 'Bad request start line', advice => 400})
     and return undef
     unless $1 =~ $START_LINE_RE;
   my $url = $self->method($1)->version($3)->url;

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -113,7 +113,7 @@ sub dispatch {
   my $res = $tx->res;
   return if $res->code;
   my $err = $tx->req->error;
-  if (my $code = $err->{advise}) { $res->code($code) }
+  if ($err && (my $code = $err->{advice})) { $res->code($code) }
   elsif ($tx->is_websocket) { $res->code(426) }
   $c->render_not_found unless $self->routes->dispatch($c) || $tx->res->code;
 }

diff --git a/t/mojo/request.t b/t/mojo/request.t
@@ -71,7 +71,7 @@ $req = Mojo::Message::Request->new;
 $req->parse("12345\x0d\x0a");
 ok $req->is_finished, 'request is finished';
 is $req->error->{message}, 'Bad request start line', 'right error';
-is $req->error->{advise}, 400, 'right advise';
+is $req->error->{advice}, 400, 'right advice';
 
 # Parse broken HTTP 1.1 message with header exceeding line limit
 $req = Mojo::Message::Request->new;
@@ -339,12 +339,12 @@ is $req->headers->content_length, undef,        'no "Content-Length" value';
   $req->parse('GET /foo/bar/baz.html HTTP/1');
   ok $req->is_finished, 'request is finished';
   is $req->error->{message}, 'Maximum line size exceeded', 'right error';
-  is $req->error->{advise}, 431, 'right advise';
+  is $req->error->{advice}, 431, 'right advice';
   ok $req->is_limit_exceeded, 'limit is exceeded';
   ok $limit, 'limit is exceeded';
   $req->error({message => 'Nothing important.'});
   is $req->error->{message}, 'Nothing important.', 'right error';
-  is $req->error->{advise}, undef, 'no advise';
+  is $req->error->{advice}, undef, 'no advice';
   ok $req->is_limit_exceeded, 'limit is still exceeded';
 }
 
@@ -357,7 +357,7 @@ is $req->headers->content_length, undef,        'no "Content-Length" value';
   $req->parse("Content-Type: text/plain\x0d\x0a");
   ok $req->is_finished, 'request is finished';
   is $req->error->{message}, 'Maximum line size exceeded', 'right error';
-  is $req->error->{advise}, 431, 'right advise';
+  is $req->error->{advice}, 431, 'right advice';
   ok $req->is_limit_exceeded, 'limit is exceeded';
 }
 
@@ -371,7 +371,7 @@ is $req->headers->content_length, undef,        'no "Content-Length" value';
   $req->parse('GET /foo/bar/baz.html HTTP/1');
   ok $req->is_finished, 'request is finished';
   is $req->error->{message}, 'Maximum message size exceeded', 'right error';
-  is $req->error->{advise}, 413, 'right advise';
+  is $req->error->{advice}, 413, 'right advice';
   ok $req->is_limit_exceeded, 'limit is exceeded';
   ok $limit, 'limit is exceeded';
 }
@@ -384,7 +384,7 @@ is $req->headers->content_length, undef,        'no "Content-Length" value';
   $req->parse("Content-Type: text/plain\x0d\x0a");
   ok $req->is_finished, 'request is finished';
   is $req->error->{message}, 'Maximum message size exceeded', 'right error';
-  is $req->error->{advise}, 413, 'right advise';
+  is $req->error->{advice}, 413, 'right advice';
   ok $req->is_limit_exceeded, 'limit is exceeded';
 }
 
@@ -398,7 +398,7 @@ is $req->headers->content_length, undef,        'no "Content-Length" value';
   $req->parse('Hello World!');
   ok $req->is_finished, 'request is finished';
   is $req->error->{message}, 'Maximum message size exceeded', 'right error';
-  is $req->error->{advise}, 413, 'right advise';
+  is $req->error->{advice}, 413, 'right advice';
   ok $req->is_limit_exceeded, 'limit is exceeded';
 }
 

diff --git a/t/mojo/response.t b/t/mojo/response.t
@@ -346,7 +346,7 @@ is $res->headers->content_length, undef, 'right "Content-Length" value';
   ok $res->is_finished, 'response is finished';
   ok $res->content->is_finished, 'content is finished';
   is $res->error->{message}, 'Maximum buffer size exceeded', 'right error';
-  is $res->error->{advise}, 400, 'right advise';
+  is $res->error->{advice}, 400, 'right advice';
   is $res->code,    200,   'right status';
   is $res->message, 'OK',  'right message';
   is $res->version, '1.1', 'right version';
@@ -368,7 +368,7 @@ is $res->headers->content_length, undef, 'right "Content-Length" value';
   ok $res->is_finished, 'response is finished';
   ok $res->content->is_finished, 'content is finished';
   is $res->error->{message}, 'Maximum buffer size exceeded', 'right error';
-  is $res->error->{advise}, 400, 'right advise';
+  is $res->error->{advice}, 400, 'right advice';
   is $res->code,    200,   'right status';
   is $res->message, 'OK',  'right message';
   is $res->version, '1.1', 'right version';
@@ -392,7 +392,7 @@ is $res->headers->content_length, undef, 'right "Content-Length" value';
   ok $res->is_finished, 'response is finished';
   ok $res->content->is_finished, 'content is finished';
   is $res->error->{message}, 'Maximum buffer size exceeded', 'right error';
-  is $res->error->{advise}, 400, 'right advise';
+  is $res->error->{advice}, 400, 'right advice';
   is $res->code,    200,   'right status';
   is $res->message, 'OK',  'right message';
   is $res->version, '1.1', 'right version';

diff --git a/t/mojo/user_agent.t b/t/mojo/user_agent.t
@@ -314,7 +314,7 @@ $ua->once(
 $tx = $ua->get('/echo' => 'Hello World!');
 ok !$tx->success, 'not successful';
 is $tx->error->{message}, 'Maximum message size exceeded', 'right error';
-is $tx->error->{advise},  413,                             'right advise';
+is $tx->error->{advice},  413,                             'right advice';
 is $tx->error->{code},    undef,                           'no status';
 ok $tx->res->is_limit_exceeded, 'limit is exceeded';