unicorn 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad413ab1a47428cacfbcae82684d4cbe36e77d33
-  data.tar.gz: 752c0ca2043e8e5e05558a7eb515b53f5e3107d0
+  metadata.gz: 75575863e5a09d4ac351269084628052c8ec554c
+  data.tar.gz: 5f7fc37e895b8982c3076fc56642ec90d8632d46
 SHA512:
-  metadata.gz: 7ca49a70bdc5a632797db82b10f30af7b3b4db10f856ef81b275d4e5b939454191aaae1883d0bb83129c7a95d3a697faec6e51ae2438ba5588f70ee6d04b73e7
-  data.tar.gz: d28bc86a89d0ebb29ecaec72f363e6c0991ab71e22c4ed43d44b9e6b8cc8c8b03939de84c005a91b8473d833cf691f42cb2c3684f5ac1d1c91c4af87c7f78fad
+  metadata.gz: 85c7d9f5d6c3056508758a7375809d477ee7e640167470711e4fda53e7f6c52ea6688e708fde80af5e54262dcdd218c0ef9fc966221c1e30762b0bdabf5c41fb
+  data.tar.gz: 1829ab9e474b1932617c97e37d6efa1075c1c147f8aa726777478741b5ae9106a163194647e03ff8d73786017dd2142afad8804d16625fde48876e10dc0e3a30

data/.olddoc.yml

@@ -1,8 +1,8 @@
 ---
-cgit_url: http://bogomips.org/unicorn.git
+cgit_url: https://bogomips.org/unicorn.git
 git_url: git://bogomips.org/unicorn.git
-rdoc_url: http://unicorn.bogomips.org/
-ml_url: http://bogomips.org/unicorn-public/
+rdoc_url: https://bogomips.org/unicorn/
+ml_url: https://bogomips.org/unicorn-public/
 merge_html:
   unicorn_1: Documentation/unicorn.1.html
   unicorn_rails_1: Documentation/unicorn_rails.1.html

data/Documentation/unicorn.1.txt

@@ -181,7 +181,7 @@ the unicorn config file.
 * [Rack RDoc][2]
 * [Rackup HowTo][3]
 
-[1]: http://unicorn.bogomips.org/
+[1]: https://bogomips.org/unicorn/
 [2]: http://www.rubydoc.info/github/rack/rack/
 [3]: https://github.com/rack/rack/wiki/tutorial-rackup-howto
-[4]: http://unicorn.bogomips.org/SIGNALS.html
+[4]: https://bogomips.org/unicorn/SIGNALS.html

data/Documentation/unicorn_rails.1.txt

@@ -169,7 +169,7 @@ used by Unicorn.
 * [Rack RDoc][2]
 * [Rackup HowTo][3]
 
-[1]: http://unicorn.bogomips.org/
+[1]: https://bogomips.org/unicorn/
 [2]: http://www.rubydoc.info/github/rack/rack/
 [3]: https://github.com/rack/rack/wiki/tutorial-rackup-howto
-[4]: http://unicorn.bogomips.org/SIGNALS.html
+[4]: https://bogomips.org/unicorn/SIGNALS.html

data/FAQ

@@ -7,7 +7,7 @@ drained entirely by the application.  This may happen when request
 bodies are gzipped, as unicorn reads request body data lazily to avoid
 overhead from bad requests.
 
-Ref: http://mid.gmane.org/FC91211E-FD32-432C-92FC-0318714C2170@zendesk.com
+Ref: https://bogomips.org/unicorn-public/FC91211E-FD32-432C-92FC-0318714C2170@zendesk.com/
 
 === Why aren't my Rails log files rotated when I use SIGUSR1?
 

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 5.1.0
+GIT_VERSION = 5.2.0

data/GIT-VERSION-GEN

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-DEF_VER = "v5.1.0"
+DEF_VER = "v5.2.0"
 CONSTANT = "Unicorn::Const::UNICORN_VERSION"
 RVF = "lib/unicorn/version.rb"
 GVF = "GIT-VERSION-FILE"

data/GNUmakefile

@@ -183,13 +183,13 @@ doc: .document $(ext)/unicorn_http.c man html .olddoc.yml $(PLACEHOLDERS)
 	install -m644 $(man1_paths) doc/
 	tar cf - $$(git ls-files examples/) | (cd doc && tar xf -)
 
-# publishes docs to http://unicorn.bogomips.org
+# publishes docs to https://bogomips.org/unicorn/
 publish_doc:
 	-git set-file-times
 	$(MAKE) doc
 	$(MAKE) doc_gz
 	chmod 644 $$(find doc -type f)
-	$(RSYNC) -av doc/ unicorn.bogomips.org:/srv/unicorn/
+	$(RSYNC) -av doc/ bogomips.org:/srv/bogomips/unicorn/
 	git ls-files | xargs touch
 
 # Create gzip variants of the same timestamp as the original so nginx
@@ -219,7 +219,7 @@ fix-perms:
 gem: $(pkggem)
 
 install-gem: $(pkggem)
-	gem install $(CURDIR)/$<
+	gem install --local $(CURDIR)/$<
 
 $(pkggem): .manifest fix-perms
 	gem build $(rfpackage).gemspec

data/HACKING

@@ -57,7 +57,7 @@ Please wrap documentation at 72 characters-per-line or less (long URLs
 are exempt) so it is comfortably readable from terminals.
 
 When referencing mailing list posts, use
-<tt>http://bogomips.org/unicorn-public/$MESSAGE_ID/</tt> if possible
+<tt>https://bogomips.org/unicorn-public/$MESSAGE_ID/</tt> if possible
 since the Message-ID remains searchable even if a particular site
 becomes unavailable.
 

data/ISSUES

@@ -2,8 +2,8 @@
 
 mailto:unicorn-public@bogomips.org is the best place to report bugs,
 submit patches and/or obtain support after you have searched the
-{email archives}[http://bogomips.org/unicorn-public/] and
-{documentation}[http://unicorn.bogomips.org/].
+{email archives}[https://bogomips.org/unicorn-public/] and
+{documentation}[https://bogomips.org/unicorn/].
 
 * No subscription will ever be required to email us
 * Cc: all participants in a thread or commit, as subscription is optional
@@ -12,7 +12,7 @@ submit patches and/or obtain support after you have searched the
 * Do not send HTML mail or images, it will be flagged as spam
 * Anonymous and pseudonymous messages will always be welcome.
 * The email submission port (587) is enabled on the bogomips.org MX:
-  http://bogomips.org/unicorn-public/20141004232241.GA23908@dcvr.yhbt.net/t/
+  https://bogomips.org/unicorn-public/20141004232241.GA23908@dcvr.yhbt.net/t/
 
 If your issue is of a sensitive nature or you're just shy in public,
 then feel free to email us privately at mailto:unicorn@bogomips.org
@@ -67,7 +67,7 @@ document distributed with git) on guidelines for patch submission.
 * private: mailto:unicorn@bogomips.org
 * nntp://news.gmane.org/gmane.comp.lang.ruby.unicorn.general
 * nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn
-* http://bogomips.org/unicorn-public/
+* https://bogomips.org/unicorn-public/
 
 Mailing list subscription is optional, so Cc: all participants.
 
@@ -78,9 +78,9 @@ You can follow along via NNTP:
 
 Or Atom feeds:
 
-	http://bogomips.org/unicorn-public/new.atom
+	https://bogomips.org/unicorn-public/new.atom
 
-	The HTML archives at http://bogomips.org/unicorn-public/
+	The HTML archives at https://bogomips.org/unicorn-public/
 	also has links to per-thread Atom feeds and downloadable
 	mboxes.
 

data/KNOWN_ISSUES

@@ -9,7 +9,7 @@ acceptable solution.  Those issues are documented here.
   handlers.
 
 * Issues with FreeBSD jails can be worked around as documented by Tatsuya Ono:
-  http://mid.gmane.org/CAHBuKRj09FdxAgzsefJWotexw-7JYZGJMtgUp_dhjPz9VbKD6Q@mail.gmail.com
+  https://bogomips.org/unicorn-public/CAHBuKRj09FdxAgzsefJWotexw-7JYZGJMtgUp_dhjPz9VbKD6Q@mail.gmail.com/
 
 * PRNGs (pseudo-random number generators) loaded before forking
   (e.g. "preload_app true") may need to have their internal state
@@ -60,7 +60,7 @@ acceptable solution.  Those issues are documented here.
   application to use Rails 2.3.2 and you have no other choice, then
   you may edit your unicorn gemspec and remove the Rack dependency.
 
-  ref: http://mid.gmane.org/20091014221552.GA30624@dcvr.yhbt.net
+  ref: https://bogomips.org/unicorn-public/20091014221552.GA30624@dcvr.yhbt.net/
   Note: the workaround described in the article above only made
   the issue more subtle and we didn't notice them immediately.
 

data/Links

@@ -26,7 +26,7 @@ or services behind them.
 * {raindrops}[http://raindrops.bogomips.org/] - real-time stats for
   preforking Rack servers
 
-* {UnXF}[http://bogomips.org/unxf/]  Un-X-Forward* the Rack environment,
+* {UnXF}[https://bogomips.org/unxf/]  Un-X-Forward* the Rack environment,
   useful since unicorn is designed to be deployed behind a reverse proxy.
 
 === unicorn is written to work with
@@ -52,5 +52,5 @@ or services behind them.
 * {Mongrel}[http://rubygems.org/gems/mongrel] - the awesome webserver
   unicorn is based on
 
-* {david}[http://bogomips.org/david.git] - a tool to explain why you need
+* {david}[https://bogomips.org/david.git] - a tool to explain why you need
   nginx in front of unicorn

data/README

@@ -82,7 +82,7 @@ You can get the latest source via git from the following locations
 
 You may browse the code from the web:
 
-* http://bogomips.org/unicorn.git
+* https://bogomips.org/unicorn.git
 * http://repo.or.cz/w/unicorn.git (gitweb)
 
 See the HACKING guide on how to contribute and build prerelease gems
@@ -128,7 +128,7 @@ All feedback (bug reports, user/development dicussion, patches, pull
 requests) go to the mailing list/newsgroup.  See the ISSUES document for
 information on the {mailing list}[mailto:unicorn-public@bogomips.org].
 
-The mailing list is archived at http://bogomips.org/unicorn-public/
+The mailing list is archived at https://bogomips.org/unicorn-public/
 Read-only NNTP access is available at:
 nntp://news.public-inbox.org/inbox.comp.lang.ruby.unicorn and
 nntp://news.gmane.org/gmane.comp.lang.ruby.unicorn.general

data/SIGNALS

@@ -8,7 +8,7 @@ should be possible to easily share process management scripts between
 Unicorn and nginx.
 
 One example init script is distributed with unicorn:
-http://unicorn.bogomips.org/examples/init.sh
+https://bogomips.org/unicorn/examples/init.sh
 
 === Master Process
 

data/Sandbox

@@ -34,7 +34,7 @@ is the primary issue with sandboxing tools such as Bundler and Isolate.
 If you're bundling unicorn, use "bundle exec unicorn" (or "bundle exec
 unicorn_rails") to start unicorn with the correct environment variables
 
-ref: http://mid.gmane.org/9ECF07C4-5216-47BE-961D-AFC0F0C82060@internetfamo.us
+ref: https://bogomips.org/unicorn-public/9ECF07C4-5216-47BE-961D-AFC0F0C82060@internetfamo.us/
 
 Otherwise (if you choose to not sandbox your unicorn installation), we
 expect the tips for Isolate (below) apply, too.
@@ -43,7 +43,8 @@ expect the tips for Isolate (below) apply, too.
 
 This is no longer be an issue as of bundler 0.9.17
 
-ref: http://mid.gmane.org/8FC34B23-5994-41CC-B5AF-7198EF06909E@tramchase.com
+ref:
+https://bogomips.org/unicorn-public/8FC34B23-5994-41CC-B5AF-7198EF06909E@tramchase.com/
 
 === BUNDLE_GEMFILE for Capistrano users
 

data/TODO

@@ -1,5 +1,3 @@
 * Documentation improvements
 
 * improve test suite
-
-* Rack 2.x support (when Rack 2.x exists)

data/examples/big_app_gc.rb

@@ -1,2 +1,2 @@
-# see {Unicorn::OobGC}[http://unicorn.bogomips.org/Unicorn/OobGC.html]
+# see {Unicorn::OobGC}[https://bogomips.org/unicorn/Unicorn/OobGC.html]
 # Unicorn::OobGC was broken in Unicorn v3.3.1 - v3.6.1 and fixed in v3.6.2

data/examples/init.sh

@@ -1,7 +1,16 @@
 #!/bin/sh
 set -e
+### BEGIN INIT INFO
+# Provides:          unicorn
+# Required-Start:    $local_fs $network
+# Required-Stop:     $local_fs $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/stop unicorn Rack app server
+### END INIT INFO
+
 # Example init script, this can be used with nginx, too,
-# since nginx and unicorn accept the same signals
+# since nginx and unicorn accept the same signals.
 
 # Feel free to change any of the following variables for your app:
 TIMEOUT=${TIMEOUT-60}
@@ -9,21 +18,22 @@ APP_ROOT=/home/x/my_app/current
 PID=$APP_ROOT/tmp/pids/unicorn.pid
 CMD="/usr/bin/unicorn -D -c $APP_ROOT/config/unicorn.rb"
 INIT_CONF=$APP_ROOT/config/init.conf
+UPGRADE_DELAY=${UPGRADE_DELAY-2}
 action="$1"
 set -u
 
 test -f "$INIT_CONF" && . $INIT_CONF
 
-old_pid="$PID.oldbin"
+OLD="$PID.oldbin"
 
 cd $APP_ROOT || exit 1
 
 sig () {
-	test -s "$PID" && kill -$1 `cat $PID`
+	test -s "$PID" && kill -$1 $(cat $PID)
 }
 
 oldsig () {
-	test -s $old_pid && kill -$1 `cat $old_pid`
+	test -s "$OLD" && kill -$1 $(cat $OLD)
 }
 
 case $action in
@@ -45,18 +55,36 @@ restart|reload)
 	$CMD
 	;;
 upgrade)
-	if sig USR2 && sleep 2 && sig 0 && oldsig QUIT
+	if oldsig 0
+	then
+		echo >&2 "Old upgraded process still running with $OLD"
+		exit 1
+	fi
+
+	cur_pid=
+	if test -s "$PID"
+	then
+		cur_pid=$(cat $PID)
+	fi
+
+	if test -n "$cur_pid" &&
+			kill -USR2 "$cur_pid" &&
+			sleep $UPGRADE_DELAY &&
+			new_pid=$(cat $PID) &&
+			test x"$new_pid" != x"$cur_pid" &&
+			kill -0 "$new_pid" &&
+			kill -QUIT "$cur_pid"
 	then
 		n=$TIMEOUT
-		while test -s $old_pid && test $n -ge 0
+		while kill -0 "$cur_pid" 2>/dev/null && test $n -ge 0
 		do
 			printf '.' && sleep 1 && n=$(( $n - 1 ))
 		done
 		echo
 
-		if test $n -lt 0 && test -s $old_pid
+		if test $n -lt 0 && kill -0 "$cur_pid" 2>/dev/null
 		then
-			echo >&2 "$old_pid still exists after $TIMEOUT seconds"
+			echo >&2 "$cur_pid still running after $TIMEOUT seconds"
 			exit 1
 		fi
 		exit 0

data/examples/logrotate.conf

@@ -3,6 +3,9 @@
 #
 # See the logrotate(8) manpage for more information:
 #    http://linux.die.net/man/8/logrotate
+#
+# public logrotate-related discussion in our archives:
+#    https://bogomips.org/unicorn-public/?q=logrotate
 
 # Modify the following glob to match the logfiles your app writes to:
 /var/log/unicorn_app/*.log {
@@ -22,7 +25,19 @@
 	# config.  Unicorn supports the USR1 signal and we send it
 	# as our "lastaction" action:
 	lastaction
-		# assuming your pid file is in /var/run/unicorn_app/pid
+		# For systemd users, assuming you use two services
+		# (as recommended) to allow zero-downtime upgrades.
+		# Only one service needs to be started, but signaling
+		# both here is harmless as long as they're both enabled
+		systemctl kill -s SIGUSR1 unicorn@1.service
+		systemctl kill -s SIGUSR1 unicorn@2.service
+
+		# Examples for other process management systems appreciated
+		# Mail us at unicorn-public@bogomips.org
+		# (see above for archives)
+
+		# If you use a pid file and assuming your pid file
+		# is in /var/run/unicorn_app/pid
 		pid=/var/run/unicorn_app/pid
 		test -s $pid && kill -USR1 "$(cat $pid)"
 	endscript

data/examples/nginx.conf

@@ -112,7 +112,7 @@ http {
     # try_files directive appeared in in nginx 0.7.27 and has stabilized
     # over time.  Older versions of nginx (e.g. 0.6.x) requires
     # "if (!-f $request_filename)" which was less efficient:
-    # http://bogomips.org/unicorn.git/tree/examples/nginx.conf?id=v3.3.1#n127
+    # https://bogomips.org/unicorn.git/tree/examples/nginx.conf?id=v3.3.1#n127
     try_files $uri/index.html $uri.html $uri @app;
 
     location @app {

data/examples/unicorn.conf.minimal.rb

@@ -1,9 +1,9 @@
 # Minimal sample configuration file for Unicorn (not Rack) when used
 # with daemonization (unicorn -D) started in your working directory.
 #
-# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
+# See https://bogomips.org/unicorn/Unicorn/Configurator.html for complete
 # documentation.
-# See also http://unicorn.bogomips.org/examples/unicorn.conf.rb for
+# See also https://bogomips.org/unicorn/examples/unicorn.conf.rb for
 # a more verbose configuration using more features.
 
 listen 2007 # by default Unicorn listens on port 8080

data/examples/unicorn.conf.rb

@@ -2,10 +2,10 @@
 #
 # This configuration file documents many features of Unicorn
 # that may not be needed for some applications. See
-# http://unicorn.bogomips.org/examples/unicorn.conf.minimal.rb
+# https://bogomips.org/unicorn/examples/unicorn.conf.minimal.rb
 # for a much simpler configuration file.
 #
-# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
+# See https://bogomips.org/unicorn/Unicorn/Configurator.html for complete
 # documentation.
 
 # Use at least one worker per core if you're on a dedicated server,

data/examples/unicorn@.service

@@ -24,5 +24,10 @@ ExecReload = /bin/kill -HUP $MAINPID
 # adding a few seconds for scheduling differences:
 TimeoutStopSec = 62
 
+# Only kill the master process, it may be harmful to signal
+# workers via default "control-group" setting since some
+# Ruby extensions and applications misbehave on interrupts
+KillMode = process
+
 [Install]
 WantedBy = multi-user.target

data/ext/unicorn_http/unicorn_http.c

@@ -297,7 +297,7 @@ static const int http_parser_first_final = 122;
 static const int http_parser_error = 0;
 
 static const int http_parser_en_ChunkedBody = 100;
-static const int http_parser_en_ChunkedBody_chunk_chunk_end = 106;
+static const int http_parser_en_ChunkedBody_chunk_chunk_end = 105;
 static const int http_parser_en_Trailers = 114;
 static const int http_parser_en_main = 1;
 
@@ -463,7 +463,7 @@ tr8:
     }
   }
 	goto st5;
-tr37:
+tr42:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 #line 318 "unicorn_http.rl"
@@ -472,14 +472,14 @@ tr37:
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
 	goto st5;
-tr40:
+tr45:
 #line 318 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
 	goto st5;
-tr44:
+tr49:
 #line 328 "unicorn_http.rl"
 	{
     VALUE val;
@@ -508,7 +508,7 @@ tr44:
     }
   }
 	goto st5;
-tr50:
+tr55:
 #line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 #line 323 "unicorn_http.rl"
@@ -533,7 +533,7 @@ tr50:
     }
   }
 	goto st5;
-tr54:
+tr59:
 #line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
@@ -624,8 +624,10 @@ st13:
 	if ( ++p == pe )
 		goto _test_eof13;
 case 13:
-	if ( (*p) == 13 )
-		goto tr18;
+	switch( (*p) ) {
+		case 10: goto tr18;
+		case 13: goto tr19;
+	}
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st13;
 	goto st0;
@@ -633,23 +635,23 @@ tr18:
 #line 327 "unicorn_http.rl"
 	{ http_version(hp, PTR_TO(mark), LEN(mark, p)); }
 	goto st14;
-tr25:
+tr26:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 #line 297 "unicorn_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st14;
-tr27:
+tr29:
 #line 297 "unicorn_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st14;
-tr33:
+tr36:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 #line 296 "unicorn_http.rl"
 	{ write_value(hp, buffer, p); }
 	goto st14;
-tr35:
+tr39:
 #line 296 "unicorn_http.rl"
 	{ write_value(hp, buffer, p); }
 	goto st14;
@@ -657,78 +659,127 @@ st14:
 	if ( ++p == pe )
 		goto _test_eof14;
 case 14:
-#line 661 "unicorn_http.c"
-	if ( (*p) == 10 )
-		goto st15;
-	goto st0;
-st15:
-	if ( ++p == pe )
-		goto _test_eof15;
-case 15:
+#line 663 "unicorn_http.c"
 	switch( (*p) ) {
-		case 9: goto st16;
+		case 9: goto st15;
+		case 10: goto tr21;
 		case 13: goto st18;
-		case 32: goto st16;
-		case 33: goto tr22;
-		case 124: goto tr22;
-		case 126: goto tr22;
+		case 32: goto st15;
+		case 33: goto tr23;
+		case 124: goto tr23;
+		case 126: goto tr23;
 	}
 	if ( (*p) < 45 ) {
 		if ( (*p) > 39 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
-				goto tr22;
+				goto tr23;
 		} else if ( (*p) >= 35 )
-			goto tr22;
+			goto tr23;
 	} else if ( (*p) > 46 ) {
 		if ( (*p) < 65 ) {
 			if ( 48 <= (*p) && (*p) <= 57 )
-				goto tr22;
+				goto tr23;
 		} else if ( (*p) > 90 ) {
 			if ( 94 <= (*p) && (*p) <= 122 )
-				goto tr22;
+				goto tr23;
 		} else
-			goto tr22;
+			goto tr23;
 	} else
-		goto tr22;
+		goto tr23;
 	goto st0;
-tr24:
+tr25:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
-	goto st16;
-st16:
+	goto st15;
+st15:
 	if ( ++p == pe )
-		goto _test_eof16;
-case 16:
-#line 703 "unicorn_http.c"
+		goto _test_eof15;
+case 15:
+#line 699 "unicorn_http.c"
 	switch( (*p) ) {
-		case 9: goto tr24;
-		case 13: goto tr25;
-		case 32: goto tr24;
+		case 9: goto tr25;
+		case 10: goto tr26;
+		case 13: goto tr27;
+		case 32: goto tr25;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr23;
-tr23:
+	goto tr24;
+tr24:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
-	goto st17;
-st17:
+	goto st16;
+st16:
 	if ( ++p == pe )
-		goto _test_eof17;
-case 17:
-#line 721 "unicorn_http.c"
+		goto _test_eof16;
+case 16:
+#line 718 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto tr27;
+		case 10: goto tr29;
+		case 13: goto tr30;
 		case 127: goto st0;
 	}
 	if ( (*p) > 8 ) {
-		if ( 10 <= (*p) && (*p) <= 31 )
+		if ( 11 <= (*p) && (*p) <= 31 )
 			goto st0;
 	} else if ( (*p) >= 0 )
 		goto st0;
+	goto st16;
+tr19:
+#line 327 "unicorn_http.rl"
+	{ http_version(hp, PTR_TO(mark), LEN(mark, p)); }
+	goto st17;
+tr27:
+#line 295 "unicorn_http.rl"
+	{ MARK(mark, p); }
+#line 297 "unicorn_http.rl"
+	{ write_cont_value(hp, buffer, p); }
+	goto st17;
+tr30:
+#line 297 "unicorn_http.rl"
+	{ write_cont_value(hp, buffer, p); }
 	goto st17;
-tr99:
+tr37:
+#line 295 "unicorn_http.rl"
+	{ MARK(mark, p); }
+#line 296 "unicorn_http.rl"
+	{ write_value(hp, buffer, p); }
+	goto st17;
+tr40:
+#line 296 "unicorn_http.rl"
+	{ write_value(hp, buffer, p); }
+	goto st17;
+st17:
+	if ( ++p == pe )
+		goto _test_eof17;
+case 17:
+#line 758 "unicorn_http.c"
+	if ( (*p) == 10 )
+		goto st14;
+	goto st0;
+tr21:
+#line 343 "unicorn_http.rl"
+	{
+    finalize_header(hp);
+
+    cs = http_parser_first_final;
+    if (HP_FL_TEST(hp, HASBODY)) {
+      HP_FL_SET(hp, INBODY);
+      if (HP_FL_TEST(hp, CHUNKED))
+        cs = http_parser_en_ChunkedBody;
+    } else {
+      HP_FL_SET(hp, REQEOF);
+      assert(!HP_FL_TEST(hp, CHUNKED) && "chunked encoding without body!");
+    }
+    /*
+     * go back to Ruby so we can call the Rack application, we'll reenter
+     * the parser iff the body needs to be processed.
+     */
+    goto post_exec;
+  }
+	goto st122;
+tr104:
 #line 303 "unicorn_http.rl"
 	{
     VALUE str;
@@ -745,8 +796,27 @@ tr99:
       rb_hash_aset(hp->env, g_request_path, str);
     }
   }
-	goto st18;
-tr102:
+#line 343 "unicorn_http.rl"
+	{
+    finalize_header(hp);
+
+    cs = http_parser_first_final;
+    if (HP_FL_TEST(hp, HASBODY)) {
+      HP_FL_SET(hp, INBODY);
+      if (HP_FL_TEST(hp, CHUNKED))
+        cs = http_parser_en_ChunkedBody;
+    } else {
+      HP_FL_SET(hp, REQEOF);
+      assert(!HP_FL_TEST(hp, CHUNKED) && "chunked encoding without body!");
+    }
+    /*
+     * go back to Ruby so we can call the Rack application, we'll reenter
+     * the parser iff the body needs to be processed.
+     */
+    goto post_exec;
+  }
+	goto st122;
+tr108:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 #line 318 "unicorn_http.rl"
@@ -754,15 +824,53 @@ tr102:
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
-	goto st18;
-tr105:
+#line 343 "unicorn_http.rl"
+	{
+    finalize_header(hp);
+
+    cs = http_parser_first_final;
+    if (HP_FL_TEST(hp, HASBODY)) {
+      HP_FL_SET(hp, INBODY);
+      if (HP_FL_TEST(hp, CHUNKED))
+        cs = http_parser_en_ChunkedBody;
+    } else {
+      HP_FL_SET(hp, REQEOF);
+      assert(!HP_FL_TEST(hp, CHUNKED) && "chunked encoding without body!");
+    }
+    /*
+     * go back to Ruby so we can call the Rack application, we'll reenter
+     * the parser iff the body needs to be processed.
+     */
+    goto post_exec;
+  }
+	goto st122;
+tr112:
 #line 318 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
     rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
   }
-	goto st18;
-tr109:
+#line 343 "unicorn_http.rl"
+	{
+    finalize_header(hp);
+
+    cs = http_parser_first_final;
+    if (HP_FL_TEST(hp, HASBODY)) {
+      HP_FL_SET(hp, INBODY);
+      if (HP_FL_TEST(hp, CHUNKED))
+        cs = http_parser_en_ChunkedBody;
+    } else {
+      HP_FL_SET(hp, REQEOF);
+      assert(!HP_FL_TEST(hp, CHUNKED) && "chunked encoding without body!");
+    }
+    /*
+     * go back to Ruby so we can call the Rack application, we'll reenter
+     * the parser iff the body needs to be processed.
+     */
+    goto post_exec;
+  }
+	goto st122;
+tr117:
 #line 328 "unicorn_http.rl"
 	{
     VALUE val;
@@ -790,8 +898,27 @@ tr109:
       rb_hash_aset(hp->env, g_request_path, str);
     }
   }
-	goto st18;
-tr115:
+#line 343 "unicorn_http.rl"
+	{
+    finalize_header(hp);
+
+    cs = http_parser_first_final;
+    if (HP_FL_TEST(hp, HASBODY)) {
+      HP_FL_SET(hp, INBODY);
+      if (HP_FL_TEST(hp, CHUNKED))
+        cs = http_parser_en_ChunkedBody;
+    } else {
+      HP_FL_SET(hp, REQEOF);
+      assert(!HP_FL_TEST(hp, CHUNKED) && "chunked encoding without body!");
+    }
+    /*
+     * go back to Ruby so we can call the Rack application, we'll reenter
+     * the parser iff the body needs to be processed.
+     */
+    goto post_exec;
+  }
+	goto st122;
+tr124:
 #line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 #line 323 "unicorn_http.rl"
@@ -815,8 +942,27 @@ tr115:
       rb_hash_aset(hp->env, g_request_path, str);
     }
   }
-	goto st18;
-tr119:
+#line 343 "unicorn_http.rl"
+	{
+    finalize_header(hp);
+
+    cs = http_parser_first_final;
+    if (HP_FL_TEST(hp, HASBODY)) {
+      HP_FL_SET(hp, INBODY);
+      if (HP_FL_TEST(hp, CHUNKED))
+        cs = http_parser_en_ChunkedBody;
+    } else {
+      HP_FL_SET(hp, REQEOF);
+      assert(!HP_FL_TEST(hp, CHUNKED) && "chunked encoding without body!");
+    }
+    /*
+     * go back to Ruby so we can call the Rack application, we'll reenter
+     * the parser iff the body needs to be processed.
+     */
+    goto post_exec;
+  }
+	goto st122;
+tr129:
 #line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
@@ -838,16 +984,6 @@ tr119:
       rb_hash_aset(hp->env, g_request_path, str);
     }
   }
