diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-22 09:14:02 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-22 09:14:02 +0000 |
commit | 3c99a599155b970a81de26ffcea6f16940324e62 (patch) | |
tree | 03e48132d6b3d9543d7de0622743090deda0f04f | |
parent | d8760a705c66fc8eb8f918d1bd320d04146d134c (diff) | |
download | busybox-w32-3c99a599155b970a81de26ffcea6f16940324e62.tar.gz busybox-w32-3c99a599155b970a81de26ffcea6f16940324e62.tar.bz2 busybox-w32-3c99a599155b970a81de26ffcea6f16940324e62.zip |
remove obsolete FEATURE_WGET_IP6_LITERAL
-rw-r--r-- | networking/Config.in | 7 | ||||
-rw-r--r-- | networking/wget.c | 30 | ||||
-rw-r--r-- | scripts/defconfig | 1 |
3 files changed, 0 insertions, 38 deletions
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 | |||
697 | help | 697 | help |
698 | Support authenticated HTTP transfers. | 698 | Support authenticated HTTP transfers. |
699 | 699 | ||
700 | config FEATURE_WGET_IP6_LITERAL | ||
701 | bool "Enable IPv6 literal addresses" | ||
702 | default y | ||
703 | depends on WGET && FEATURE_IPV6 | ||
704 | help | ||
705 | Support IPv6 address literal notation in URLs. | ||
706 | |||
707 | config FEATURE_WGET_LONG_OPTIONS | 700 | config FEATURE_WGET_LONG_OPTIONS |
708 | bool "Enable long options" | 701 | bool "Enable long options" |
709 | default n | 702 | 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) | |||
260 | * Send HTTP request. | 260 | * Send HTTP request. |
261 | */ | 261 | */ |
262 | if (use_proxy) { | 262 | if (use_proxy) { |
263 | // const char *format = "GET %stp://%s:%d/%s HTTP/1.1\r\n"; | ||
264 | //#if ENABLE_FEATURE_WGET_IP6_LITERAL | ||
265 | // if (strchr(target.host, ':')) | ||
266 | // format = "GET %stp://[%s]:%d/%s HTTP/1.1\r\n"; | ||
267 | //#endif | ||
268 | // fprintf(sfp, format, | ||
269 | // target.is_ftp ? "f" : "ht", target.host, | ||
270 | // ntohs(target.port), target.path); | ||
271 | fprintf(sfp, "GET %stp://%s/%s HTTP/1.1\r\n", | 263 | fprintf(sfp, "GET %stp://%s/%s HTTP/1.1\r\n", |
272 | target.is_ftp ? "f" : "ht", target.host, | 264 | target.is_ftp ? "f" : "ht", target.host, |
273 | target.path); | 265 | target.path); |
@@ -566,28 +558,6 @@ static void parse_url(char *src_url, struct host_info *h) | |||
566 | } | 558 | } |
567 | 559 | ||
568 | sp = h->host; | 560 | sp = h->host; |
569 | |||
570 | //host2sockaddr does this itself | ||
571 | //#if ENABLE_FEATURE_WGET_IP6_LITERAL | ||
572 | // if (sp[0] == '[') { | ||
573 | // char *ep; | ||
574 | // | ||
575 | // ep = sp + 1; | ||
576 | // while (*ep == ':' || isxdigit(*ep)) | ||
577 | // ep++; | ||
578 | // if (*ep == ']') { | ||
579 | // h->host++; | ||
580 | // *ep = '\0'; | ||
581 | // sp = ep + 1; | ||
582 | // } | ||
583 | // } | ||
584 | //#endif | ||
585 | // | ||
586 | // p = strchr(sp, ':'); | ||
587 | // if (p != NULL) { | ||
588 | // *p = '\0'; | ||
589 | // h->port = htons(xatou16(p + 1)); | ||
590 | // } | ||
591 | } | 561 | } |
592 | 562 | ||
593 | 563 | ||
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 | |||
591 | CONFIG_WGET=y | 591 | CONFIG_WGET=y |
592 | CONFIG_FEATURE_WGET_STATUSBAR=y | 592 | CONFIG_FEATURE_WGET_STATUSBAR=y |
593 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | 593 | CONFIG_FEATURE_WGET_AUTHENTICATION=y |
594 | CONFIG_FEATURE_WGET_IP6_LITERAL=y | ||
595 | CONFIG_FEATURE_WGET_LONG_OPTIONS=y | 594 | CONFIG_FEATURE_WGET_LONG_OPTIONS=y |
596 | CONFIG_ZCIP=y | 595 | CONFIG_ZCIP=y |
597 | 596 | ||