projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Provide a full set of small application icons for PuTTY, now equipped with
[u/mdw/putty]
/
proxy.c
diff --git
a/proxy.c
b/proxy.c
index
a02fc11
..
475dc4a
100644
(file)
--- a/
proxy.c
+++ b/
proxy.c
@@
-481,8
+481,7
@@
int proxy_http_negotiate (Proxy_Socket p, int change)
sk_write(p->sub_socket, buf2, strlen(buf2));
}
sk_write(p->sub_socket, buf2, strlen(buf2));
}
- sprintf(buf, "\r\n");
- sk_write(p->sub_socket, buf, strlen(buf));
+ sk_write(p->sub_socket, "\r\n", 2);
p->state = 1;
return 0;
p->state = 1;
return 0;
@@
-595,6
+594,7
@@
int proxy_http_negotiate (Proxy_Socket p, int change)
{
bufchain_consume(&p->pending_input_data, eol);
datap += eol;
{
bufchain_consume(&p->pending_input_data, eol);
datap += eol;
+ len -= eol;
eol = get_line_end(datap, len);
}
eol = get_line_end(datap, len);
}
@@
-930,7
+930,7
@@
int proxy_socks5_negotiate (Proxy_Socket p, int change)
char command[22];
int len;
char command[22];
int len;
- if (sk_addrtype(p->remote_addr) == ADDRTYPE_IPV
6
) {
+ if (sk_addrtype(p->remote_addr) == ADDRTYPE_IPV
4
) {
len = 10;
command[3] = 1; /* IPv4 */
} else {
len = 10;
command[3] = 1; /* IPv4 */
} else {