4 files changed, 46 insertions, 0 deletions
diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb
index ede6264..f942e2f 100644
--- a/lib/unicorn/http_server.rb
+++ b/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)
diff --git a/lib/unicorn/ssl_client.rb b/lib/unicorn/ssl_client.rb
index 7b41cd2..a8c79e3 100644
--- a/lib/unicorn/ssl_client.rb
+++ b/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
diff --git a/t/detach.ru b/t/detach.ru
new file mode 100644
index 0000000..bbd998e
--- /dev/null
+++ b/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 ] ]
+}
diff --git a/t/t0021-process_detach.sh b/t/t0021-process_detach.sh
new file mode 100755
index 0000000..f03c497
--- /dev/null
+++ b/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