mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
no filter on freebsd
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@837 19e92222-5c0b-0410-8929-a290d50e31e9
This commit is contained in:
parent
056ee5dcd0
commit
49b01fa4b9
2 changed files with 6 additions and 14 deletions
4
Rakefile
4
Rakefile
|
@ -192,8 +192,8 @@ namespace :site do
|
||||||
FileList["**/*.tgz"].each {|tgz| mv tgz, "pkg/tars" }
|
FileList["**/*.tgz"].each {|tgz| mv tgz, "pkg/tars" }
|
||||||
|
|
||||||
# XXX Hack, because only Luis can package for Win32 right now
|
# XXX Hack, because only Luis can package for Win32 right now
|
||||||
sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/"
|
# sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/"
|
||||||
sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/"
|
# sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/"
|
||||||
sh "rm -rf pkg/mongrel*"
|
sh "rm -rf pkg/mongrel*"
|
||||||
sh "gem generate_index -d pkg"
|
sh "gem generate_index -d pkg"
|
||||||
sh "scp -r CHANGELOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/"
|
sh "scp -r CHANGELOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/"
|
||||||
|
|
|
@ -243,18 +243,10 @@ module Mongrel
|
||||||
|
|
||||||
def configure_socket_options
|
def configure_socket_options
|
||||||
case RUBY_PLATFORM
|
case RUBY_PLATFORM
|
||||||
when /linux/
|
when /linux/
|
||||||
# 9 is currently TCP_DEFER_ACCEPT
|
# 9 is currently TCP_DEFER_ACCEPT
|
||||||
$tcp_defer_accept_opts = [Socket::SOL_TCP, 9, 1]
|
$tcp_defer_accept_opts = [Socket::SOL_TCP, 9, 1]
|
||||||
$tcp_cork_opts = [Socket::SOL_TCP, 3, 1]
|
$tcp_cork_opts = [Socket::SOL_TCP, 3, 1]
|
||||||
when /freebsd(([1-4]\..{1,2})|5\.[0-4])/
|
|
||||||
# Do nothing, just closing a bug when freebsd <= 5.4
|
|
||||||
when /freebsd/
|
|
||||||
# Use the HTTP accept filter if available.
|
|
||||||
# The struct made by pack() is defined in /usr/include/sys/socket.h as accept_filter_arg
|
|
||||||
unless `/sbin/sysctl -nq net.inet.accf.http`.empty?
|
|
||||||
$tcp_defer_accept_opts = [Socket::SOL_SOCKET, Socket::SO_ACCEPTFILTER, ['httpready', nil].pack('a16a240')]
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue