svn commit: trunk/busybox: networking scripts

[vda at busybox.net]

Author: vda
Date: 2007-01-22 01:14:02 -0800 (Mon, 22 Jan 2007)
New Revision: 17454

Log:
remove obsolete FEATURE_WGET_IP6_LITERAL


Modified:
   trunk/busybox/networking/Config.in
   trunk/busybox/networking/wget.c
   trunk/busybox/scripts/defconfig


Changeset:
Modified: trunk/busybox/networking/Config.in
===================================================================
--- trunk/busybox/networking/Config.in	2007-01-22 09:12:15 UTC (rev 17453)
+++ trunk/busybox/networking/Config.in	2007-01-22 09:14:02 UTC (rev 17454)
@@ -697,13 +697,6 @@
 	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

Modified: trunk/busybox/networking/wget.c
===================================================================
--- trunk/busybox/networking/wget.c	2007-01-22 09:12:15 UTC (rev 17453)
+++ trunk/busybox/networking/wget.c	2007-01-22 09:14:02 UTC (rev 17454)
@@ -260,14 +260,6 @@
 			 * 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 @@
 	}
 
 	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));
-//	}
 }
 
 

Modified: trunk/busybox/scripts/defconfig
===================================================================
--- trunk/busybox/scripts/defconfig	2007-01-22 09:12:15 UTC (rev 17453)
+++ trunk/busybox/scripts/defconfig	2007-01-22 09:14:02 UTC (rev 17454)
@@ -591,7 +591,6 @@
 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