<URL: http://bugs.freeciv.org/Ticket/Display.html?id=16526 >
---------- Forwarded message ----------
From: Marko Lindqvist
Date: 2008/6/19
Subject: Re: [Freeciv-Dev] (PR#16526) Beta1: Metaserver bugs
To: [EMAIL PROTECTED]
2006/4/19 Christian Knoke:
>
> 3. direct access and trying to switch off the proxy
>
> When http_proxy is set in the environement, and I start Freeciv like this:
>
> env http_proxy= civclient -d 3
>
> which is the recommended way to deactivate the proxy access according to
> our FAQ, civclient displays: 'error in http_proxy or metaserver', on the
> status line. It does not recognise that http_proxy is empty and not to be
> used.
Fix for that one attached. I cannot reproduce other issues in this
ticket (connection through proxy not tested). Have they been properly
resolved?
- ML
diff -Nurd -X.diff_ignore freeciv/utility/netintf.c freeciv/utility/netintf.c
--- freeciv/utility/netintf.c 2008-03-09 01:19:16.000000000 +0200
+++ freeciv/utility/netintf.c 2008-06-19 18:16:09.000000000 +0300
@@ -343,12 +343,13 @@
{
const char *purl, *str, *ppath, *pport;
- if ((purl = getenv("http_proxy"))) {
+ if ((purl = getenv("http_proxy")) && purl[0] != '\0') {
if (strncmp(purl, "http://";, strlen("http://";)) != 0) {
return NULL;
}
str = purl;
} else {
+ purl = NULL;
if (strncmp(url, "http://";, strlen("http://";)) != 0) {
return NULL;
}
@@ -356,7 +357,7 @@
}
str += strlen("http://";);
-
+
pport = strchr(str, ':');
ppath = strchr(str, '/');
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
