From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Mon, 22 Jan 2007 09:14:02 +0000 (-0000)
Subject: remove obsolete FEATURE_WGET_IP6_LITERAL
X-Git-Tag: 1_5_1~322
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3c99a599155b970a81de26ffcea6f16940324e62;p=oweals%2Fbusybox.git

remove obsolete FEATURE_WGET_IP6_LITERAL
---

diff --git a/networking/Config.in b/networking/Config.in
index 88ccb16ab..3b00f03ef 100644
--- a/networking/Config.in
+++ b/networking/Config.in
@@ -697,13 +697,6 @@ config FEATURE_WGET_AUTHENTICATION
 	help
 	  Support authenticated HTTP transfers.
 
-config FEATURE_WGET_IP6_LITERAL
-	bool "Enable IPv6 literal addresses"
-	default y
-	depends on WGET && FEATURE_IPV6
-	help
-	  Support IPv6 address literal notation in URLs.
-
 config FEATURE_WGET_LONG_OPTIONS
 	bool "Enable long options"
 	default n
diff --git a/networking/wget.c b/networking/wget.c
index cc768db8b..056d2c7fc 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -260,14 +260,6 @@ int wget_main(int argc, char **argv)
 			 * Send HTTP request.
 			 */
 			if (use_proxy) {
-//				const char *format = "GET %stp://%s:%d/%s HTTP/1.1\r\n";
-//#if ENABLE_FEATURE_WGET_IP6_LITERAL
-//				if (strchr(target.host, ':'))
-//					format = "GET %stp://[%s]:%d/%s HTTP/1.1\r\n";
-//#endif
-//				fprintf(sfp, format,
-//					target.is_ftp ? "f" : "ht", target.host,
-//					ntohs(target.port), target.path);
 				fprintf(sfp, "GET %stp://%s/%s HTTP/1.1\r\n",
 					target.is_ftp ? "f" : "ht", target.host,
 					target.path);
@@ -566,28 +558,6 @@ static void parse_url(char *src_url, struct host_info *h)
 	}
 
 	sp = h->host;
-
-//host2sockaddr does this itself
-//#if ENABLE_FEATURE_WGET_IP6_LITERAL
-//	if (sp[0] == '[') {
-//		char *ep;
-//
-//		ep = sp + 1;
-//		while (*ep == ':' || isxdigit(*ep))
-//			ep++;
-//		if (*ep == ']') {
-//			h->host++;
-//			*ep = '\0';
-//			sp = ep + 1;
-//		}
-//	}
-//#endif
-//
-//	p = strchr(sp, ':');
-//	if (p != NULL) {
-//		*p = '\0';
-//		h->port = htons(xatou16(p + 1));
-//	}
 }
 
 
diff --git a/scripts/defconfig b/scripts/defconfig
index 10a6039b7..8f15481de 100644
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -591,7 +591,6 @@ CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_IP6_LITERAL=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 CONFIG_ZCIP=y