Skip to content

LOG-4366: Update net/http patch to include upstream fix #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
syedriko merged 1 commit into from
Nov 8, 2023
Merged

LOG-4366: Update net/http patch to include upstream fix #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion fluentd/log4366_ruby_lib_net_http.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/net/http.rb b/net/http.rb
index 88a174a248..3e76c63503 100644
index 88a174a248..4da8dfa894 100644
--- a/net/http.rb
+++ b/net/http.rb
@@ -589,7 +589,7 @@ def HTTP.start(address, *arg, &block) # :yield: +http+
Expand All @@ -11,3 +11,13 @@ index 88a174a248..3e76c63503 100644
http.ipaddr = opt[:ipaddr] if opt && opt[:ipaddr]

if opt
@@ -642,7 +642,8 @@ def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_p
elsif p_addr == :ENV then
http.proxy_from_env = true
else
- if p_addr && p_no_proxy && !URI::Generic.use_proxy?(p_addr, p_addr, p_port, p_no_proxy)
+ # patched: https://github.com/ruby/net-http/pull/64
+ if p_addr && p_no_proxy && !URI::Generic.use_proxy?(address, address, p_port, p_no_proxy)
p_addr = nil
p_port = nil
end