Changeset 58a1449

Timestamp:

2008-03-24T11:01:02Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

66c51bbf, bfe7caa

Parents:

fcd5003

Message:

Fixed a broken check in lib/proxy.c, this restores proxy support. Thanks
to Miles Bader for reporting this in the Debian BTS. Apparently not many
people use this functionality, it was broken in bzr for more than a year
already...

Files:

• debian/changelog (modified) (1 diff)
• lib/proxy.c (modified) (2 diffs)

debian/changelog

@@ -2 +2 @@
 
   * Fixed some packaging issues reported by IRC and e-mail. (Closes: #472373)
+  * Fixed proxy support. (Closes: #472395)
   * Not ready yet.
 

lib/proxy.c

@@ -530 +530 @@
         struct PHB *phb;
         
-        if (!host || !port || (port == -1) || !func || strlen(host) > 128) {
+        if (!host || port <= 0 || !func || strlen(host) > 128) {
                 return -1;
         }
@@ -538 +538 @@
         phb->data = data;
         
-        if ((proxytype == PROXY_NONE) || strlen(proxyhost) > 0 || !proxyport || (proxyport == -1))
+        if (proxytype == PROXY_NONE || !proxyhost[0] || proxyport <= 0)
                 return proxy_connect_none(host, port, phb);
         else if (proxytype == PROXY_HTTP)