-	goto st18;
-st18:
-	if ( ++p == pe )
-		goto _test_eof18;
-case 18:
-#line 847 "unicorn_http.c"
-	if ( (*p) == 10 )
-		goto tr28;
-	goto st0;
-tr28:
 #line 343 "unicorn_http.rl"
 	{
     finalize_header(hp);
@@ -872,15 +1008,134 @@ st122:
 	if ( ++p == pe )
 		goto _test_eof122;
 case 122:
-#line 876 "unicorn_http.c"
+#line 1012 "unicorn_http.c"
 	goto st0;
-tr22:
+tr105:
+#line 303 "unicorn_http.rl"
+	{
+    VALUE str;
+
+    VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
+    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
+    /*
+     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
+     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
+     */
+    if (STR_CSTR_EQ(str, "*")) {
+      str = rb_str_new(NULL, 0);
+      rb_hash_aset(hp->env, g_path_info, str);
+      rb_hash_aset(hp->env, g_request_path, str);
+    }
+  }
+	goto st18;
+tr109:
+#line 289 "unicorn_http.rl"
+	{MARK(mark, p); }
+#line 318 "unicorn_http.rl"
+	{
+    VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
+    rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+  }
+	goto st18;
+tr113:
+#line 318 "unicorn_http.rl"
+	{
+    VALIDATE_MAX_URI_LENGTH(LEN(mark, p), FRAGMENT);
+    rb_hash_aset(hp->env, g_fragment, STR_NEW(mark, p));
+  }
+	goto st18;
+tr118:
+#line 328 "unicorn_http.rl"
+	{
+    VALUE val;
+
+    VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_PATH);
+    val = rb_hash_aset(hp->env, g_request_path, STR_NEW(mark, p));
+
+    /* rack says PATH_INFO must start with "/" or be empty */
+    if (!STR_CSTR_EQ(val, "*"))
+      rb_hash_aset(hp->env, g_path_info, val);
+  }
+#line 303 "unicorn_http.rl"
+	{
+    VALUE str;
+
+    VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
+    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
+    /*
+     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
+     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
+     */
+    if (STR_CSTR_EQ(str, "*")) {
+      str = rb_str_new(NULL, 0);
+      rb_hash_aset(hp->env, g_path_info, str);
+      rb_hash_aset(hp->env, g_request_path, str);
+    }
+  }
+	goto st18;
+tr125:
+#line 322 "unicorn_http.rl"
+	{MARK(start.query, p); }
+#line 323 "unicorn_http.rl"
+	{
+    VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
+    rb_hash_aset(hp->env, g_query_string, STR_NEW(start.query, p));
+  }
+#line 303 "unicorn_http.rl"
+	{
+    VALUE str;
+
+    VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
+    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
+    /*
+     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
+     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
+     */
+    if (STR_CSTR_EQ(str, "*")) {
+      str = rb_str_new(NULL, 0);
+      rb_hash_aset(hp->env, g_path_info, str);
+      rb_hash_aset(hp->env, g_request_path, str);
+    }
+  }
+	goto st18;
+tr130:
+#line 323 "unicorn_http.rl"
+	{
+    VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
+    rb_hash_aset(hp->env, g_query_string, STR_NEW(start.query, p));
+  }
+#line 303 "unicorn_http.rl"
+	{
+    VALUE str;
+
+    VALIDATE_MAX_URI_LENGTH(LEN(mark, p), REQUEST_URI);
+    str = rb_hash_aset(hp->env, g_request_uri, STR_NEW(mark, p));
+    /*
+     * "OPTIONS * HTTP/1.1\r\n" is a valid request, but we can't have '*'
+     * in REQUEST_PATH or PATH_INFO or else Rack::Lint will complain
+     */
+    if (STR_CSTR_EQ(str, "*")) {
+      str = rb_str_new(NULL, 0);
+      rb_hash_aset(hp->env, g_path_info, str);
+      rb_hash_aset(hp->env, g_request_path, str);
+    }
+  }
+	goto st18;
+st18:
+	if ( ++p == pe )
+		goto _test_eof18;
+case 18:
+#line 1129 "unicorn_http.c"
+	if ( (*p) == 10 )
+		goto tr21;
+	goto st0;
+tr23:
 #line 291 "unicorn_http.rl"
 	{ MARK(start.field, p); }
 #line 292 "unicorn_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st19;
