Changeset 2231302 for lib/proxy.c

Timestamp:

2007-11-05T22:59:49Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

be68d99

Parents:

5e2615a (diff), 7435ccf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging from Jelmer.

File:

• lib/proxy.c (modified) (2 diffs)

lib/proxy.c

@@ -211 +211 @@
         }
 
-        if (proxyuser && *proxyuser) {
+        if (strlen(proxyuser) > 0) {
                 char *t1, *t2;
                 t1 = g_strdup_printf("%s:%s", proxyuser, proxypass);
@@ -539 +539 @@
         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)