summaryrefslogtreecommitdiff
path: root/src/usr.bin
diff options
context:
space:
mode:
authordjm <>2005-05-20 11:06:58 +0000
committerdjm <>2005-05-20 11:06:58 +0000
commitee77b0e2617f3d20ec936711a68014c5fc7d5929 (patch)
tree9111413ebe0a75a0b89bc36bef5af33202ac1ef9 /src/usr.bin
parent296b05c05bf89b6af555117787f6627f7930107b (diff)
downloadopenbsd-ee77b0e2617f3d20ec936711a68014c5fc7d5929.tar.gz
openbsd-ee77b0e2617f3d20ec936711a68014c5fc7d5929.tar.bz2
openbsd-ee77b0e2617f3d20ec936711a68014c5fc7d5929.zip
HTTP proxy doesn't need an address lookup - saves some time and avoids a
spurious error if the lookup fails. from Ray; ok markus@
Diffstat (limited to 'src/usr.bin')
-rw-r--r--src/usr.bin/nc/socks.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr.bin/nc/socks.c b/src/usr.bin/nc/socks.c
index c665ea731a..ca67c6df59 100644
--- a/src/usr.bin/nc/socks.c
+++ b/src/usr.bin/nc/socks.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: socks.c,v 1.12 2005/05/19 08:40:59 djm Exp $ */ 1/* $OpenBSD: socks.c,v 1.13 2005/05/20 11:06:58 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. 4 * Copyright (c) 1999 Niklas Hallqvist. All rights reserved.
@@ -129,7 +129,9 @@ socks_connect(const char *host, const char *port,
129 if (proxyfd < 0) 129 if (proxyfd < 0)
130 return (-1); 130 return (-1);
131 131
132 serveraddr = decode_addr(host); 132 /* HTTP proxies should use hostnames. (XXX so can SOCKS5) */
133 if (socksv != -1)
134 serveraddr = decode_addr(host);
133 serverport = decode_port(port); 135 serverport = decode_port(port);
134 136
135 if (socksv == 5) { 137 if (socksv == 5) {