-tr29:
+tr32:
 #line 292 "unicorn_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st19;
@@ -888,36 +1143,36 @@ st19:
 	if ( ++p == pe )
 		goto _test_eof19;
 case 19:
-#line 892 "unicorn_http.c"
+#line 1147 "unicorn_http.c"
 	switch( (*p) ) {
-		case 33: goto tr29;
-		case 58: goto tr30;
-		case 124: goto tr29;
-		case 126: goto tr29;
+		case 33: goto tr32;
+		case 58: goto tr33;
+		case 124: goto tr32;
+		case 126: goto tr32;
 	}
 	if ( (*p) < 45 ) {
 		if ( (*p) > 39 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
-				goto tr29;
+				goto tr32;
 		} else if ( (*p) >= 35 )
-			goto tr29;
+			goto tr32;
 	} else if ( (*p) > 46 ) {
 		if ( (*p) < 65 ) {
 			if ( 48 <= (*p) && (*p) <= 57 )
-				goto tr29;
+				goto tr32;
 		} else if ( (*p) > 90 ) {
 			if ( 94 <= (*p) && (*p) <= 122 )
-				goto tr29;
+				goto tr32;
 		} else
-			goto tr29;
+			goto tr32;
 	} else
-		goto tr29;
+		goto tr32;
 	goto st0;
-tr32:
+tr35:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st20;
-tr30:
+tr33:
 #line 294 "unicorn_http.rl"
 	{ hp->s.field_len = LEN(start.field, p); }
 	goto st20;
@@ -925,17 +1180,18 @@ st20:
 	if ( ++p == pe )
 		goto _test_eof20;
 case 20:
