about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-12-10 05:45:14 +0800
committerEric Wong <normalperson@yhbt.net>2010-12-10 06:27:48 +0800
commit39f264173717287eda70910e7a24fbafd21a4a7e (patch)
tree3488f1b088cd8860fad5bd992a61e02a17e1b515
parent71716672752e573ff15002aaefd6e8ba8c6b6cb6 (diff)
This release enables tuning the client_buffer_body_size to raise
or lower the threshold for buffering request bodies to disk.
This only applies to users who have not disabled rewindable
input.  There is also a TeeInput bugfix for uncommon usage
patterns and Configurator examples in the FAQ should be fixed
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--lib/unicorn/configurator.rb2
-rw-r--r--lib/unicorn/const.rb7
3 files changed, 7 insertions, 4 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e4e68c5..861c86f 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v3.0.1.GIT
+DEF_VER=v3.1.0.GIT
 
 LF='
 '
diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb
index a044e5d..d522c54 100644
--- a/lib/unicorn/configurator.rb
+++ b/lib/unicorn/configurator.rb
@@ -388,6 +388,8 @@ class Unicorn::Configurator
 
   # The maximum size (in +bytes+) to buffer in memory before
   # resorting to a temporary file.  Default is 112 kilobytes.
+  # This option has no effect if "rewindable_input" is set to
+  # +false+.
   def client_body_buffer_size(bytes)
     set_int(:client_body_buffer_size, bytes, 0)
   end
diff --git a/lib/unicorn/const.rb b/lib/unicorn/const.rb
index 6bccdbc..2010e9d 100644
--- a/lib/unicorn/const.rb
+++ b/lib/unicorn/const.rb
@@ -7,8 +7,8 @@
 # improve things much compared to constants.
 module Unicorn::Const
 
-  # The current version of Unicorn, currently 3.0.1
-  UNICORN_VERSION = "3.0.1"
+  # The current version of Unicorn, currently 3.1.0
+  UNICORN_VERSION = "3.1.0"
 
   # default TCP listen host address (0.0.0.0, all interfaces)
   DEFAULT_HOST = "0.0.0.0"
@@ -23,7 +23,8 @@ module Unicorn::Const
   CHUNK_SIZE = 16 * 1024
 
   # Maximum request body size before it is moved out of memory and into a
-  # temporary file for reading (112 kilobytes).
+  # temporary file for reading (112 kilobytes).  This is the default
+  # value of of client_body_buffer_size.
   MAX_BODY = 1024 * 112
 
   # :stopdoc: