Changeset b79308b for lib/proxy.c

Timestamp:

2008-04-14T13:10:53Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

0cab388

Parents:

6cac643 (diff), aa31117 (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:

merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.

File:

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

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)