Merged changes and modified them slightly. In particular, the class already

has a timeout parameter, so the connect() call should use that rather than adding another.

Merged changes and modified them slightly. In particular, the class already
has a timeout parameter, so the connect() call should use that rather than adding another.
5b36df00 · Davis King · 98910caa · e0cabc89 · 5b36df00
Commit 5b36df00 authored Apr 06, 2015 by Davis King
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

dlib/http_client/http_client.cpp dlib/http_client/http_client.cpp +4 -1

No files found.
--- a/dlib/http_client/http_client.cpp
+++ b/dlib/http_client/http_client.cpp
@@ -553,7 +553,10 @@ namespace dlib
            dlib::connection * conn(0);
            try
            {
-                conn = dlib::connect(host, port);
+                if (timeout > 0)
+                    conn = dlib::connect(host, port, timeout);
+                else
+                    conn = dlib::connect(host, port);
            }
            catch (const dlib::socket_error& e)
            {