Skip to content
This repository has been archived by the owner on Apr 26, 2022. It is now read-only.

Commit

Permalink
Fixes uninitialized constant Rack::Timeout::Error
Browse files Browse the repository at this point in the history
grosser#5

In an application where I'm using this gem, I'm also using the
rack-timeout gem (https://github.com/kch/rack-timeout), so use of
Timeout inside the Rack::OpenID class was finding Rack::Timeout,
which is not the same. This commit updates references to Timeout to
use the root namespace (::Timeout).

Conflicts:
	lib/rack/openid.rb
  • Loading branch information
jeffcarbs authored and Simeon F. Willbanks committed Sep 24, 2014
1 parent bc97b65 commit 4b6d195
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/rack/openid.rb
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def begin_authentication(env, qs)
add_oauth_fields(oidreq, params)
url = open_id_redirect_url(req, oidreq, params["trust_root"], params["return_to"], params["method"], immediate)
return redirect_to(url)
rescue ::OpenID::OpenIDError, Timeout::Error => e
rescue ::OpenID::OpenIDError, ::Timeout::Error => e
env[RESPONSE] = MissingResponse.new
return @app.call(env)
end
Expand Down Expand Up @@ -270,7 +270,7 @@ def default_store

def timeout_protection_from_identity_server
yield
rescue Timeout::Error
rescue ::Timeout::Error
TimeoutResponse.new
end
end
Expand Down

0 comments on commit 4b6d195

Please sign in to comment.