From 4dd36897af3c8ce7fc4b836b863a24aa95971022 Mon Sep 17 00:00:00 2001 From: Alexey D Date: Thu, 24 Jun 2021 18:09:26 +0300 Subject: [PATCH] Always dup url_prefix in Connection#build_exclusive_url (#1288) --- lib/faraday/connection.rb | 3 +-- spec/faraday/connection_spec.rb | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/faraday/connection.rb b/lib/faraday/connection.rb index 65ba8cbe8..4e3e2bfd6 100644 --- a/lib/faraday/connection.rb +++ b/lib/faraday/connection.rb @@ -520,9 +520,8 @@ def build_request(method) # @return [URI] def build_exclusive_url(url = nil, params = nil, params_encoder = nil) url = nil if url.respond_to?(:empty?) && url.empty? - base = url_prefix + base = url_prefix.dup if url && base.path && base.path !~ %r{/$} - base = base.dup base.path = "#{base.path}/" # ensure trailing slash end url = url && URI.parse(url.to_s).opaque ? url.to_s.gsub(':', '%3A') : url diff --git a/spec/faraday/connection_spec.rb b/spec/faraday/connection_spec.rb index acbe8a45c..0a1298117 100644 --- a/spec/faraday/connection_spec.rb +++ b/spec/faraday/connection_spec.rb @@ -253,6 +253,13 @@ expect(uri.path).to eq('/sake.html') end + it 'always returns new URI instance' do + conn.url_prefix = 'http://sushi.com' + uri1 = conn.build_exclusive_url(nil) + uri2 = conn.build_exclusive_url(nil) + expect(uri1).not_to equal(uri2) + end + context 'with url_prefixed connection' do let(:url) { 'http://sushi.com/sushi/' }