Update changelog and minor whitespace changes

Author: dakrone

changelog.org

@@ -308,6 +308,9 @@
 * Work log
   Log of merges/issues/work that's gone in so I know what to put in
   the changelog for the next release
+** 2013-07-18
+   - merged https://github.com/dakrone/clj-http/pull/146 to correctly
+     reference parameter names
 ** Released 0.7.5
 ** 2013-07-10
    - Only redirect if a "location" header is actually, present, avoiding an

src/clj_http/core.clj

@@ -131,8 +131,8 @@
                         k (cond
                            (and (not= ClientPNames/CONN_MANAGER_TIMEOUT k)
                                 (instance? Long v))
-                                      (Integer. ^Long v)
-                            true v)))))
+                           (Integer. ^Long v)
+                           true v)))))
 
 
 (defn- coerce-body-entity
@@ -224,12 +224,13 @@
        (proxy [HttpRequestRetryHandler] []
          (retryRequest [e cnt context]
            (retry-handler e cnt context)))))
-    (add-client-params! http-client
-                        ;; merge in map of specified timeouts, to
-                        ;; support backward compatiblity.
-                        (merge {CoreConnectionPNames/SO_TIMEOUT socket-timeout
-                                CoreConnectionPNames/CONNECTION_TIMEOUT conn-timeout}
-                               client-params))
+    (add-client-params!
+     http-client
+     ;; merge in map of specified timeouts, to
+     ;; support backward compatiblity.
+     (merge {CoreConnectionPNames/SO_TIMEOUT socket-timeout
+             CoreConnectionPNames/CONNECTION_TIMEOUT conn-timeout}
+            client-params))
 
     (when-let [[user pass] digest-auth]
       (.setCredentials

test/clj_http/test/core.clj

@@ -438,13 +438,14 @@
 
 ;; Regression, get notified if something changes
 (deftest ^{:integration true} t-known-client-params-are-unchanged
-  (let [params [
-        "http.socket.timeout"                     CoreConnectionPNames/SO_TIMEOUT
-        "http.connection.timeout"                 CoreConnectionPNames/CONNECTION_TIMEOUT
-        "http.protocol.version"                   CoreProtocolPNames/PROTOCOL_VERSION
-        "http.useragent"                          CoreProtocolPNames/USER_AGENT
-        "http.conn-manager.timeout"               ClientPNames/CONN_MANAGER_TIMEOUT
-        "http.protocol.allow-circular-redirects"  ClientPNames/ALLOW_CIRCULAR_REDIRECTS]]
+  (let [params ["http.socket.timeout" CoreConnectionPNames/SO_TIMEOUT
+                "http.connection.timeout"
+                CoreConnectionPNames/CONNECTION_TIMEOUT
+                "http.protocol.version" CoreProtocolPNames/PROTOCOL_VERSION
+                "http.useragent" CoreProtocolPNames/USER_AGENT
+                "http.conn-manager.timeout" ClientPNames/CONN_MANAGER_TIMEOUT
+                "http.protocol.allow-circular-redirects"
+                ClientPNames/ALLOW_CIRCULAR_REDIRECTS]]
     (doseq [[plaintext constant] (partition 2 params)]
       (is (= plaintext constant)))))