-#line 929 "unicorn_http.c"
+#line 1184 "unicorn_http.c"
 	switch( (*p) ) {
-		case 9: goto tr32;
-		case 13: goto tr33;
-		case 32: goto tr32;
+		case 9: goto tr35;
+		case 10: goto tr36;
+		case 13: goto tr37;
+		case 32: goto tr35;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr31;
-tr31:
+	goto tr34;
+tr34:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st21;
@@ -943,13 +1199,14 @@ st21:
 	if ( ++p == pe )
 		goto _test_eof21;
 case 21:
-#line 947 "unicorn_http.c"
+#line 1203 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto tr35;
+		case 10: goto tr39;
+		case 13: goto tr40;
 		case 127: goto st0;
 	}
 	if ( (*p) > 8 ) {
-		if ( 10 <= (*p) && (*p) <= 31 )
+		if ( 11 <= (*p) && (*p) <= 31 )
 			goto st0;
 	} else if ( (*p) >= 0 )
 		goto st0;
@@ -972,7 +1229,7 @@ tr9:
     }
   }
 	goto st22;
-tr45:
+tr50:
 #line 328 "unicorn_http.rl"
 	{
     VALUE val;
@@ -1001,7 +1258,7 @@ tr45:
     }
   }
 	goto st22;
-tr51:
+tr56:
 #line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 #line 323 "unicorn_http.rl"
@@ -1026,7 +1283,7 @@ tr51:
     }
   }
 	goto st22;
-tr55:
+tr60:
 #line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
@@ -1053,17 +1310,17 @@ st22:
 	if ( ++p == pe )
 		goto _test_eof22;
 case 22:
-#line 1057 "unicorn_http.c"
+#line 1314 "unicorn_http.c"
 	switch( (*p) ) {
-		case 32: goto tr37;
+		case 32: goto tr42;
 		case 35: goto st0;
-		case 37: goto tr38;
+		case 37: goto tr43;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr36;
-tr36:
+	goto tr41;
+tr41:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st23;
@@ -1071,9 +1328,9 @@ st23:
 	if ( ++p == pe )
 		goto _test_eof23;
 case 23:
-#line 1075 "unicorn_http.c"
+#line 1332 "unicorn_http.c"
 	switch( (*p) ) {
-		case 32: goto tr40;
+		case 32: goto tr45;
 		case 35: goto st0;
 		case 37: goto st24;
 		case 127: goto st0;
@@ -1081,7 +1338,7 @@ case 23:
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st23;
-tr38:
+tr43:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st24;
@@ -1089,7 +1346,7 @@ st24:
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-#line 1093 "unicorn_http.c"
+#line 1350 "unicorn_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st25;
@@ -1116,7 +1373,7 @@ tr6:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st26;
-tr71:
+tr76:
 #line 302 "unicorn_http.rl"
 	{ rb_hash_aset(hp->env, g_http_host, STR_NEW(mark, p)); }
 #line 289 "unicorn_http.rl"
@@ -1126,12 +1383,12 @@ st26:
 	if ( ++p == pe )
 		goto _test_eof26;
 case 26:
-#line 1130 "unicorn_http.c"
+#line 1387 "unicorn_http.c"
 	switch( (*p) ) {
-		case 32: goto tr44;
-		case 35: goto tr45;
+		case 32: goto tr49;
+		case 35: goto tr50;
 		case 37: goto st27;
-		case 63: goto tr47;
+		case 63: goto tr52;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
@@ -1163,7 +1420,7 @@ case 28:
 	} else
 		goto st26;
 	goto st0;
-tr47:
+tr52:
 #line 328 "unicorn_http.rl"
 	{
     VALUE val;
@@ -1180,17 +1437,17 @@ st29:
 	if ( ++p == pe )
 		goto _test_eof29;
 case 29:
-#line 1184 "unicorn_http.c"
+#line 1441 "unicorn_http.c"
 	switch( (*p) ) {
-		case 32: goto tr50;
-		case 35: goto tr51;
-		case 37: goto tr52;
+		case 32: goto tr55;
+		case 35: goto tr56;
+		case 37: goto tr57;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr49;
-tr49:
+	goto tr54;
+tr54:
 #line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 	goto st30;
@@ -1198,17 +1455,17 @@ st30:
 	if ( ++p == pe )
 		goto _test_eof30;
 case 30:
-#line 1202 "unicorn_http.c"
+#line 1459 "unicorn_http.c"
 	switch( (*p) ) {
-		case 32: goto tr54;
-		case 35: goto tr55;
+		case 32: goto tr59;
+		case 35: goto tr60;
 		case 37: goto st31;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st30;
-tr52:
+tr57:
 #line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 	goto st31;
@@ -1216,7 +1473,7 @@ st31:
 	if ( ++p == pe )
 		goto _test_eof31;
 case 31:
-#line 1220 "unicorn_http.c"
+#line 1477 "unicorn_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st32;
@@ -1249,13 +1506,13 @@ st33:
 	if ( ++p == pe )
 		goto _test_eof33;
 case 33:
-#line 1253 "unicorn_http.c"
+#line 1510 "unicorn_http.c"
 	switch( (*p) ) {
-		case 84: goto tr58;
-		case 116: goto tr58;
+		case 84: goto tr63;
+		case 116: goto tr63;
 	}
 	goto st0;
-tr58:
+tr63:
 #line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st34;
@@ -1263,13 +1520,13 @@ st34:
 	if ( ++p == pe )
 		goto _test_eof34;
 case 34:
-#line 1267 "unicorn_http.c"
+#line 1524 "unicorn_http.c"
 	switch( (*p) ) {
-		case 84: goto tr59;
-		case 116: goto tr59;
+		case 84: goto tr64;
+		case 116: goto tr64;
 	}
 	goto st0;
-tr59:
+tr64:
 #line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st35;
@@ -1277,13 +1534,13 @@ st35:
 	if ( ++p == pe )
 		goto _test_eof35;
 case 35:
-#line 1281 "unicorn_http.c"
+#line 1538 "unicorn_http.c"
 	switch( (*p) ) {
-		case 80: goto tr60;
-		case 112: goto tr60;
+		case 80: goto tr65;
+		case 112: goto tr65;
 	}
 	goto st0;
-tr60:
+tr65:
 #line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st36;
@@ -1291,14 +1548,14 @@ st36:
 	if ( ++p == pe )
 		goto _test_eof36;
 case 36:
-#line 1295 "unicorn_http.c"
+#line 1552 "unicorn_http.c"
 	switch( (*p) ) {
-		case 58: goto tr61;
-		case 83: goto tr62;
-		case 115: goto tr62;
+		case 58: goto tr66;
+		case 83: goto tr67;
+		case 115: goto tr67;
 	}
 	goto st0;
-tr61:
+tr66:
 #line 299 "unicorn_http.rl"
 	{
     rb_hash_aset(hp->env, g_rack_url_scheme, STR_NEW(mark, p));
@@ -1308,7 +1565,7 @@ st37:
 	if ( ++p == pe )
 		goto _test_eof37;
 case 37:
-#line 1312 "unicorn_http.c"
+#line 1569 "unicorn_http.c"
 	if ( (*p) == 47 )
 		goto st38;
 	goto st0;
@@ -1327,8 +1584,8 @@ case 39:
 		case 37: goto st41;
 		case 47: goto st0;
 		case 60: goto st0;
-		case 91: goto tr68;
-		case 95: goto tr67;
+		case 91: goto tr73;
+		case 95: goto tr72;
 		case 127: goto st0;
 	}
 	if ( (*p) < 45 ) {
@@ -1343,11 +1600,11 @@ case 39:
 				goto st0;
 		} else if ( (*p) > 90 ) {
 			if ( 97 <= (*p) && (*p) <= 122 )
-				goto tr67;
+				goto tr72;
 		} else
-			goto tr67;
+			goto tr72;
 	} else
-		goto tr67;
+		goto tr72;
 	goto st40;
 st40:
 	if ( ++p == pe )
@@ -1395,7 +1652,7 @@ case 42:
 	} else
 		goto st40;
 	goto st0;
-tr67:
+tr72:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st43;
@@ -1403,10 +1660,10 @@ st43:
 	if ( ++p == pe )
 		goto _test_eof43;
 case 43:
-#line 1407 "unicorn_http.c"
+#line 1664 "unicorn_http.c"
 	switch( (*p) ) {
 		case 37: goto st41;
-		case 47: goto tr71;
+		case 47: goto tr76;
 		case 58: goto st44;
 		case 60: goto st0;
 		case 64: goto st39;
@@ -1437,7 +1694,7 @@ st44:
 case 44:
 	switch( (*p) ) {
 		case 37: goto st41;
-		case 47: goto tr71;
+		case 47: goto tr76;
 		case 60: goto st0;
 		case 64: goto st39;
 		case 127: goto st0;
@@ -1454,7 +1711,7 @@ case 44:
 	} else
 		goto st0;
 	goto st40;
-tr68:
+tr73:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st45;
@@ -1462,7 +1719,7 @@ st45:
 	if ( ++p == pe )
 		goto _test_eof45;
 case 45:
-#line 1466 "unicorn_http.c"
+#line 1723 "unicorn_http.c"
 	switch( (*p) ) {
 		case 37: goto st41;
 		case 47: goto st0;
@@ -1524,7 +1781,7 @@ st47:
 case 47:
 	switch( (*p) ) {
 		case 37: goto st41;
-		case 47: goto tr71;
+		case 47: goto tr76;
 		case 58: goto st44;
 		case 60: goto st0;
 		case 64: goto st39;
@@ -1539,7 +1796,7 @@ case 47:
 	} else
 		goto st0;
 	goto st40;
-tr62:
+tr67:
 #line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st48;
@@ -1547,9 +1804,9 @@ st48:
 	if ( ++p == pe )
 		goto _test_eof48;
 case 48:
-#line 1551 "unicorn_http.c"
+#line 1808 "unicorn_http.c"
 	if ( (*p) == 58 )
-		goto tr61;
+		goto tr66;
 	goto st0;
 st49:
 	if ( ++p == pe )
@@ -2070,7 +2327,7 @@ st68:
 	if ( ++p == pe )
 		goto _test_eof68;
 case 68:
-#line 2074 "unicorn_http.c"
+#line 2331 "unicorn_http.c"
 	switch( (*p) ) {
 		case 32: goto tr3;
 		case 33: goto st49;
@@ -2130,7 +2387,7 @@ st70:
 		goto _test_eof70;
 case 70:
 	switch( (*p) ) {
-		case 32: goto tr95;
+		case 32: goto tr100;
 		case 33: goto st51;
 		case 124: goto st51;
 		case 126: goto st51;
@@ -2153,7 +2410,7 @@ case 70:
 	} else
 		goto st51;
 	goto st0;
-tr95:
+tr100:
 #line 298 "unicorn_http.rl"
 	{ request_method(hp, PTR_TO(mark), LEN(mark, p)); }
 	goto st71;
@@ -2161,15 +2418,15 @@ st71:
 	if ( ++p == pe )
 		goto _test_eof71;
 case 71:
-#line 2165 "unicorn_http.c"
+#line 2422 "unicorn_http.c"
 	switch( (*p) ) {
-		case 42: goto tr96;
-		case 47: goto tr97;
-		case 72: goto tr98;
-		case 104: goto tr98;
+		case 42: goto tr101;
+		case 47: goto tr102;
+		case 72: goto tr103;
+		case 104: goto tr103;
 	}
 	goto st0;
-tr96:
+tr101:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st72;
@@ -2177,14 +2434,15 @@ st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 2181 "unicorn_http.c"
+#line 2438 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto tr99;
+		case 10: goto tr104;
+		case 13: goto tr105;
 		case 32: goto tr8;
-		case 35: goto tr100;
+		case 35: goto tr106;
 	}
 	goto st0;
-tr100:
+tr106:
 #line 303 "unicorn_http.rl"
 	{
     VALUE str;
@@ -2202,7 +2460,7 @@ tr100:
     }
   }
 	goto st73;
-tr110:
+tr119:
 #line 328 "unicorn_http.rl"
 	{
     VALUE val;
@@ -2231,7 +2489,7 @@ tr110:
     }
   }
 	goto st73;
-tr116:
+tr126:
 #line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 #line 323 "unicorn_http.rl"
@@ -2256,7 +2514,7 @@ tr116:
     }
   }
 	goto st73;
-tr120:
+tr131:
 #line 323 "unicorn_http.rl"
 	{
     VALIDATE_MAX_URI_LENGTH(LEN(start.query, p), QUERY_STRING);
@@ -2283,18 +2541,19 @@ st73:
 	if ( ++p == pe )
 		goto _test_eof73;
 case 73:
-#line 2287 "unicorn_http.c"
+#line 2545 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto tr102;
-		case 32: goto tr37;
+		case 10: goto tr108;
+		case 13: goto tr109;
+		case 32: goto tr42;
 		case 35: goto st0;
-		case 37: goto tr103;
+		case 37: goto tr110;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr101;
-tr101:
+	goto tr107;
+tr107:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st74;
@@ -2302,10 +2561,11 @@ st74:
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
-#line 2306 "unicorn_http.c"
+#line 2565 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto tr105;
-		case 32: goto tr40;
+		case 10: goto tr112;
+		case 13: goto tr113;
+		case 32: goto tr45;
 		case 35: goto st0;
 		case 37: goto st75;
 		case 127: goto st0;
@@ -2313,7 +2573,7 @@ case 74:
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st74;
-tr103:
+tr110:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st75;
@@ -2321,7 +2581,7 @@ st75:
 	if ( ++p == pe )
 		goto _test_eof75;
 case 75:
-#line 2325 "unicorn_http.c"
+#line 2585 "unicorn_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st76;
@@ -2344,11 +2604,11 @@ case 76:
 	} else
 		goto st74;
 	goto st0;
-tr97:
+tr102:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st77;
-tr136:
+tr147:
 #line 302 "unicorn_http.rl"
 	{ rb_hash_aset(hp->env, g_http_host, STR_NEW(mark, p)); }
 #line 289 "unicorn_http.rl"
@@ -2358,13 +2618,14 @@ st77:
 	if ( ++p == pe )
 		goto _test_eof77;
 case 77:
-#line 2362 "unicorn_http.c"
+#line 2622 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto tr109;
-		case 32: goto tr44;
-		case 35: goto tr110;
+		case 10: goto tr117;
+		case 13: goto tr118;
+		case 32: goto tr49;
+		case 35: goto tr119;
 		case 37: goto st78;
-		case 63: goto tr112;
+		case 63: goto tr121;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
@@ -2396,7 +2657,7 @@ case 79:
 	} else
 		goto st77;
 	goto st0;
