diff options
-rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
-rw-r--r-- | lib/unicorn/configurator.rb | 2 | ||||
-rw-r--r-- | lib/unicorn/http_server.rb | 2 | ||||
-rw-r--r-- | lib/unicorn/socket_helper.rb | 2 | ||||
-rw-r--r-- | unicorn.gemspec | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 0811c7f..a05e26a 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -DEF_VER = "v5.3.1" +DEF_VER = "v5.3.0" CONSTANT = "Unicorn::Const::UNICORN_VERSION" RVF = "lib/unicorn/version.rb" GVF = "GIT-VERSION-FILE" diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb index 7fb9030..f34d38b 100644 --- a/lib/unicorn/configurator.rb +++ b/lib/unicorn/configurator.rb @@ -587,7 +587,7 @@ class Unicorn::Configurator # just let chdir raise errors path = File.expand_path(path) if config_file && - config_file[0] != ?/ && + ! config_file.start_with?('/') && ! File.readable?("#{path}/#{config_file}") raise ArgumentError, "config_file=#{config_file} would not be accessible in" \ diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index 3827f2e..f33aa25 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -148,7 +148,7 @@ class Unicorn::HttpServer def listeners=(listeners) cur_names, dead_names = [], [] listener_names.each do |name| - if ?/ == name[0] + if name.start_with?('/') # mark unlinked sockets as dead so we can rebind them (File.socket?(name) ? cur_names : dead_names) << name else diff --git a/lib/unicorn/socket_helper.rb b/lib/unicorn/socket_helper.rb index f52dde2..9e672d9 100644 --- a/lib/unicorn/socket_helper.rb +++ b/lib/unicorn/socket_helper.rb @@ -116,7 +116,7 @@ module Unicorn def bind_listen(address = '0.0.0.0:8080', opt = {}) return address unless String === address - sock = if address[0] == ?/ + sock = if address.start_with?('/') if File.exist?(address) if File.socket?(address) begin diff --git a/unicorn.gemspec b/unicorn.gemspec index 2e104f7..74483a2 100644 --- a/unicorn.gemspec +++ b/unicorn.gemspec @@ -11,7 +11,7 @@ end.compact Gem::Specification.new do |s| s.name = %q{unicorn} - s.version = (ENV['VERSION'] || '5.3.1').dup + s.version = (ENV['VERSION'] || '5.3.0').dup s.authors = ['unicorn hackers'] s.summary = 'Rack HTTP server for fast clients and Unix' s.description = File.read('README').split("\n\n")[1] |