diff options
author | Eric Wong <e@80x24.org> | 2016-06-01 23:53:33 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-06-01 23:53:33 +0000 |
commit | a3e3ab48a5a73e7d55bfcb271e5f2a1b666a4f8c (patch) | |
tree | 63eb4f47c6b6cf07d0ee52fd110409228268397b | |
parent | 0f40562e710445dc0b793dba8962d235ba3bd954 (diff) | |
download | yahns-a3e3ab48a5a73e7d55bfcb271e5f2a1b666a4f8c.tar.gz |
This will allow us to add extra options at the response layer without taking up extra env hash keys.
-rw-r--r-- | lib/yahns/proxy_http_response.rb | 2 | ||||
-rw-r--r-- | lib/yahns/proxy_pass.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/yahns/proxy_http_response.rb b/lib/yahns/proxy_http_response.rb index 284a3c6..c7a9447 100644 --- a/lib/yahns/proxy_http_response.rb +++ b/lib/yahns/proxy_http_response.rb @@ -71,7 +71,7 @@ module Yahns::HttpResponse # :nodoc: flags = MSG_DONTWAIT alive = @hs.next? && self.class.persistent_connections term = false - response_headers = env['yahns.proxy_pass.response_headers'] + response_headers = env['yahns.proxy_pass'].response_headers res = "HTTP/1.1 #{msg ? %Q(#{code} #{msg}) : status}\r\n".dup headers.each do |key,value| # n.b.: headers is an Array of 2-element Arrays diff --git a/lib/yahns/proxy_pass.rb b/lib/yahns/proxy_pass.rb index a30089d..ed37da5 100644 --- a/lib/yahns/proxy_pass.rb +++ b/lib/yahns/proxy_pass.rb @@ -10,6 +10,8 @@ require_relative 'proxy_http_response' require_relative 'req_res' class Yahns::ProxyPass # :nodoc: + attr_reader :proxy_buffering, :response_headers + def initialize(dest, opts = {}) case dest when %r{\Aunix:([^:]+)(?::(/.*))?\z} @@ -23,6 +25,8 @@ class Yahns::ProxyPass # :nodoc: raise ArgumentError, "destination must be an HTTP URL or unix: path" end @response_headers = opts[:response_headers] || {} + @proxy_buffering = opts[:proxy_buffering] + @proxy_buffering = true if @proxy_buffering.nil? # allow false # It's wrong to send the backend Server tag through. Let users say # { "Server => "yahns" } if they want to advertise for us, but don't @@ -85,7 +89,7 @@ class Yahns::ProxyPass # :nodoc: ctype = env["CONTENT_TYPE"] and req << "Content-Type: #{ctype}\r\n" clen = env["CONTENT_LENGTH"] and req << "Content-Length: #{clen}\r\n" input = chunked || (clen && clen.to_i > 0) ? env['rack.input'] : nil - env['yahns.proxy_pass.response_headers'] = @response_headers + env['yahns.proxy_pass'] = self # finally, prepare to emit the headers rr.req_start(c, req << "\r\n".freeze, input, chunked) |