summaryrefslogtreecommitdiff
path: root/lib/http_proxy.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-04-26 00:34:22 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-04-26 00:34:22 +0200
commit55c3c02e59d1daf31ec2097f93b8139ddb3fdeb6 (patch)
tree47306104b370502648629d9db757e89d931fad1e /lib/http_proxy.c
parentfb67c977b98d8a7e1fcbed523fe6ce0c06ec1ac8 (diff)
downloadcurl-55c3c02e59d1daf31ec2097f93b8139ddb3fdeb6.tar.gz
http-proxy: remove unused argument from Curl_proxyCONNECT()
Diffstat (limited to 'lib/http_proxy.c')
-rw-r--r--lib/http_proxy.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index d53685f53..3c6a835f6 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -122,8 +122,7 @@ CURLcode Curl_proxy_connect(struct connectdata *conn, int sockindex)
remote_port = conn->conn_to_port;
else
remote_port = conn->remote_port;
- result = Curl_proxyCONNECT(conn, sockindex, hostname,
- remote_port, FALSE);
+ result = Curl_proxyCONNECT(conn, sockindex, hostname, remote_port);
conn->data->req.protop = prot_save;
if(CURLE_OK != result)
return result;
@@ -140,16 +139,12 @@ CURLcode Curl_proxy_connect(struct connectdata *conn, int sockindex)
* Curl_proxyCONNECT() requires that we're connected to a HTTP proxy. This
* function will issue the necessary commands to get a seamless tunnel through
* this proxy. After that, the socket can be used just as a normal socket.
- *
- * 'blocking' set to TRUE means that this function will do the entire CONNECT
- * + response in a blocking fashion. Should be avoided!
*/
CURLcode Curl_proxyCONNECT(struct connectdata *conn,
int sockindex,
const char *hostname,
- int remote_port,
- bool blocking)
+ int remote_port)
{
int subversion=0;
struct Curl_easy *data=conn->data;
@@ -289,13 +284,10 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
return CURLE_RECV_ERROR;
}
- if(!blocking) {
- if(!Curl_conn_data_pending(conn, sockindex))
- /* return so we'll be called again polling-style */
- return CURLE_OK;
- DEBUGF(infof(data,
- "Read response immediately from proxy CONNECT\n"));
- }
+ if(!Curl_conn_data_pending(conn, sockindex))
+ /* return so we'll be called again polling-style */
+ return CURLE_OK;
+ DEBUGF(infof(data, "Read response immediately from proxy CONNECT\n"));
/* at this point, the tunnel_connecting phase is over. */