diff options
Diffstat (limited to 'lib/unicorn')
-rw-r--r-- | lib/unicorn/configurator.rb | 24 | ||||
-rw-r--r-- | lib/unicorn/http_server.rb | 4 | ||||
-rw-r--r-- | lib/unicorn/socket_helper.rb | 8 | ||||
-rw-r--r-- | lib/unicorn/util.rb | 2 | ||||
-rw-r--r-- | lib/unicorn/worker.rb | 4 |
5 files changed, 18 insertions, 24 deletions
diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb index 02f6b6b..4da19bb 100644 --- a/lib/unicorn/configurator.rb +++ b/lib/unicorn/configurator.rb @@ -1,7 +1,7 @@ # -*- encoding: binary -*- require 'logger' -# Implements a simple DSL for configuring a \Unicorn server. +# Implements a simple DSL for configuring a unicorn server. # # See http://unicorn.bogomips.org/examples/unicorn.conf.rb and # http://unicorn.bogomips.org/examples/unicorn.conf.minimal.rb @@ -282,20 +282,19 @@ class Unicorn::Configurator # Setting this to +true+ can make streaming responses in Rails 3.1 # appear more quickly at the cost of slightly higher bandwidth usage. # The effect of this option is most visible if nginx is not used, - # but nginx remains highly recommended with \Unicorn. + # but nginx remains highly recommended with unicorn. # # This has no effect on UNIX sockets. # - # Default: +true+ (Nagle's algorithm disabled) in \Unicorn, - # +true+ in Rainbows! This defaulted to +false+ in \Unicorn - # 3.x + # Default: +true+ (Nagle's algorithm disabled) in unicorn + # This defaulted to +false+ in unicorn 3.x # # [:tcp_nopush => true or false] # # Enables/disables TCP_CORK in Linux or TCP_NOPUSH in FreeBSD # # This prevents partial TCP frames from being sent out and reduces - # wakeups in nginx if it is on a different machine. Since \Unicorn + # wakeups in nginx if it is on a different machine. Since unicorn # is only designed for applications that send the response body # quickly without keepalive, sockets will always be flushed on close # to prevent delays. @@ -303,7 +302,7 @@ class Unicorn::Configurator # This has no effect on UNIX sockets. # # Default: +false+ - # This defaulted to +true+ in \Unicorn 3.4 - 3.7 + # This defaulted to +true+ in unicorn 3.4 - 3.7 # # [:ipv6only => true or false] # @@ -387,12 +386,10 @@ class Unicorn::Configurator # and +false+ or +nil+ is synonymous for a value of zero. # # A value of +1+ is a good optimization for local networks - # and trusted clients. For Rainbows! and Zbatery users, a higher - # value (e.g. +60+) provides more protection against some - # denial-of-service attacks. There is no good reason to ever - # disable this with a +zero+ value when serving HTTP. + # and trusted clients. There is no good reason to ever + # disable this with a +zero+ value with unicorn. # - # Default: 1 retransmit for \Unicorn, 60 for Rainbows! 0.95.0\+ + # Default: 1 # # [:accept_filter => String] # @@ -401,8 +398,7 @@ class Unicorn::Configurator # This enables either the "dataready" or (default) "httpready" # accept() filter under FreeBSD. This is intended as an # optimization to reduce context switches with common GET/HEAD - # requests. For Rainbows! and Zbatery users, this provides - # some protection against certain denial-of-service attacks, too. + # requests. # # There is no good reason to change from the default. # diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index 0f97516..3dbfd3e 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -7,8 +7,8 @@ # # Users do not need to know the internals of this class, but reading the # {source}[http://bogomips.org/unicorn.git/tree/lib/unicorn/http_server.rb] -# is education for programmers wishing to learn how \Unicorn works. -# See Unicorn::Configurator for information on how to configure \Unicorn. +# is education for programmers wishing to learn how unicorn works. +# See Unicorn::Configurator for information on how to configure unicorn. class Unicorn::HttpServer # :stopdoc: attr_accessor :app, :timeout, :worker_processes, diff --git a/lib/unicorn/socket_helper.rb b/lib/unicorn/socket_helper.rb index 812ac53..df8315e 100644 --- a/lib/unicorn/socket_helper.rb +++ b/lib/unicorn/socket_helper.rb @@ -5,14 +5,12 @@ require 'socket' module Unicorn module SocketHelper - # internal interface, only used by Rainbows!/Zbatery + # internal interface DEFAULTS = { # The semantics for TCP_DEFER_ACCEPT changed in Linux 2.6.32+ # with commit d1b99ba41d6c5aa1ed2fc634323449dd656899e9 - # This change shouldn't affect Unicorn users behind nginx (a - # value of 1 remains an optimization), but Rainbows! users may - # want to use a higher value on Linux 2.6.32+ to protect against - # denial-of-service attacks + # This change shouldn't affect unicorn users behind nginx (a + # value of 1 remains an optimization). :tcp_defer_accept => 1, # FreeBSD, we need to override this to 'dataready' if we diff --git a/lib/unicorn/util.rb b/lib/unicorn/util.rb index c7784bd..2f8bfeb 100644 --- a/lib/unicorn/util.rb +++ b/lib/unicorn/util.rb @@ -1,7 +1,7 @@ # -*- encoding: binary -*- require 'fcntl' -module Unicorn::Util +module Unicorn::Util # :nodoc: # :stopdoc: def self.is_log?(fp) diff --git a/lib/unicorn/worker.rb b/lib/unicorn/worker.rb index b3f8afe..6748a2f 100644 --- a/lib/unicorn/worker.rb +++ b/lib/unicorn/worker.rb @@ -3,8 +3,8 @@ require "raindrops" # This class and its members can be considered a stable interface # and will not change in a backwards-incompatible fashion between -# releases of \Unicorn. Knowledge of this class is generally not -# not needed for most users of \Unicorn. +# releases of unicorn. Knowledge of this class is generally not +# not needed for most users of unicorn. # # Some users may want to access it in the before_fork/after_fork hooks. # See the Unicorn::Configurator RDoc for examples. |