diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2007-11-14 23:42:07 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2007-11-14 23:42:07 +0000 |
| commit | ebb95b68792dde490a1ea1042209525f176af58d (patch) | |
| tree | 2a980be2b7bea3db77dec209e6ca5f591165885b /lib/proxy.c | |
| parent | a6df0b5d21370549328c7929a008abb68f2ed4db (diff) | |
| parent | 1bf1ae6f25ff56894d67999791802aa864eaa02b (diff) | |
Merging from devel/Jelmer.
Diffstat (limited to 'lib/proxy.c')
| -rw-r--r-- | lib/proxy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/proxy.c b/lib/proxy.c index 7911b06f..dff5d0a4 100644 --- a/lib/proxy.c +++ b/lib/proxy.c @@ -210,7 +210,7 @@ static gboolean http_canwrite(gpointer data, gint source, b_input_condition cond return FALSE; } - if (proxyuser && *proxyuser) { + if (strlen(proxyuser) > 0) { char *t1, *t2; t1 = g_strdup_printf("%s:%s", proxyuser, proxypass); t2 = tobase64(t1); @@ -538,7 +538,7 @@ int proxy_connect(const char *host, int port, b_event_handler func, gpointer dat phb->func = func; phb->data = data; - if ((proxytype == PROXY_NONE) || !proxyhost || !proxyhost[0] || !proxyport || (proxyport == -1)) + if ((proxytype == PROXY_NONE) || strlen(proxyhost) > 0 || !proxyport || (proxyport == -1)) return proxy_connect_none(host, port, phb); else if (proxytype == PROXY_HTTP) return proxy_connect_http(host, port, phb); |