-tr112:
+tr121:
 #line 328 "unicorn_http.rl"
 	{
     VALUE val;
@@ -2413,18 +2674,19 @@ st80:
 	if ( ++p == pe )
 		goto _test_eof80;
 case 80:
-#line 2417 "unicorn_http.c"
+#line 2678 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto tr115;
-		case 32: goto tr50;
-		case 35: goto tr116;
-		case 37: goto tr117;
+		case 10: goto tr124;
+		case 13: goto tr125;
+		case 32: goto tr55;
+		case 35: goto tr126;
+		case 37: goto tr127;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr114;
-tr114:
+	goto tr123;
+tr123:
 #line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 	goto st81;
@@ -2432,18 +2694,19 @@ st81:
 	if ( ++p == pe )
 		goto _test_eof81;
 case 81:
-#line 2436 "unicorn_http.c"
+#line 2698 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto tr119;
-		case 32: goto tr54;
-		case 35: goto tr120;
+		case 10: goto tr129;
+		case 13: goto tr130;
+		case 32: goto tr59;
+		case 35: goto tr131;
 		case 37: goto st82;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st81;
-tr117:
+tr127:
 #line 322 "unicorn_http.rl"
 	{MARK(start.query, p); }
 	goto st82;
@@ -2451,7 +2714,7 @@ st82:
 	if ( ++p == pe )
 		goto _test_eof82;
 case 82:
-#line 2455 "unicorn_http.c"
+#line 2718 "unicorn_http.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st83;
@@ -2474,7 +2737,7 @@ case 83:
 	} else
 		goto st81;
 	goto st0;
-tr98:
+tr103:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 #line 293 "unicorn_http.rl"
@@ -2484,13 +2747,13 @@ st84:
 	if ( ++p == pe )
 		goto _test_eof84;
 case 84:
-#line 2488 "unicorn_http.c"
+#line 2751 "unicorn_http.c"
 	switch( (*p) ) {
-		case 84: goto tr123;
-		case 116: goto tr123;
+		case 84: goto tr134;
+		case 116: goto tr134;
 	}
 	goto st0;
-tr123:
+tr134:
 #line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st85;
@@ -2498,13 +2761,13 @@ st85:
 	if ( ++p == pe )
 		goto _test_eof85;
 case 85:
-#line 2502 "unicorn_http.c"
+#line 2765 "unicorn_http.c"
 	switch( (*p) ) {
-		case 84: goto tr124;
-		case 116: goto tr124;
+		case 84: goto tr135;
+		case 116: goto tr135;
 	}
 	goto st0;
-tr124:
+tr135:
 #line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st86;
@@ -2512,13 +2775,13 @@ st86:
 	if ( ++p == pe )
 		goto _test_eof86;
 case 86:
-#line 2516 "unicorn_http.c"
+#line 2779 "unicorn_http.c"
 	switch( (*p) ) {
-		case 80: goto tr125;
-		case 112: goto tr125;
+		case 80: goto tr136;
+		case 112: goto tr136;
 	}
 	goto st0;
-tr125:
+tr136:
 #line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st87;
@@ -2526,14 +2789,14 @@ st87:
 	if ( ++p == pe )
 		goto _test_eof87;
 case 87:
-#line 2530 "unicorn_http.c"
+#line 2793 "unicorn_http.c"
 	switch( (*p) ) {
-		case 58: goto tr126;
-		case 83: goto tr127;
-		case 115: goto tr127;
+		case 58: goto tr137;
+		case 83: goto tr138;
+		case 115: goto tr138;
 	}
 	goto st0;
