Skip to content

Commit 1424174

Browse files
committed
refactor: change config name to capitalize_headers
1 parent f2cd8e7 commit 1424174

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

lib/net/http.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -507,10 +507,10 @@ class HTTPHeaderSyntaxError < StandardError; end
507507
# Returns the write timeout.
508508
# - {write_timeout=}[rdoc-ref:Net::HTTP#write_timeout=]:
509509
# Sets the write timeout.
510-
# - {:preserve_headers}[rdoc-ref:Net::HTTP#preserve_headers]:
511-
# Returns the open timeout.
512-
# - {:preserve_headers=}[rdoc-ref:Net::HTTP#preserve_headers=]:
513-
# Sets the read timeout.
510+
# - {:capitalize_headers}[rdoc-ref:Net::HTTP#capitalize_headers]:
511+
# Returns the capitalize_headers config.
512+
# - {:capitalize_headers=}[rdoc-ref:Net::HTTP#capitalize_headers=]:
513+
# Sets the capitalize_headers config.
514514
#
515515
# === Requests
516516
#
@@ -1127,7 +1127,7 @@ def initialize(address, port = nil) # :nodoc:
11271127
@ssl_context = nil
11281128
@ssl_session = nil
11291129
@sspi_enabled = false
1130-
@preserve_headers = false
1130+
@capitalize_headers = true
11311131
SSL_IVNAMES.each do |ivname|
11321132
instance_variable_set ivname, nil
11331133
end
@@ -1538,7 +1538,7 @@ def use_ssl=(flag)
15381538
attr_accessor :verify_hostname
15391539

15401540
# Sets or returns whether to preserve the headers case
1541-
attr_accessor :preserve_headers
1541+
attr_accessor :capitalize_headers
15421542

15431543
# Returns the X509 certificate chain (an array of strings)
15441544
# for the session's socket peer,
@@ -2308,7 +2308,7 @@ def request(req, body = nil, &block) # :yield: +response+
23082308
return request(req, body, &block)
23092309
}
23102310
end
2311-
req.preserve_headers = preserve_headers
2311+
req.capitalize_headers = capitalize_headers
23122312
if proxy_user()
23132313
req.proxy_basic_auth proxy_user(), proxy_pass() unless use_ssl?
23142314
end

lib/net/http/generic_request.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def initialize(m, reqbody, resbody, uri_or_path, initheader = nil) # :nodoc:
5555
@body = nil
5656
@body_stream = nil
5757
@body_data = nil
58-
@preserve_headers = false
58+
@capitalize_headers = true
5959
end
6060

6161
# Returns the string method name for the request:
@@ -95,8 +95,8 @@ def initialize(m, reqbody, resbody, uri_or_path, initheader = nil) # :nodoc:
9595
#
9696
attr_reader :decode_content
9797

98-
# Sets if will preserve case from headers
99-
attr_accessor :preserve_headers
98+
# Sets if will capitalize headers
99+
attr_accessor :capitalize_headers
100100

101101
# Returns a string representation of the request:
102102
#
@@ -407,12 +407,12 @@ def write_header(sock, ver, path)
407407
end
408408
buf = +''
409409
buf << reqline << "\r\n"
410-
if preserve_headers
411-
each_header do |k,v|
410+
if capitalize_headers
411+
each_capitalized do |k,v|
412412
buf << "#{k}: #{v}\r\n"
413413
end
414414
else
415-
each_capitalized do |k,v|
415+
each_header do |k,v|
416416
buf << "#{k}: #{v}\r\n"
417417
end
418418
end

test/net/http/test_http.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@ def test_partial_response
13681368
assert_raise(EOFError) {http.get('/')}
13691369
end
13701370

1371-
def test_no_preserved_headers
1371+
def test_capitalized_headers
13721372
headers = { accept: '*/*' }
13731373
expected_raw_header = "Accept: */*\r\n"
13741374
@server.mount_proc('/') do |req, _res|
@@ -1379,15 +1379,15 @@ def test_no_preserved_headers
13791379
http.get('/', headers)
13801380
end
13811381

1382-
def test_preserved_headers
1382+
def test_no_capitalized_headers
13831383
headers = { accept: '*/*' }
13841384
expected_raw_header = "accept: */*\r\n"
13851385
@server.mount_proc('/') do |req, _res|
13861386
assert_includes(req.raw_header, expected_raw_header)
13871387
end
13881388

13891389
http = Net::HTTP.new(config('host'), config('port'))
1390-
http.preserve_headers = true
1390+
http.capitalize_headers = false
13911391
http.get('/', headers)
13921392
end
13931393
end

0 commit comments

Comments
 (0)