kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

Merge branch 'master' of github.com:sinatra/sinatra

Browse source 
Conflicts:
	lib/sinatra/base.rb
This commit is contained in:
Konstantin Haase 2012-03-15 09:09:00 +01:00
commit 5ae2c5f168
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/sinatra/base.rb
View file

@ -1185,7 +1185,7 @@ module Sinatra
public_folder
end
private
private
# Condition for matching host name. Parameter might be String or Regexp.
def host_name(pattern)
condition { pattern === request.host }
@ -1347,7 +1347,7 @@ module Sinatra
end
# Run the Sinatra app as a self-hosted server using
# Thin, Mongrel or WEBrick (in that order). If given a block, will call
# Thin, Puma, Mongrel, or WEBrick (in that order). If given a block, will call
# with the constructed handler once we have taken the stage.
def run!(options={})
set options