-tr126:
+tr137:
 #line 299 "unicorn_http.rl"
 	{
     rb_hash_aset(hp->env, g_rack_url_scheme, STR_NEW(mark, p));
@@ -2543,7 +2806,7 @@ st88:
 	if ( ++p == pe )
 		goto _test_eof88;
 case 88:
-#line 2547 "unicorn_http.c"
+#line 2810 "unicorn_http.c"
 	if ( (*p) == 47 )
 		goto st89;
 	goto st0;
@@ -2562,8 +2825,8 @@ case 90:
 		case 37: goto st92;
 		case 47: goto st0;
 		case 60: goto st0;
-		case 91: goto tr133;
-		case 95: goto tr132;
+		case 91: goto tr144;
+		case 95: goto tr143;
 		case 127: goto st0;
 	}
 	if ( (*p) < 45 ) {
@@ -2578,11 +2841,11 @@ case 90:
 				goto st0;
 		} else if ( (*p) > 90 ) {
 			if ( 97 <= (*p) && (*p) <= 122 )
-				goto tr132;
+				goto tr143;
 		} else
-			goto tr132;
+			goto tr143;
 	} else
-		goto tr132;
+		goto tr143;
 	goto st91;
 st91:
 	if ( ++p == pe )
@@ -2630,7 +2893,7 @@ case 93:
 	} else
 		goto st91;
 	goto st0;
-tr132:
+tr143:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st94;
@@ -2638,10 +2901,10 @@ st94:
 	if ( ++p == pe )
 		goto _test_eof94;
 case 94:
