Added comments that timeouts are in milliseconds.

Author: Leon Barrett

Readme.md

@@ -75,8 +75,8 @@ More example requests:
    :body "{\"json\": \"input\"}"
    :headers {"X-Api-Version" "2"}
    :content-type :json
-   :socket-timeout 1000
-   :conn-timeout 1000
+   :socket-timeout 1000  ;; in milliseconds
+   :conn-timeout 1000    ;; in milliseconds
    :accept :json})
 
 ;; Specifying headers as either a string or collection:
@@ -101,6 +101,10 @@ More example requests:
 ;; Throw an exception if redirected too many times:
 (client/get "http://site.come/redirects-somewhere" {:max-redirects 5 :throw-exceptions true})
 
+;; Throw an exception if the get takes too long. Timeouts in milliseconds.
+(client/get "http://site.come/redirects-somewhere" {:socket-timeout 1000 :conn-timeout 1000})
+
+
 ;; Send form params as a urlencoded body (POST or PUT)
 (client/post "http//site.com" {:form-params {:foo "bar"}})
 ;; Send form params as a json encoded body (POST or PUT)

src/clj_http/core.clj

@@ -171,7 +171,8 @@
    Note that where Ring uses InputStreams for the request and response bodies,
    the clj-http uses ByteArrays for the bodies."
   [{:keys [request-method scheme server-name server-port uri query-string
-           headers body socket-timeout conn-timeout multipart debug debug-body
+           headers body multipart debug debug-body
+           socket-timeout conn-timeout  ;; in milliseconds
            insecure? save-request? proxy-host proxy-port as cookie-store
            retry-handler response-interceptor digest-auth connection-manager
            client-params] :as req}]