Index: configure.ac =================================================================== RCS file: /cvsroot/curl/curl/configure.ac,v retrieving revision 1.186 diff -d -u -r1.186 configure.ac --- configure.ac 23 Dec 2005 22:33:06 -0000 1.186 +++ configure.ac 16 Jan 2006 19:29:04 -0000 @@ -185,10 +185,8 @@ no) AC_MSG_RESULT(no) AC_DEFINE(CURL_DISABLE_HTTP, 1, [to disable HTTP]) - AC_MSG_WARN([disable HTTP disables FTP over proxy and GOPHER too]) - AC_DEFINE(CURL_DISABLE_GOPHER, 1, [to disable GOPHER]) + AC_MSG_WARN([disable HTTP disables FTP over proxy]) AC_SUBST(CURL_DISABLE_HTTP, [1]) - AC_SUBST(CURL_DISABLE_GOPHER, [1]) ;; *) AC_MSG_RESULT(yes) ;; @@ -210,21 +208,6 @@ esac ], AC_MSG_RESULT(yes) ) -AC_MSG_CHECKING([whether to support gopher]) -AC_ARG_ENABLE(gopher, -AC_HELP_STRING([--enable-gopher],[Enable GOPHER support]) -AC_HELP_STRING([--disable-gopher],[Disable GOPHER support]), -[ case "$enableval" in - no) - AC_MSG_RESULT(no) - AC_DEFINE(CURL_DISABLE_GOPHER, 1, [to disable GOPHER]) - AC_SUBST(CURL_DISABLE_GOPHER, [1]) - ;; - *) AC_MSG_RESULT(yes) - ;; - esac ], - AC_MSG_RESULT(yes) -) AC_MSG_CHECKING([whether to support file]) AC_ARG_ENABLE(file, AC_HELP_STRING([--enable-file],[Enable FILE support]) Index: curl-config.in =================================================================== RCS file: /cvsroot/curl/curl/curl-config.in,v retrieving revision 1.23 diff -d -u -r1.23 curl-config.in --- curl-config.in 4 Sep 2005 18:15:24 -0000 1.23 +++ curl-config.in 16 Jan 2006 19:29:04 -0000 @@ -101,9 +101,6 @@ echo "FTPS" fi fi - if test "@CURL_DISABLE_GOPHER@" != "1"; then - echo "GOPHER" - fi if test "@CURL_DISABLE_FILE@" != "1"; then echo "FILE" fi Index: docs/FAQ =================================================================== RCS file: /cvsroot/curl/curl/docs/FAQ,v retrieving revision 1.109 diff -d -u -r1.109 FAQ --- docs/FAQ 2 Nov 2005 09:38:58 -0000 1.109 +++ docs/FAQ 16 Jan 2006 19:29:06 -0000 @@ -114,7 +114,7 @@ libcurl A free and easy-to-use client-side URL transfer library, supporting FTP, - FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. libcurl supports + FTPS, HTTP, HTTPS, TELNET, DICT, FILE and LDAP. libcurl supports HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos, HTTP form based upload, proxies, cookies, user+password authentication, file transfer resume, http proxy tunneling and more! @@ -132,8 +132,7 @@ A command line tool for getting or sending files using URL syntax. Since curl uses libcurl, it supports a range of common Internet protocols, - currently including HTTP, HTTPS, FTP, FTPS, GOPHER, LDAP, DICT, TELNET and - FILE. + currently including HTTP, HTTPS, FTP, FTPS, LDAP, DICT, TELNET and FILE. We pronounce curl and cURL with an initial k sound: [kurl]. Index: docs/FEATURES =================================================================== RCS file: /cvsroot/curl/curl/docs/FEATURES,v retrieving revision 1.16 diff -d -u -r1.16 FEATURES --- docs/FEATURES 17 Nov 2005 14:28:58 -0000 1.16 +++ docs/FEATURES 16 Jan 2006 19:29:06 -0000 @@ -109,10 +109,6 @@ DICT - extended DICT URL support -GOPHER - - GET - - via http-proxy - FILE - URL support - "uploads" Index: docs/INSTALL =================================================================== RCS file: /cvsroot/curl/curl/docs/INSTALL,v retrieving revision 1.63 diff -d -u -r1.63 INSTALL --- docs/INSTALL 29 Oct 2005 22:18:58 -0000 1.63 +++ docs/INSTALL 16 Jan 2006 19:29:07 -0000 @@ -260,7 +260,6 @@ CURL_DISABLE_TELNET disables TELNET CURL_DISABLE_DICT disables DICT CURL_DISABLE_FILE disables FILE - CURL_DISABLE_GOPHER disables GOPHER If you want to set any of these defines you have the following possibilities: Index: docs/MANUAL =================================================================== RCS file: /cvsroot/curl/curl/docs/MANUAL,v retrieving revision 1.29 diff -d -u -r1.29 MANUAL --- docs/MANUAL 12 Mar 2005 19:39:27 -0000 1.29 +++ docs/MANUAL 16 Jan 2006 19:29:07 -0000 @@ -23,10 +23,6 @@ curl ftp://cool.haxx.se/ - Get a gopher document from funet's gopher server: - - curl gopher://gopher.funet.fi - Get the definition of curl from a dictionary: curl dict://dict.org/m:curl @@ -94,10 +90,6 @@ Probably most commonly used with private certificates, as explained below. - GOPHER - - Curl features no password support for gopher. - PROXY Get an ftp file using a proxy named my-proxy that uses port 888: @@ -748,7 +740,7 @@ Curl reads and understands the following environment variables: - http_proxy, HTTPS_PROXY, FTP_PROXY, GOPHER_PROXY + http_proxy, HTTPS_PROXY, FTP_PROXY They should be set for protocol-specific proxies. General proxy should be set with Index: docs/curl-config.1 =================================================================== RCS file: /cvsroot/curl/curl/docs/curl-config.1,v retrieving revision 1.12 diff -d -u -r1.12 curl-config.1 --- docs/curl-config.1 28 Oct 2005 12:59:37 -0000 1.12 +++ docs/curl-config.1 16 Jan 2006 19:29:08 -0000 @@ -53,10 +53,10 @@ on. The prefix is set with "configure --prefix". .IP "--protocols" Lists what particular protocols the installed libcurl was built to support. At -the time of writing, this list may include HTTP, HTTPS, FTP, FTPS, GOPHER, -FILE, TELNET, LDAP, DICT. Do not assume any particular order. The protocols -will be listed using uppercase and are separated by newlines. There may be -none, one or several protocols in the list. (Added in 7.13.0) +the time of writing, this list may include HTTP, HTTPS, FTP, FTPS, FILE, +TELNET, LDAP, DICT. Do not assume any particular order. The protocols will +be listed using uppercase and are separated by newlines. There may be none, +one or several protocols in the list. (Added in 7.13.0) .IP "--version" Outputs version information about the installed libcurl. .IP "--vernum" Index: docs/curl.1 =================================================================== RCS file: /cvsroot/curl/curl/docs/curl.1,v retrieving revision 1.172 diff -d -u -r1.172 curl.1 --- docs/curl.1 16 Jan 2006 00:00:28 -0000 1.172 +++ docs/curl.1 16 Jan 2006 19:29:09 -0000 @@ -30,8 +30,8 @@ .SH DESCRIPTION .B curl is a tool to transfer data from or to a server, using one of the supported -protocols (HTTP, HTTPS, FTP, FTPS, TFTP, GOPHER, DICT, TELNET, LDAP or -FILE). The command is designed to work without user interaction. +protocols (HTTP, HTTPS, FTP, FTPS, TFTP, DICT, TELNET, LDAP or FILE). +The command is designed to work without user interaction. curl offers a busload of useful tricks like proxy support, user authentication, ftp upload, HTTP post, SSL (https:) connections, cookies, file @@ -1198,8 +1198,6 @@ Sets proxy server to use for HTTPS. .IP "FTP_PROXY [protocol://][:port]" Sets proxy server to use for FTP. -.IP "GOPHER_PROXY [protocol://][:port]" -Sets proxy server to use for GOPHER. .IP "ALL_PROXY [protocol://][:port]" Sets proxy server to use if no protocol-specific proxy is set. .IP "NO_PROXY " Index: docs/libcurl/libcurl.m4 =================================================================== RCS file: /cvsroot/curl/curl/docs/libcurl/libcurl.m4,v retrieving revision 1.2 diff -d -u -r1.2 libcurl.m4 --- docs/libcurl/libcurl.m4 22 Jun 2005 06:58:11 -0000 1.2 +++ docs/libcurl/libcurl.m4 16 Jan 2006 19:29:09 -0000 @@ -46,7 +46,6 @@ AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS]) AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP]) AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS]) - AH_TEMPLATE([LIBCURL_PROTOCOL_GOPHER],[Defined if libcurl supports GOPHER]) AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE]) AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET]) AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP]) @@ -188,7 +187,7 @@ # We don't have --protocols, so just assume that all # protocols are available - _libcurl_protocols="HTTP FTP GOPHER FILE TELNET LDAP DICT" + _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT" if test x$libcurl_feature_SSL = xyes ; then _libcurl_protocols="$_libcurl_protocols HTTPS" Index: lib/setup.h =================================================================== RCS file: /cvsroot/curl/curl/lib/setup.h,v retrieving revision 1.105 diff -d -u -r1.105 setup.h --- lib/setup.h 9 Jan 2006 13:17:14 -0000 1.105 +++ lib/setup.h 16 Jan 2006 19:29:09 -0000 @@ -30,7 +30,6 @@ #define CURL_DISABLE_TELNET #define CURL_DISABLE_DICT #define CURL_DISABLE_FILE -#define CURL_DISABLE_GOPHER #endif /* HTTP_ONLY */ #if !defined(WIN32) && defined(__WIN32__) @@ -357,10 +356,6 @@ #endif #endif -#if defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_GOPHER) -#define CURL_DISABLE_GOPHER -#endif - #ifdef CURLDEBUG #define DEBUGF(x) x #else Index: lib/url.c =================================================================== RCS file: /cvsroot/curl/curl/lib/url.c,v retrieving revision 1.486 diff -d -u -r1.486 url.c --- lib/url.c 20 Dec 2005 22:46:12 -0000 1.486 +++ lib/url.c 16 Jan 2006 19:29:10 -0000 @@ -2485,14 +2485,12 @@ /* Note: if you add a new protocol, please update the list in * lib/version.c too! */ - if(checkprefix("GOPHER.", conn->host.name)) - strcpy(conn->protostr, "gopher"); + if(checkprefix("FTP.", conn->host.name)) + strcpy(conn->protostr, "ftp"); #ifdef USE_SSL else if(checkprefix("FTPS", conn->host.name)) strcpy(conn->protostr, "ftps"); #endif /* USE_SSL */ - else if(checkprefix("FTP.", conn->host.name)) - strcpy(conn->protostr, "ftp"); else if(checkprefix("TELNET.", conn->host.name)) strcpy(conn->protostr, "telnet"); else if (checkprefix("DICT.", conn->host.name)) @@ -2596,7 +2594,6 @@ * http_proxy=http://some.server.dom:port/ * https_proxy=http://some.server.dom:port/ * ftp_proxy=http://some.server.dom:port/ - * gopher_proxy=http://some.server.dom:port/ * no_proxy=domain1.dom,host.domain2.dom * (a comma-separated list of hosts which should * not be proxied, or an asterisk to override @@ -2779,25 +2776,6 @@ return CURLE_UNSUPPORTED_PROTOCOL; #endif /* !USE_SSL */ } - else if (strequal(conn->protostr, "GOPHER")) { -#ifndef CURL_DISABLE_GOPHER - conn->port = PORT_GOPHER; - conn->remote_port = PORT_GOPHER; - /* Skip // in path if present */ - if (isdigit((int)conn->path[1])) { - conn->path = strchr(&conn->path[1], '/'); - if (conn->path == NULL) - conn->path = conn->pathbuffer; - } - conn->protocol |= PROT_GOPHER; - conn->curl_do = Curl_http; - conn->curl_do_more = NULL; - conn->curl_done = Curl_http_done; -#else - failf(data, LIBCURL_NAME - " was built with GOPHER disabled, gopher: not supported!"); -#endif - } else if(strequal(conn->protostr, "FTP") || strequal(conn->protostr, "FTPS")) { Index: lib/urldata.h =================================================================== RCS file: /cvsroot/curl/curl/lib/urldata.h,v retrieving revision 1.276 diff -d -u -r1.276 urldata.h --- lib/urldata.h 10 Jan 2006 23:03:22 -0000 1.276 +++ lib/urldata.h 16 Jan 2006 19:29:11 -0000 @@ -30,7 +30,6 @@ #define PORT_FTP 21 #define PORT_FTPS 990 #define PORT_TELNET 23 -#define PORT_GOPHER 70 #define PORT_HTTP 80 #define PORT_HTTPS 443 #define PORT_DICT 2628 @@ -541,7 +540,6 @@ long protocol; /* PROT_* flags concerning the protocol set */ #define PROT_MISSING (1<<0) -#define PROT_GOPHER (1<<1) #define PROT_HTTP (1<<2) #define PROT_HTTPS (1<<3) #define PROT_FTP (1<<4) @@ -703,7 +701,6 @@ /* previously this was in the urldata struct */ union { struct HTTP *http; - struct HTTP *gopher; /* alias, just for the sake of being more readable */ struct HTTP *https; /* alias, just for the sake of being more readable */ struct FTP *ftp; void *tftp; /* private for tftp.c-eyes only */ Index: lib/version.c =================================================================== RCS file: /cvsroot/curl/curl/lib/version.c,v retrieving revision 1.46 diff -d -u -r1.46 version.c --- lib/version.c 2 Sep 2005 15:11:09 -0000 1.46 +++ lib/version.c 16 Jan 2006 19:29:11 -0000 @@ -87,9 +87,6 @@ #ifndef CURL_DISABLE_FTP "ftp", #endif -#ifndef CURL_DISABLE_GOPHER - "gopher", -#endif #ifndef CURL_DISABLE_TELNET "telnet", #endif Index: packages/Linux/RPM/curl-ssl.spec.in =================================================================== RCS file: /cvsroot/curl/curl/packages/Linux/RPM/curl-ssl.spec.in,v retrieving revision 1.3 diff -d -u -r1.3 curl-ssl.spec.in --- packages/Linux/RPM/curl-ssl.spec.in 9 Feb 2004 10:24:55 -0000 1.3 +++ packages/Linux/RPM/curl-ssl.spec.in 16 Jan 2006 19:29:11 -0000 @@ -5,7 +5,7 @@ %define curlroot %{_builddir}/%{tarball}-%{version} -Summary: get a file from a FTP, GOPHER or HTTP server. +Summary: get a file from an FTP or HTTP server. Name: %{name} Version: %{version} Release: %{release} Index: packages/Linux/RPM/curl.spec.in =================================================================== RCS file: /cvsroot/curl/curl/packages/Linux/RPM/curl.spec.in,v retrieving revision 1.2 diff -d -u -r1.2 curl.spec.in --- packages/Linux/RPM/curl.spec.in 8 Jan 2001 23:35:45 -0000 1.2 +++ packages/Linux/RPM/curl.spec.in 16 Jan 2006 19:29:11 -0000 @@ -5,7 +5,7 @@ %define builddir $RPM_BUILD_DIR/%{name}-%{version} -Summary: get a file from a FTP, GOPHER or HTTP server. +Summary: get a file from an FTP or HTTP server. Name: %{name} Version: %{version} Release: %{release} Index: packages/Win32/cygwin/README =================================================================== RCS file: /cvsroot/curl/curl/packages/Win32/cygwin/README,v retrieving revision 1.9 diff -d -u -r1.9 README --- packages/Win32/cygwin/README 23 Mar 2004 14:34:09 -0000 1.9 +++ packages/Win32/cygwin/README 16 Jan 2006 19:29:11 -0000 @@ -1,5 +1,5 @@ Curl is a tool for transferring files with URL syntax, supporting - FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. + FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE and LDAP. Curl supports HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos, HTTP form based upload, proxies, cookies, user+password authentication, file transfer resume, @@ -91,7 +91,7 @@ @ curl sdesc: "a client that groks URLs" ldesc: "Curl is a tool for transferring files with URL syntax, - supporting FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE + supporting FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE and LDAP. Curl supports HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos, HTTP form based upload, proxies, cookies, user+password authentication, file transfer resume, Index: perl/contrib/checklinks.pl.in =================================================================== RCS file: /cvsroot/curl/curl/perl/contrib/checklinks.pl.in,v retrieving revision 1.1 diff -d -u -r1.1 checklinks.pl.in --- perl/contrib/checklinks.pl.in 16 Mar 2001 13:04:57 -0000 1.1 +++ perl/contrib/checklinks.pl.in 16 Jan 2006 19:29:11 -0000 @@ -269,7 +269,7 @@ if($url =~ /^([^:]+):/) { $prot = $1; -# if($prot !~ /(http|ftp|gopher)/i) { +# if($prot !~ /(http|ftp)/i) { if($prot !~ /http/i) { # this is an unsupported protocol, we ignore this next linkloop; Index: tests/README =================================================================== RCS file: /cvsroot/curl/curl/tests/README,v retrieving revision 1.23 diff -d -u -r1.23 README --- tests/README 20 Feb 2004 07:05:10 -0000 1.23 +++ tests/README 16 Jan 2006 19:29:11 -0000 @@ -85,4 +85,4 @@ TODO: - * Add tests for TELNET, GOPHER, LDAP, DICT... + * Add tests for TELNET, LDAP, DICT... Index: tests/runtests.pl =================================================================== RCS file: /cvsroot/curl/curl/tests/runtests.pl,v retrieving revision 1.199 diff -d -u -r1.199 runtests.pl --- tests/runtests.pl 13 Jan 2006 12:16:16 -0000 1.199 +++ tests/runtests.pl 16 Jan 2006 19:29:12 -0000 @@ -204,7 +204,7 @@ # to prevent them to interfere with our testing! my $protocol; -foreach $protocol (('ftp', 'http', 'ftps', 'https', 'gopher', 'no')) { +foreach $protocol (('ftp', 'http', 'ftps', 'https', 'no')) { my $proxy = "${protocol}_proxy"; # clear lowercase version $ENV{$proxy}=undef;