From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS12876 195.154.0.0/16 X-Spam-Status: No, score=-1.2 required=3.0 tests=AWL,BAYES_00,RCVD_IN_XBL shortcircuit=no autolearn=no version=3.3.2 X-Original-To: rainbows-public@bogomips.org Received: from 80x24.org (tor-exit.gansta93.com [195.154.56.44]) by dcvr.yhbt.net (Postfix) with ESMTP id 68FEF1F7F6 for ; Sat, 14 Nov 2015 02:47:36 +0000 (UTC) From: Eric Wong To: rainbows-public@bogomips.org Subject: [PATCH 3/5] reflect changes in Rack::Utils::HTTP_STATUS_CODES Date: Sat, 14 Nov 2015 02:47:23 +0000 Message-Id: <20151114024725.24139-4-e@80x24.org> In-Reply-To: <20151114024725.24139-1-e@80x24.org> References: <20151114024725.24139-1-e@80x24.org> List-Id: Applications may want to alter the message associated with HTTP status codes in Rack::Utils::HTTP_STATUS_CODES. Avoid memoizing status lines ahead-of-time Note: this introduces a minor performance regression, but ought to be unnoticeable unless you're running "Hello world"-type apps. --- lib/rainbows/response.rb | 5 +++-- lib/rainbows/stream_response_epoll.rb | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/rainbows/response.rb b/lib/rainbows/response.rb index db14ee4..a661ab6 100644 --- a/lib/rainbows/response.rb +++ b/lib/rainbows/response.rb @@ -40,8 +40,9 @@ module Rainbows::Response def write_headers(status, headers, alive, body) @hp.headers? or return body hijack = nil - status = CODES[status.to_i] || status - buf = "HTTP/1.1 #{status}\r\n" \ + code = status.to_i + msg = Rack::Utils::HTTP_STATUS_CODES[code] + buf = "HTTP/1.1 #{msg ? %Q(#{code} #{msg}) : status}\r\n" \ "Date: #{httpdate}\r\n" headers.each do |key, value| case key diff --git a/lib/rainbows/stream_response_epoll.rb b/lib/rainbows/stream_response_epoll.rb index c0d90a4..1f32dcc 100644 --- a/lib/rainbows/stream_response_epoll.rb +++ b/lib/rainbows/stream_response_epoll.rb @@ -20,18 +20,18 @@ require "raindrops" # * sleepy_penguin 3.0.1 or later module Rainbows::StreamResponseEpoll # :stopdoc: - CODES = Unicorn::HttpResponse::CODES HEADER_END = "X-Accel-Buffering: no\r\n\r\n" autoload :Client, "rainbows/stream_response_epoll/client" def http_response_write(socket, status, headers, body) - status = CODES[status.to_i] || status hijack = ep_client = false if headers # don't set extra headers here, this is only intended for # consuming by nginx. - buf = "HTTP/1.0 #{status}\r\n" + code = status.to_i + msg = Rack::Utils::HTTP_STATUS_CODES[code] + buf = "HTTP/1.0 #{msg ? %Q(#{code} #{msg}) : status}\r\n" headers.each do |key, value| case key when "rack.hijack" -- EW