-#line 2642 "unicorn_http.c"
+#line 2905 "unicorn_http.c"
 	switch( (*p) ) {
 		case 37: goto st92;
-		case 47: goto tr136;
+		case 47: goto tr147;
 		case 58: goto st95;
 		case 60: goto st0;
 		case 64: goto st90;
@@ -2672,7 +2935,7 @@ st95:
 case 95:
 	switch( (*p) ) {
 		case 37: goto st92;
-		case 47: goto tr136;
+		case 47: goto tr147;
 		case 60: goto st0;
 		case 64: goto st90;
 		case 127: goto st0;
@@ -2689,7 +2952,7 @@ case 95:
 	} else
 		goto st0;
 	goto st91;
-tr133:
+tr144:
 #line 289 "unicorn_http.rl"
 	{MARK(mark, p); }
 	goto st96;
@@ -2697,7 +2960,7 @@ st96:
 	if ( ++p == pe )
 		goto _test_eof96;
 case 96:
-#line 2701 "unicorn_http.c"
+#line 2964 "unicorn_http.c"
 	switch( (*p) ) {
 		case 37: goto st92;
 		case 47: goto st0;
@@ -2759,7 +3022,7 @@ st98:
 case 98:
 	switch( (*p) ) {
 		case 37: goto st92;
-		case 47: goto tr136;
+		case 47: goto tr147;
 		case 58: goto st95;
 		case 60: goto st0;
 		case 64: goto st90;
@@ -2774,7 +3037,7 @@ case 98:
 	} else
 		goto st0;
 	goto st91;
-tr127:
+tr138:
 #line 293 "unicorn_http.rl"
 	{ downcase_char(deconst(p)); }
 	goto st99;
@@ -2782,26 +3045,26 @@ st99:
 	if ( ++p == pe )
 		goto _test_eof99;
 case 99:
-#line 2786 "unicorn_http.c"
+#line 3049 "unicorn_http.c"
 	if ( (*p) == 58 )
-		goto tr126;
+		goto tr137;
 	goto st0;
 st100:
 	if ( ++p == pe )
 		goto _test_eof100;
 case 100:
 	if ( (*p) == 48 )
-		goto tr140;
+		goto tr151;
 	if ( (*p) < 65 ) {
 		if ( 49 <= (*p) && (*p) <= 57 )
-			goto tr141;
+			goto tr152;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto tr141;
+			goto tr152;
 	} else
-		goto tr141;
+		goto tr152;
 	goto st0;
-tr140:
+tr151:
 #line 338 "unicorn_http.rl"
 	{
     hp->len.chunk = step_incr(hp->len.chunk, (*p), 16);
@@ -2813,29 +3076,23 @@ st101:
 	if ( ++p == pe )
 		goto _test_eof101;
 case 101:
-#line 2817 "unicorn_http.c"
+#line 3080 "unicorn_http.c"
 	switch( (*p) ) {
+		case 10: goto tr153;
 		case 13: goto st102;
-		case 48: goto tr140;
+		case 48: goto tr151;
 		case 59: goto st111;
 	}
 	if ( (*p) < 65 ) {
 		if ( 49 <= (*p) && (*p) <= 57 )
-			goto tr141;
+			goto tr152;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto tr141;
+			goto tr152;
 	} else
-		goto tr141;
-	goto st0;
-st102:
-	if ( ++p == pe )
-		goto _test_eof102;
-case 102:
-	if ( (*p) == 10 )
-		goto tr144;
+		goto tr152;
 	goto st0;
-tr144:
+tr153:
 #line 367 "unicorn_http.rl"
 	{
     HP_FL_SET(hp, INTRAILER);
@@ -2849,9 +3106,16 @@ st123:
 	if ( ++p == pe )
 		goto _test_eof123;
 case 123:
-#line 2853 "unicorn_http.c"
+#line 3110 "unicorn_http.c"
+	goto st0;
+st102:
+	if ( ++p == pe )
+		goto _test_eof102;
+case 102:
+	if ( (*p) == 10 )
+		goto tr153;
 	goto st0;
-tr141:
+tr152:
 #line 338 "unicorn_http.rl"
 	{
     hp->len.chunk = step_incr(hp->len.chunk, (*p), 16);
@@ -2863,33 +3127,27 @@ st103:
 	if ( ++p == pe )
 		goto _test_eof103;
 case 103:
-#line 2867 "unicorn_http.c"
+#line 3131 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto st104;
+		case 10: goto st104;
+		case 13: goto st107;
 		case 59: goto st108;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr141;
+			goto tr152;
 	} else if ( (*p) > 70 ) {
 		if ( 97 <= (*p) && (*p) <= 102 )
-			goto tr141;
+			goto tr152;
 	} else
-		goto tr141;
+		goto tr152;
 	goto st0;
 st104:
 	if ( ++p == pe )
 		goto _test_eof104;
 case 104:
-	if ( (*p) == 10 )
-		goto st105;
-	goto st0;
-st105:
-	if ( ++p == pe )
-		goto _test_eof105;
-case 105:
-	goto tr148;
-tr148:
+	goto tr159;
+tr159:
 #line 375 "unicorn_http.rl"
 	{
   skip_chunk_data_hack: {
@@ -2904,31 +3162,41 @@ tr148:
       goto post_exec;
     } else {
       p--;
-      {goto st106;}
+      {goto st105;}
     }
   }}
-	goto st106;
+	goto st105;
+st105:
+	if ( ++p == pe )
+		goto _test_eof105;
+case 105:
+#line 3174 "unicorn_http.c"
+	switch( (*p) ) {
+		case 10: goto st100;
+		case 13: goto st106;
+	}
+	goto st0;
 st106:
 	if ( ++p == pe )
 		goto _test_eof106;
 case 106:
-#line 2916 "unicorn_http.c"
-	if ( (*p) == 13 )
-		goto st107;
+	if ( (*p) == 10 )
+		goto st100;
 	goto st0;
 st107:
 	if ( ++p == pe )
 		goto _test_eof107;
 case 107:
 	if ( (*p) == 10 )
-		goto st100;
+		goto st104;
 	goto st0;
 st108:
 	if ( ++p == pe )
 		goto _test_eof108;
 case 108:
 	switch( (*p) ) {
-		case 13: goto st104;
+		case 10: goto st104;
+		case 13: goto st107;
 		case 32: goto st108;
 		case 33: goto st109;
 		case 59: goto st108;
@@ -2959,7 +3227,8 @@ st109:
 		goto _test_eof109;
 case 109:
 	switch( (*p) ) {
-		case 13: goto st104;
+		case 10: goto st104;
+		case 13: goto st107;
 		case 33: goto st109;
 		case 59: goto st108;
 		case 61: goto st110;
@@ -2989,7 +3258,8 @@ st110:
 		goto _test_eof110;
 case 110:
 	switch( (*p) ) {
-		case 13: goto st104;
+		case 10: goto st104;
+		case 13: goto st107;
 		case 33: goto st110;
 		case 59: goto st108;
 		case 124: goto st110;
@@ -3018,6 +3288,7 @@ st111:
 		goto _test_eof111;
 case 111:
 	switch( (*p) ) {
+		case 10: goto tr153;
 		case 13: goto st102;
 		case 32: goto st111;
 		case 33: goto st112;
@@ -3049,6 +3320,7 @@ st112:
 		goto _test_eof112;
 case 112:
 	switch( (*p) ) {
+		case 10: goto tr153;
 		case 13: goto st102;
 		case 33: goto st112;
 		case 59: goto st111;
@@ -3079,6 +3351,7 @@ st113:
 		goto _test_eof113;
 case 113:
 	switch( (*p) ) {
+		case 10: goto tr153;
 		case 13: goto st102;
 		case 33: goto st113;
 		case 59: goto st111;
@@ -3103,37 +3376,59 @@ case 113:
 	} else
 		goto st113;
 	goto st0;
+tr172:
+#line 295 "unicorn_http.rl"
+	{ MARK(mark, p); }
+#line 297 "unicorn_http.rl"
+	{ write_cont_value(hp, buffer, p); }
+	goto st114;
+tr175:
+#line 297 "unicorn_http.rl"
+	{ write_cont_value(hp, buffer, p); }
+	goto st114;
+tr182:
+#line 295 "unicorn_http.rl"
+	{ MARK(mark, p); }
+#line 296 "unicorn_http.rl"
+	{ write_value(hp, buffer, p); }
+	goto st114;
+tr185:
+#line 296 "unicorn_http.rl"
+	{ write_value(hp, buffer, p); }
+	goto st114;
 st114:
 	if ( ++p == pe )
 		goto _test_eof114;
 case 114:
+#line 3404 "unicorn_http.c"
 	switch( (*p) ) {
 		case 9: goto st115;
+		case 10: goto tr167;
 		case 13: goto st118;
 		case 32: goto st115;
-		case 33: goto tr157;
-		case 124: goto tr157;
-		case 126: goto tr157;
+		case 33: goto tr169;
+		case 124: goto tr169;
+		case 126: goto tr169;
 	}
 	if ( (*p) < 45 ) {
 		if ( (*p) > 39 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
-				goto tr157;
+				goto tr169;
 		} else if ( (*p) >= 35 )
-			goto tr157;
+			goto tr169;
 	} else if ( (*p) > 46 ) {
 		if ( (*p) < 65 ) {
 			if ( 48 <= (*p) && (*p) <= 57 )
-				goto tr157;
+				goto tr169;
 		} else if ( (*p) > 90 ) {
 			if ( 94 <= (*p) && (*p) <= 122 )
-				goto tr157;
+				goto tr169;
 		} else
-			goto tr157;
+			goto tr169;
 	} else
-		goto tr157;
+		goto tr169;
 	goto st0;
-tr159:
+tr171:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st115;
@@ -3141,17 +3436,18 @@ st115:
 	if ( ++p == pe )
 		goto _test_eof115;
 case 115:
-#line 3145 "unicorn_http.c"
+#line 3440 "unicorn_http.c"
 	switch( (*p) ) {
-		case 9: goto tr159;
-		case 13: goto tr160;
-		case 32: goto tr159;
+		case 9: goto tr171;
+		case 10: goto tr172;
+		case 13: goto tr173;
+		case 32: goto tr171;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr158;
-tr158:
+	goto tr170;
+tr170:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st116;
@@ -3159,34 +3455,35 @@ st116:
 	if ( ++p == pe )
 		goto _test_eof116;
 case 116:
-#line 3163 "unicorn_http.c"
+#line 3459 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto tr162;
+		case 10: goto tr175;
+		case 13: goto tr176;
 		case 127: goto st0;
 	}
 	if ( (*p) > 8 ) {
-		if ( 10 <= (*p) && (*p) <= 31 )
+		if ( 11 <= (*p) && (*p) <= 31 )
 			goto st0;
 	} else if ( (*p) >= 0 )
 		goto st0;
 	goto st116;
-tr160:
+tr173:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 #line 297 "unicorn_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st117;
-tr162:
+tr176:
 #line 297 "unicorn_http.rl"
 	{ write_cont_value(hp, buffer, p); }
 	goto st117;
-tr169:
+tr183:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 #line 296 "unicorn_http.rl"
 	{ write_value(hp, buffer, p); }
 	goto st117;
-tr171:
+tr186:
 #line 296 "unicorn_http.rl"
 	{ write_value(hp, buffer, p); }
 	goto st117;
@@ -3194,18 +3491,11 @@ st117:
 	if ( ++p == pe )
 		goto _test_eof117;
 case 117:
-#line 3198 "unicorn_http.c"
+#line 3495 "unicorn_http.c"
 	if ( (*p) == 10 )
 		goto st114;
 	goto st0;
-st118:
-	if ( ++p == pe )
-		goto _test_eof118;
-case 118:
-	if ( (*p) == 10 )
-		goto tr164;
-	goto st0;
-tr164:
+tr167:
 #line 362 "unicorn_http.rl"
 	{
     cs = http_parser_first_final;
@@ -3216,15 +3506,22 @@ st124:
 	if ( ++p == pe )
 		goto _test_eof124;
 case 124:
-#line 3220 "unicorn_http.c"
+#line 3510 "unicorn_http.c"
 	goto st0;
-tr157:
+st118:
+	if ( ++p == pe )
+		goto _test_eof118;
+case 118:
+	if ( (*p) == 10 )
+		goto tr167;
+	goto st0;
+tr169:
 #line 291 "unicorn_http.rl"
 	{ MARK(start.field, p); }
 #line 292 "unicorn_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st119;
-tr165:
+tr178:
 #line 292 "unicorn_http.rl"
 	{ snake_upcase_char(deconst(p)); }
 	goto st119;
@@ -3232,36 +3529,36 @@ st119:
 	if ( ++p == pe )
 		goto _test_eof119;
 case 119:
-#line 3236 "unicorn_http.c"
+#line 3533 "unicorn_http.c"
 	switch( (*p) ) {
-		case 33: goto tr165;
-		case 58: goto tr166;
-		case 124: goto tr165;
-		case 126: goto tr165;
+		case 33: goto tr178;
+		case 58: goto tr179;
+		case 124: goto tr178;
+		case 126: goto tr178;
 	}
 	if ( (*p) < 45 ) {
 		if ( (*p) > 39 ) {
 			if ( 42 <= (*p) && (*p) <= 43 )
-				goto tr165;
+				goto tr178;
 		} else if ( (*p) >= 35 )
-			goto tr165;
+			goto tr178;
 	} else if ( (*p) > 46 ) {
 		if ( (*p) < 65 ) {
 			if ( 48 <= (*p) && (*p) <= 57 )
-				goto tr165;
+				goto tr178;
 		} else if ( (*p) > 90 ) {
 			if ( 94 <= (*p) && (*p) <= 122 )
-				goto tr165;
+				goto tr178;
 		} else
-			goto tr165;
+			goto tr178;
 	} else
-		goto tr165;
+		goto tr178;
 	goto st0;
-tr168:
+tr181:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st120;
-tr166:
+tr179:
 #line 294 "unicorn_http.rl"
 	{ hp->s.field_len = LEN(start.field, p); }
 	goto st120;
@@ -3269,17 +3566,18 @@ st120:
 	if ( ++p == pe )
 		goto _test_eof120;
 case 120:
-#line 3273 "unicorn_http.c"
+#line 3570 "unicorn_http.c"
 	switch( (*p) ) {
-		case 9: goto tr168;
-		case 13: goto tr169;
-		case 32: goto tr168;
+		case 9: goto tr181;
+		case 10: goto tr182;
+		case 13: goto tr183;
+		case 32: goto tr181;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
-	goto tr167;
-tr167:
+	goto tr180;
+tr180:
 #line 295 "unicorn_http.rl"
 	{ MARK(mark, p); }
 	goto st121;
@@ -3287,13 +3585,14 @@ st121:
 	if ( ++p == pe )
 		goto _test_eof121;
 case 121:
-#line 3291 "unicorn_http.c"
+#line 3589 "unicorn_http.c"
 	switch( (*p) ) {
-		case 13: goto tr171;
+		case 10: goto tr185;
+		case 13: goto tr186;
 		case 127: goto st0;
 	}
 	if ( (*p) > 8 ) {
-		if ( 10 <= (*p) && (*p) <= 31 )
+		if ( 11 <= (*p) && (*p) <= 31 )
 			goto st0;
 	} else if ( (*p) >= 0 )
 		goto st0;
@@ -3315,8 +3614,8 @@ case 121:
 	_test_eof15: cs = 15; goto _test_eof; 
 	_test_eof16: cs = 16; goto _test_eof; 
 	_test_eof17: cs = 17; goto _test_eof; 
-	_test_eof18: cs = 18; goto _test_eof; 
 	_test_eof122: cs = 122; goto _test_eof; 
+	_test_eof18: cs = 18; goto _test_eof; 
 	_test_eof19: cs = 19; goto _test_eof; 
 	_test_eof20: cs = 20; goto _test_eof; 
 	_test_eof21: cs = 21; goto _test_eof; 
@@ -3400,8 +3699,8 @@ case 121:
 	_test_eof99: cs = 99; goto _test_eof; 
 	_test_eof100: cs = 100; goto _test_eof; 
 	_test_eof101: cs = 101; goto _test_eof; 
-	_test_eof102: cs = 102; goto _test_eof; 
 	_test_eof123: cs = 123; goto _test_eof; 
+	_test_eof102: cs = 102; goto _test_eof; 
 	_test_eof103: cs = 103; goto _test_eof; 
 	_test_eof104: cs = 104; goto _test_eof; 
 	_test_eof105: cs = 105; goto _test_eof; 
@@ -3417,8 +3716,8 @@ case 121:
 	_test_eof115: cs = 115; goto _test_eof; 
 	_test_eof116: cs = 116; goto _test_eof; 
 	_test_eof117: cs = 117; goto _test_eof; 
-	_test_eof118: cs = 118; goto _test_eof; 
 	_test_eof124: cs = 124; goto _test_eof; 
+	_test_eof118: cs = 118; goto _test_eof; 
 	_test_eof119: cs = 119; goto _test_eof; 
 	_test_eof120: cs = 120; goto _test_eof; 
 	_test_eof121: cs = 121; goto _test_eof;