Skip to content

Commit 5ec96d9

Browse files
authored
Merge pull request rails#49853 from skipkayhil/hm-avoid-env-name
Avoid calling Headers#env_name when static header
2 parents fc13326 + 7fe6675 commit 5ec96d9

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

actionpack/lib/action_dispatch/http/request.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ def #{env.delete_prefix("HTTP_").downcase} # def accept_charset
5555
METHOD
5656
end
5757

58+
TRANSFER_ENCODING = "HTTP_TRANSFER_ENCODING" # :nodoc:
59+
5860
def self.empty
5961
new({})
6062
end
@@ -282,7 +284,7 @@ def media_type
282284

283285
# Returns the content length of the request as an integer.
284286
def content_length
285-
return raw_post.bytesize if headers.key?("Transfer-Encoding")
287+
return raw_post.bytesize if has_header?(TRANSFER_ENCODING)
286288
super.to_i
287289
end
288290

@@ -467,7 +469,7 @@ def default_session
467469

468470
def read_body_stream
469471
reset_stream(body_stream) do
470-
if headers.key?("Transfer-Encoding")
472+
if has_header?(TRANSFER_ENCODING)
471473
body_stream.read # Read body stream until EOF if "Transfer-Encoding" is present
472474
else
473475
body_stream.read(content_length)

actionpack/lib/action_dispatch/middleware/request_id.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ class RequestId
2525
def initialize(app, header:)
2626
@app = app
2727
@header = header
28+
@env_header = "HTTP_#{header.upcase.tr("-", "_")}"
2829
end
2930

3031
def call(env)
3132
req = ActionDispatch::Request.new env
32-
req.request_id = make_request_id(req.headers[@header])
33+
req.request_id = make_request_id(req.get_header(@env_header))
3334
@app.call(env).tap { |_status, headers, _body| headers[@header] = req.request_id }
3435
end
3536

0 commit comments

Comments
 (0)