#include "proxy.h"
#define do_proxy_dns(cfg) \
- (cfg->proxy_dns == 2 || \
- (cfg->proxy_dns == 1 && cfg->proxy_type != PROXY_SOCKS))
+ (cfg->proxy_dns == FORCE_ON || \
+ (cfg->proxy_dns == AUTO && cfg->proxy_type != PROXY_SOCKS))
/*
* Call this when proxy negotiation is complete, so that this
while (exclude_list[s]) {
while (exclude_list[s] &&
- (isspace(exclude_list[s]) ||
+ (isspace((unsigned char)exclude_list[s]) ||
exclude_list[s] == ',')) s++;
if (!exclude_list[s]) break;
e = s;
while (exclude_list[e] &&
- (isalnum(exclude_list[e]) ||
+ (isalnum((unsigned char)exclude_list[e]) ||
exclude_list[e] == '-' ||
exclude_list[e] == '.' ||
exclude_list[e] == '*')) e++;
/* Make sure we really have reached the next comma or end-of-string */
while (exclude_list[s] &&
- !isspace(exclude_list[s]) &&
+ !isspace((unsigned char)exclude_list[s]) &&
exclude_list[s] != ',') s++;
}
int i, j, len;
sprintf(buf, "%s:%s", p->cfg.proxy_username, p->cfg.proxy_password);
len = strlen(buf);
- sprintf(buf2, "Proxy-Authorization: basic ");
+ sprintf(buf2, "Proxy-Authorization: Basic ");
for (i = 0, j = strlen(buf2); i < len; i += 3, j += 4)
base64_encode_atom((unsigned char *)(buf+i),
(len-i > 3 ? 3 : len-i), buf2+j);