Merge remote branch 'jli/master'

Author: dakrone

src/clj_http/client.clj

@@ -11,15 +11,14 @@
 (defn update [m k f & args]
   (assoc m k (apply f (m k) args)))
 
-(defn if-pos [v]
-  (if (and v (pos? v)) v))
+(defn when-pos [v]
+  (when (and v (pos? v)) v))
 
 (defn parse-url [url]
   (let [url-parsed (URL. url)]
     {:scheme (.getProtocol url-parsed)
      :server-name (.getHost url-parsed)
-     :server-port (or (if-pos (.getPort url-parsed))
-                      (if (= "https" (.getProtocol url-parsed)) 443 80))
+     :server-port (when-pos (.getPort url-parsed))
      :uri (.getPath url-parsed)
      :user-info (.getUserInfo url-parsed)
      :query-string (.getQuery url-parsed)}))

test/clj_http/client_test.clj

@@ -219,9 +219,9 @@
     (is (= "/foo" (:uri resp)))))
 
 (deftest provide-default-port
-  (is (= 80   (-> "http://example.com/" client/parse-url :server-port)))
+  (is (= nil  (-> "http://example.com/" client/parse-url :server-port)))
   (is (= 8080 (-> "http://example.com:8080/" client/parse-url :server-port)))
-  (is (= 443  (-> "https://example.com/" client/parse-url :server-port)))
+  (is (= nil  (-> "https://example.com/" client/parse-url :server-port)))
   (is (= 8443 (-> "https://example.com:8443/" client/parse-url :server-port))))
 
 (deftest apply-on-form-params