diff options
| -rw-r--r-- | apps/s_client.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 2b248be485..a914238642 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -703,7 +703,6 @@ typedef enum PROTOCOL_choice { PROTO_TELNET, PROTO_XMPP, PROTO_XMPP_SERVER, - PROTO_CONNECT, PROTO_IRC, PROTO_MYSQL, PROTO_POSTGRES, @@ -986,7 +985,6 @@ int s_client_main(int argc, char **argv) break; case OPT_PROXY: proxystr = opt_arg(); - starttls_proto = PROTO_CONNECT; break; case OPT_PROXY_USER: proxyuser = opt_arg(); @@ -2157,6 +2155,13 @@ int s_client_main(int argc, char **argv) sbuf_len = 0; sbuf_off = 0; + if (proxystr != NULL) { + /* Here we must use the connect string target host & port */ + if (!OSSL_HTTP_proxy_connect(sbio, thost, tport, proxyuser, proxypass, + 0 /* no timeout */, bio_err, prog)) + goto shut; + } + switch ((PROTOCOL_CHOICE) starttls_proto) { case PROTO_OFF: break; @@ -2344,12 +2349,6 @@ int s_client_main(int argc, char **argv) goto shut; } break; - case PROTO_CONNECT: - /* Here we must use the connect string target host & port */ - if (!OSSL_HTTP_proxy_connect(sbio, thost, tport, proxyuser, proxypass, - 0 /* no timeout */, bio_err, prog)) - goto shut; - break; case PROTO_IRC: { int numeric; |