[axel-commits] r33 - /trunk/conf.c

[appaji-guest at users.alioth.debian.org]

Author: appaji-guest
Date: Fri Sep 12 07:43:20 2008
New Revision: 33

URL: http://svn.debian.org/wsvn/axel/?sc=1&rev=33
Log:
Honour http_proxy and prefer it over HTTP_PROXY.
Based on a patch from Philipp Hagemeister for #310880

Modified:
    trunk/conf.c

Modified: trunk/conf.c
URL: http://svn.debian.org/wsvn/axel/trunk/conf.c?rev=33&op=diff
==============================================================================
--- trunk/conf.c (original)
+++ trunk/conf.c Fri Sep 12 07:43:20 2008
@@ -146,7 +146,9 @@
 	memset( conf->interfaces, 0, sizeof( if_t ) );
 	conf->interfaces->next = conf->interfaces;
 	
-	if( ( s2 = getenv( "HTTP_PROXY" ) ) != NULL )
+	if( ( s2 = getenv( "http_proxy" ) ) != NULL )
+		strncpy( conf->http_proxy, s2, MAX_STRING );
+  else if( ( s2 = getenv( "HTTP_PROXY" ) ) != NULL )
 		strncpy( conf->http_proxy, s2, MAX_STRING );
 	
 	if( !conf_loadfile( conf, ETCDIR "/axelrc" ) )