Merge pull request #138 from ntalbott/ssl-port-fix

Do not treat uri's with a port of 4430 as SSL.
jnunemaker · May 5, 2012 · 9c08f47 · 9c08f47
2 parents e7a4aaa + a296b1c
commit 9c08f47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/httparty.rb b/lib/httparty.rb
@@ -415,7 +415,7 @@ def validate_format
 
   def self.normalize_base_uri(url) #:nodoc:
     normalized_url = url.dup
-    use_ssl = (normalized_url =~ /^https/) || normalized_url.include?(':443')
+    use_ssl = (normalized_url =~ /^https/) || (normalized_url =~ /:443\b/)
     ends_with_slash = normalized_url =~ /\/$/
 
     normalized_url.chop! if ends_with_slash

diff --git a/spec/httparty_spec.rb b/spec/httparty_spec.rb
@@ -103,6 +103,11 @@
       HTTParty.normalize_base_uri(uri)
       uri.should == 'http://api.foobar.com'
     end
+
+    it "should not treat uri's with a port of 4430 as ssl" do
+      uri = HTTParty.normalize_base_uri('http://api.foo.com:4430/v1')
+      uri.should == 'http://api.foo.com:4430/v1'
+    end
   end
 
   describe "headers" do