From b7006ddbcbbd9fa3ea5058c5ce66b68d144c4c5b Mon Sep 17 00:00:00 2001
From: Mark Janssen <mark@sig-io.nl>
Date: Fri, 29 Aug 2008 18:01:47 +0000
Subject: [PATCH] Read http_proxy before HTTP_PROXY env var

git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@246 bc163920-b10d-0410-b2c5-a5491ca2ceef
---
 cmdline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmdline.c b/cmdline.c
index c8fc890..15ebe98 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -460,7 +460,7 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
 	}
 
 	if ( args_info->proxy_arg == NULL ) {
-		if ( (tmp = getenv("HTTP_PROXY")) != NULL ) {
+		if ( ((tmp = getenv("http_proxy")) != NULL) || ((tmp = getenv("HTTP_PROXY")) != NULL) ) {
 			int r;
 			char * temp;
 			temp = malloc( 56+1 );