[Jifty-commit] jifty branch, plack-rebased, updated. 1d42aeef424ebdd07a13c300c15357d1b3bfc4c9

[Jifty commits]

The branch, plack-rebased has been updated
       via  1d42aeef424ebdd07a13c300c15357d1b3bfc4c9 (commit)
      from  737e9ce93105b2cb830ec26f4d264800a4fed50f (commit)

Summary of changes:
 lib/Jifty/Dispatcher.pm |    2 +-
 lib/Jifty/Request.pm    |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 1d42aeef424ebdd07a13c300c15357d1b3bfc4c9
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Sun Feb 7 12:18:56 2010 +0800

    Deprecated request_method.

diff --git a/lib/Jifty/Dispatcher.pm b/lib/Jifty/Dispatcher.pm
index 0627db1..078c8e8 100644
--- a/lib/Jifty/Dispatcher.pm
+++ b/lib/Jifty/Dispatcher.pm
@@ -957,7 +957,7 @@ came in with that method.
 
 sub _match_method {
     my ( $self, $method ) = @_;
-    #$self->log->debug("Matching method ".request->request_method." against ".$method);
+    #$self->log->debug("Matching method ".Jifty->web->request->method." against ".$method);
     $Request->method eq uc($method);
 }
 
diff --git a/lib/Jifty/Request.pm b/lib/Jifty/Request.pm
index 25e51a9..5fed154 100644
--- a/lib/Jifty/Request.pm
+++ b/lib/Jifty/Request.pm
@@ -26,6 +26,7 @@ sub address     { $_[0]->env->{REMOTE_ADDR} }
 sub remote_host { $_[0]->env->{REMOTE_HOST} }
 sub protocol    { $_[0]->env->{SERVER_PROTOCOL} }
 sub method      { $_[0]->env->{REQUEST_METHOD} = $_[1] if @_ > 1; $_[0]->env->{REQUEST_METHOD} }
+sub request_method { Carp::carp "request_method is deprecated, use method instead"; goto \&method }
 sub port        { $_[0]->env->{SERVER_PORT} }
 sub user        { $_[0]->env->{REMOTE_USER} }
 sub request_uri { $_[0]->env->{REQUEST_URI} }

-----------------------------------------------------------------------