From db0f20a4c889a132786af69a6aaacfadf689379d Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Fri, 3 Apr 2015 22:04:52 +0000
Subject: proxy_pass: test and fix larger uploads

We were incorrectly stashing the return value of detach_rbuf!
into the inter-thread buffer buffer which is bound to the client.
---
 lib/yahns/proxy_pass.rb |  5 +++--
 test/test_proxy_pass.rb | 22 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/yahns/proxy_pass.rb b/lib/yahns/proxy_pass.rb
index 09fb884..ec1fbcf 100644
--- a/lib/yahns/proxy_pass.rb
+++ b/lib/yahns/proxy_pass.rb
@@ -108,7 +108,7 @@ class Yahns::ProxyPass # :nodoc:
           when Array
             vec = rv # partial write, retry in case loop
           when :wait_writable
-            buf = detach_rbuf!
+            detach_rbuf!
             req[0] = vec
             return :wait_writable
           when nil
@@ -120,13 +120,14 @@ class Yahns::ProxyPass # :nodoc:
         # note: we do not send any trailer, they are folded into the header
         # because this relies on full request buffering
         send_req_buf("0\r\n\r\n".freeze)
+        # prepare_wait_readable already called by send_req_buf
       else # identity request, easy:
         while input.read(0x2000, buf)
           case rv = kgio_trywrite(buf)
           when String
             buf = rv # partial write, retry in case loop
           when :wait_writable
-            buf = detach_rbuf!
+            detach_rbuf!
             req[0] = buf
             return :wait_writable
           when nil
diff --git a/test/test_proxy_pass.rb b/test/test_proxy_pass.rb
index 5bf8722..53542ac 100644
--- a/test/test_proxy_pass.rb
+++ b/test/test_proxy_pass.rb
@@ -144,6 +144,7 @@ class TestProxyPass < Testcase
       cfg.instance_eval do
         app(:rack, Yahns::ProxyPass.new("http://#{host2}:#{port2}")) do
           listen "#{host}:#{port}"
+          client_max_body_size nil
         end
         stderr_path err.path
       end
@@ -154,6 +155,7 @@ class TestProxyPass < Testcase
       cfg.instance_eval do
         app(:rack, ProxiedApp.new) do
           listen "#{host2}:#{port2}"
+          client_max_body_size nil
         end
         stderr_path err.path
       end
@@ -195,7 +197,7 @@ class TestProxyPass < Testcase
       assert_equal 'text/PAIN', res['Content-Type']
       assert_equal 'HIHIHI!', res.body
 
-      # normal content-length
+      # normal content-length (PUT)
       gplv3.rewind
       req = Net::HTTP::Put.new('/')
       req.body_stream = gplv3
@@ -210,6 +212,24 @@ class TestProxyPass < Testcase
       res = http.request(Net::HTTP::Get.new('/giant-body'))
       assert_equal 200, res.code.to_i
       assert_equal OMFG, res.body
+
+      # giant PUT content-length
+      req = Net::HTTP::Put.new('/')
+      req.body_stream = StringIO.new(OMFG)
+      req.content_type = 'application/octet-stream'
+      req.content_length = OMFG.size
+      res = http.request(req)
+      assert_equal OMFG, res.body
+      assert_equal 201, res.code.to_i
+
+      # giant PUT chunked encoding
+      req = Net::HTTP::Put.new('/')
+      req.body_stream = StringIO.new(OMFG)
+      req.content_type = 'application/octet-stream'
+      req['Transfer-Encoding'] = 'chunked'
+      res = http.request(req)
+      assert_equal OMFG, res.body
+      assert_equal 201, res.code.to_i
     end
 
     # ensure we do not chunk responses back to an HTTP/1.0 client even if
-- 
cgit v1.2.3-24-ge0c7