diff options
| author | Xin LI <delphij@FreeBSD.org> | 2007-03-28 01:55:49 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2007-03-28 01:55:49 +0000 |
| commit | c262af8430fb030fbcd11b0c34333abe73308d64 (patch) | |
| tree | 6428088c0b5427e935f829f6e3def49e3e484caf /contrib/netcat | |
| parent | 77c78838f0e35af9a8ed30b09708c529b63a478c (diff) | |
| parent | b2f6436d8f7147ff2b48cd694b1f70130a384c97 (diff) | |
| download | src-c262af8430fb030fbcd11b0c34333abe73308d64.tar.gz src-c262af8430fb030fbcd11b0c34333abe73308d64.zip | |
This commit was generated by cvs2svn to compensate for changes in r167961,
which included commits to RCS files with non-trunk default branches.
Notes
Notes:
svn path=/head/; revision=167962
Diffstat (limited to 'contrib/netcat')
| -rw-r--r-- | contrib/netcat/socks.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/netcat/socks.c b/contrib/netcat/socks.c index daed99712e3f..da7bd0c60e6d 100644 --- a/contrib/netcat/socks.c +++ b/contrib/netcat/socks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: socks.c,v 1.16 2006/01/25 23:21:37 djm Exp $ */ +/* $OpenBSD: socks.c,v 1.17 2006/09/25 04:51:20 ray Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. @@ -307,7 +307,8 @@ socks_connect(const char *host, const char *port, } close(proxyfd); goto again; - } else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0) + } else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 && + strncmp(buf, "HTTP/1.1 200 ", 12) != 0) errx(1, "Proxy error: \"%s\"", buf); /* Headers continue until we hit an empty line */ |