unicorn 4.2.1 → 4.3.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v4.2.1.GIT
+DEF_VER=v4.3.0.GIT
 
 LF='
 '

data/PHILOSOPHY

@@ -64,7 +64,7 @@ from the effects of slow I/O.
 By acting as a buffer to shield unicorn from slow I/O, a reverse proxy
 will inevitably incur overhead in the form of extra data copies.
 However, as I/O within a local network is fast (and faster still
-with local sockets), this overhead is neglible for the vast majority
+with local sockets), this overhead is negligible for the vast majority
 of HTTP requests and responses.
 
 The ideal reverse proxy complements the weaknesses of unicorn.
@@ -86,7 +86,7 @@ A reverse proxy for unicorn should meet the following requirements:
    In many (most?) cases, network devices and their interrupts are
    only be handled by one CPU at a time.  It should avoid contention
    within the system by serializing all network I/O into one (or few)
-   userspace procceses.  Network I/O is not a CPU-intensive task and
+   userspace processes.  Network I/O is not a CPU-intensive task and
    it is not helpful to use multiple CPU cores (at least not for GigE).
 
 4. It should efficiently manage persistent connections (and

data/TUNING

@@ -52,7 +52,7 @@ See Unicorn::Configurator for details on the config file format.
   and may also thrash CPU caches, cancelling out performance gains
   one would normally expect.
 
-* UNIX domain sockets are slighly faster than TCP sockets, but only
+* UNIX domain sockets are slightly faster than TCP sockets, but only
   work if nginx is on the same machine.
 
 == Other \Unicorn settings

data/ext/unicorn_http/global_variables.h

@@ -62,9 +62,9 @@ NORETURN(static void parser_raise(VALUE klass, const char *));
 /* Defines the maximum allowed lengths for various input elements.*/
 DEF_MAX_LENGTH(FIELD_NAME, 256);
 DEF_MAX_LENGTH(FIELD_VALUE, 80 * 1024);
-DEF_MAX_LENGTH(REQUEST_URI, 1024 * 12);
+DEF_MAX_LENGTH(REQUEST_URI, 1024 * 15);
 DEF_MAX_LENGTH(FRAGMENT, 1024); /* Don't know if this length is specified somewhere or not */
-DEF_MAX_LENGTH(REQUEST_PATH, 1024);
+DEF_MAX_LENGTH(REQUEST_PATH, 4096); /* common PATH_MAX on modern systems */
 DEF_MAX_LENGTH(QUERY_STRING, (1024 * 10));
 
 static void init_globals(void)

data/lib/unicorn/const.rb

@@ -8,7 +8,7 @@
 # improve things much compared to constants.
 module Unicorn::Const
 
-  UNICORN_VERSION = "4.2.1"
+  UNICORN_VERSION = "4.3.0"
 
   # default TCP listen host address (0.0.0.0, all interfaces)
   DEFAULT_HOST = "0.0.0.0"

data/lib/unicorn/http_server.rb

@@ -536,6 +536,7 @@ class Unicorn::HttpServer
     end
     @request.headers? or headers = nil
     http_response_write(client, status, headers, body)
+    client.shutdown # in case of fork() in Rack app
     client.close # flush and uncork socket immediately, no keepalive
   rescue => e
     handle_error(client, e)

data/lib/unicorn/ssl_client.rb

@@ -3,4 +3,9 @@
 class Unicorn::SSLClient < Kgio::SSL
   alias write kgio_write
   alias close kgio_close
+
+  # this is no-op for now, to be fixed in kgio-monkey if people care
+  # about SSL support...
+  def shutdown(how = nil)
+  end
 end

data/lib/unicorn/worker.rb

@@ -63,13 +63,13 @@ class Unicorn::Worker
   # Changes the worker process to the specified +user+ and +group+
   # This is only intended to be called from within the worker
   # process from the +after_fork+ hook.  This should be called in
-  # the +after_fork+ hook after any priviledged functions need to be
+  # the +after_fork+ hook after any privileged functions need to be
   # run (e.g. to set per-worker CPU affinity, niceness, etc)
   #
   # Any and all errors raised within this method will be propagated
   # directly back to the caller (usually the +after_fork+ hook.
   # These errors commonly include ArgumentError for specifying an
-  # invalid user/group and Errno::EPERM for insufficient priviledges
+  # invalid user/group and Errno::EPERM for insufficient privileges
   def user(user, group = nil)
     # we do not protect the caller, checking Process.euid == 0 is
     # insufficient because modern systems have fine-grained

data/t/detach.ru

@@ -0,0 +1,11 @@
+use Rack::ContentType, "text/plain"
+fifo_path = ENV["TEST_FIFO"] or abort "TEST_FIFO not set"
+run lambda { |env|
+  pid = fork do
+    File.open(fifo_path, "wb") do |fp|
+      fp.write "HIHI"
+    end
+  end
+  Process.detach(pid)
+  [ 200, {}, [ pid.to_s ] ]
+}

data/t/sslgen.sh

@@ -36,13 +36,13 @@ ca_certinfo () {
 	echo unicorn@bogomips.org
 }
 
-openssl genrsa -out ca.key 512
+openssl genrsa -out ca.key 1024
 ca_certinfo | openssl req -new -x509 -days 666 -key ca.key -out ca.crt
 
-openssl genrsa -out bad-ca.key 512
+openssl genrsa -out bad-ca.key 1024
 ca_certinfo | openssl req -new -x509 -days 666 -key bad-ca.key -out bad-ca.crt
 
-openssl genrsa -out server.key 512
+openssl genrsa -out server.key 1024
 certinfo2 | openssl req -new -key server.key -out server.csr
 
 openssl x509 -req -days 666 \
@@ -50,7 +50,7 @@ openssl x509 -req -days 666 \
 n=2
 mk_client_cert () {
 	CLIENT=$1
-	openssl genrsa -out $CLIENT.key 512
+	openssl genrsa -out $CLIENT.key 1024
 	certinfo2 | openssl req -new -key $CLIENT.key -out $CLIENT.csr
 
 	openssl x509 -req -days 666 \

data/t/t0021-process_detach.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+. ./test-lib.sh
+
+t_plan 5 "Process.detach on forked background process works"
+
+t_begin "setup and startup" && {
+	t_fifos process_detach
+	unicorn_setup
+	TEST_FIFO=$process_detach \
+	  unicorn -E none -D detach.ru -c $unicorn_config
+	unicorn_wait_start
+}
+
+t_begin "read detached PID with HTTP/1.0" && {
+	detached_pid=$(curl -0 -sSf http://$listen/)
+	t_info "detached_pid=$detached_pid"
+}
+
+t_begin "read background FIFO" && {
+	test xHIHI = x"$(cat $process_detach)"
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_begin "check stderr" && check_stderr
+
+t_done

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 4
-  - 2
-  - 1
-  version: 4.2.1
+  - 3
+  - 0
+  version: 4.3.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 Z
+date: 2012-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -223,6 +223,7 @@ files:
 - t/bin/unused_listen
 - t/bin/utee
 - t/broken-app.ru
+- t/detach.ru
 - t/env.ru
 - t/heartbeat-timeout.ru
 - t/my-tap-lib.sh
@@ -290,6 +291,7 @@ files:
 - t/t0018-write-on-close.sh
 - t/t0019-max_header_len.sh
 - t/t0020-at_exit-handler.sh
+- t/t0021-process_detach.sh
 - t/t0100-rack-input-tests.sh
 - t/t0116-client_body_buffer_size.sh
 - t/t0116.ru
@@ -421,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongrel
-rubygems_version: 1.8.21
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Rack HTTP server for fast clients and Unix