Make SetProxy behave like curl's CURLOPT_PROXY

mrtazz · mrtazz · commit ba91bffcded6 · 2017-04-22T21:06:25.000-04:00
this changes the behaviour of SetProxy from just returning on an empty string to assigning it. This emulates the curl behaviour of disabling the proxy on an empty string. fixes mrtazz#73
diff --git a/source/connection.cc b/source/connection.cc
@@ -249,16 +249,13 @@ RestClient::Connection::SetKeyPassword(const std::string& keyPassword) {
  */
 void
 RestClient::Connection::SetProxy(const std::string& uriProxy) {
-  if (uriProxy.empty()) {
-    return;
-  }
 
   std::string uriProxyUpper = uriProxy;
   // check if the provided address is prefixed with "http"
   std::transform(uriProxyUpper.begin(), uriProxyUpper.end(),
     uriProxyUpper.begin(), ::toupper);
 
-  if (uriProxyUpper.compare(0, 4, "HTTP") != 0) {
+  if ((uriProxy.length() > 0) && (uriProxyUpper.compare(0, 4, "HTTP") != 0)) {
     this->uriProxy = "http://" + uriProxy;
   } else {
     this->uriProxy = uriProxy;
diff --git a/test/test_connection.cc b/test/test_connection.cc
@@ -224,6 +224,14 @@ TEST_F(ConnectionTest, TestProxy)
   EXPECT_EQ(200, res.code);
 }
 
+TEST_F(ConnectionTest, TestUnSetProxy)
+{
+  conn->SetProxy("127.0.0.1:3128");
+  conn->SetProxy("");
+  RestClient::Response res = conn->get("/get");
+  EXPECT_EQ(200, res.code);
+}
+
 TEST_F(ConnectionTest, TestProxyAddressPrefixed)
 {
   conn->SetProxy("http://127.0.0.1:3128");

Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,14 @@ TEST_F(ConnectionTest, TestProxy)`
`224`	`224`	`EXPECT_EQ(200, res.code);`
`225`	`225`	`}`
`226`	`226`
	`227`	`+TEST_F(ConnectionTest, TestUnSetProxy)`
	`228`	`+{`
	`229`	`+ conn->SetProxy("127.0.0.1:3128");`
	`230`	`+ conn->SetProxy("");`
	`231`	`+ RestClient::Response res = conn->get("/get");`
	`232`	`+ EXPECT_EQ(200, res.code);`
	`233`	`+}`
	`234`	`+`
`227`	`235`	`TEST_F(ConnectionTest, TestProxyAddressPrefixed)`
`228`	`236`	`{`
`229`	`237`	`conn->SetProxy("http://127.0.0.1:3128");`