Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP4:GA
squid
gopher_removal.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gopher_removal.patch of Package squid
Index: squid-3.5.21/doc/debug-sections.txt =================================================================== --- squid-3.5.21.orig/doc/debug-sections.txt +++ squid-3.5.21/doc/debug-sections.txt @@ -27,7 +27,6 @@ section 06 Disk I/O Routines section 07 Multicast section 08 Swap File Bitmap section 09 File Transfer Protocol (FTP) -section 10 Gopher section 11 Hypertext Transfer Protocol (HTTP) section 12 Internet Cache Protocol (ICP) section 13 High Level Memory Pool Management Index: squid-3.5.21/src/FwdState.cc =================================================================== --- squid-3.5.21.orig/src/FwdState.cc +++ squid-3.5.21/src/FwdState.cc @@ -28,7 +28,6 @@ #include "fde.h" #include "FwdState.h" #include "globals.h" -#include "gopher.h" #include "hier_code.h" #include "http.h" #include "HttpReply.h" @@ -981,10 +980,6 @@ FwdState::dispatch() httpStart(this); break; - case AnyP::PROTO_GOPHER: - gopherStart(this); - break; - case AnyP::PROTO_FTP: if (request->flags.ftpNative) Ftp::StartRelay(this); Index: squid-3.5.21/src/HttpRequest.cc =================================================================== --- squid-3.5.21.orig/src/HttpRequest.cc +++ squid-3.5.21/src/HttpRequest.cc @@ -16,7 +16,6 @@ #include "DnsLookupDetails.h" #include "err_detail_type.h" #include "globals.h" -#include "gopher.h" #include "http.h" #include "HttpHdrCc.h" #include "HttpHeaderRange.h" @@ -574,11 +573,6 @@ HttpRequest::maybeCacheable() // no-store, private and related which block cacheability break; - case AnyP::PROTO_GOPHER: - if (!gopherCachable(this)) - return false; - break; - case AnyP::PROTO_CACHE_OBJECT: return false; Index: squid-3.5.21/src/IoStats.h =================================================================== --- squid-3.5.21.orig/src/IoStats.h +++ squid-3.5.21/src/IoStats.h @@ -22,7 +22,7 @@ public: int writes; int write_hist[histSize]; } - Http, Ftp, Gopher; + Http, Ftp; }; #endif /* SQUID_IOSTATS_H_ */ Index: squid-3.5.21/src/Makefile.am =================================================================== --- squid-3.5.21.orig/src/Makefile.am +++ squid-3.5.21/src/Makefile.am @@ -367,8 +367,6 @@ squid_SOURCES = \ FwdState.h \ Generic.h \ globals.h \ - gopher.h \ - gopher.cc \ helper.cc \ helper.h \ hier_code.h \ @@ -1482,8 +1480,6 @@ tests_testCacheManager_SOURCES = \ fqdncache.cc \ FwdState.cc \ FwdState.h \ - gopher.h \ - gopher.cc \ hier_code.h \ helper.cc \ $(HTCPSOURCE) \ @@ -1898,8 +1894,6 @@ tests_testEvent_SOURCES = \ fqdncache.cc \ FwdState.cc \ FwdState.h \ - gopher.h \ - gopher.cc \ helper.cc \ hier_code.h \ $(HTCPSOURCE) \ @@ -2145,8 +2139,6 @@ tests_testEventLoop_SOURCES = \ fqdncache.cc \ FwdState.cc \ FwdState.h \ - gopher.h \ - gopher.cc \ helper.cc \ hier_code.h \ $(HTCPSOURCE) \ @@ -2388,8 +2380,6 @@ tests_test_http_range_SOURCES = \ fqdncache.cc \ FwdState.cc \ FwdState.h \ - gopher.h \ - gopher.cc \ helper.cc \ hier_code.h \ $(HTCPSOURCE) \ @@ -2716,8 +2706,6 @@ tests_testHttpRequest_SOURCES = \ fqdncache.cc \ FwdState.cc \ FwdState.h \ - gopher.h \ - gopher.cc \ helper.cc \ hier_code.h \ $(HTCPSOURCE) \ @@ -3568,8 +3556,6 @@ tests_testURL_SOURCES = \ fqdncache.cc \ FwdState.cc \ FwdState.h \ - gopher.h \ - gopher.cc \ helper.cc \ hier_code.h \ $(HTCPSOURCE) \ Index: squid-3.5.21/src/adaptation/ecap/Host.cc =================================================================== --- squid-3.5.21.orig/src/adaptation/ecap/Host.cc +++ squid-3.5.21/src/adaptation/ecap/Host.cc @@ -48,7 +48,6 @@ Adaptation::Ecap::Host::Host() libecap::protocolHttp.assignHostId(AnyP::PROTO_HTTP); libecap::protocolHttps.assignHostId(AnyP::PROTO_HTTPS); libecap::protocolFtp.assignHostId(AnyP::PROTO_FTP); - libecap::protocolGopher.assignHostId(AnyP::PROTO_GOPHER); libecap::protocolWais.assignHostId(AnyP::PROTO_WAIS); libecap::protocolUrn.assignHostId(AnyP::PROTO_URN); libecap::protocolWhois.assignHostId(AnyP::PROTO_WHOIS); Index: squid-3.5.21/src/adaptation/ecap/MessageRep.cc =================================================================== --- squid-3.5.21.orig/src/adaptation/ecap/MessageRep.cc +++ squid-3.5.21/src/adaptation/ecap/MessageRep.cc @@ -149,8 +149,6 @@ Adaptation::Ecap::FirstLineRep::protocol return libecap::protocolHttps; case AnyP::PROTO_FTP: return libecap::protocolFtp; - case AnyP::PROTO_GOPHER: - return libecap::protocolGopher; case AnyP::PROTO_WAIS: return libecap::protocolWais; case AnyP::PROTO_WHOIS: Index: squid-3.5.21/src/anyp/ProtocolType.h =================================================================== --- squid-3.5.21.orig/src/anyp/ProtocolType.h +++ squid-3.5.21/src/anyp/ProtocolType.h @@ -26,7 +26,6 @@ typedef enum { PROTO_HTTPS, PROTO_COAP, PROTO_COAPS, - PROTO_GOPHER, PROTO_WAIS, PROTO_CACHE_OBJECT, PROTO_ICP, Index: squid-3.5.21/src/cf.data.pre =================================================================== --- squid-3.5.21.orig/src/cf.data.pre +++ squid-3.5.21/src/cf.data.pre @@ -1220,7 +1220,6 @@ acl SSL_ports port 443 acl Safe_ports port 80 # http acl Safe_ports port 21 # ftp acl Safe_ports port 443 # https -acl Safe_ports port 70 # gopher acl Safe_ports port 210 # wais acl Safe_ports port 1025-65535 # unregistered ports acl Safe_ports port 280 # http-mgmt @@ -4211,7 +4210,7 @@ DOC_START [http::]<bs Number of HTTP-equivalent message body bytes received from the next hop, excluding chunked transfer encoding and control messages. - Generated FTP/Gopher listings are treated as + Generated FTP listings are treated as received bodies. @@ -5479,7 +5478,6 @@ NOCOMMENT_START # Add any of your own refresh_pattern entries above these. # refresh_pattern ^ftp: 1440 20% 10080 -refresh_pattern ^gopher: 1440 0% 1440 refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 refresh_pattern . 0 20% 4320 NOCOMMENT_END @@ -8053,7 +8051,7 @@ DOC_START client IP can use. Any more than this and Squid will begin to drop new connections from the client until it closes some links. - Note that this is a global limit. It affects all HTTP, HTCP, Gopher and FTP + Note that this is a global limit. It affects all HTTP, HTCP and FTP connections from the client. For finer control use the ACL access controls. Requires client_db to be enabled (the default). Index: squid-3.5.21/src/client_side_request.cc =================================================================== --- squid-3.5.21.orig/src/client_side_request.cc +++ squid-3.5.21/src/client_side_request.cc @@ -33,7 +33,6 @@ #include "fd.h" #include "fde.h" #include "format/Token.h" -#include "gopher.h" #include "helper.h" #include "helper/Reply.h" #include "http.h" @@ -960,9 +959,6 @@ clientHierarchical(ClientHttpRequest * h if (request->url.getScheme() == AnyP::PROTO_HTTP) return method.respMaybeCacheable(); - if (request->url.getScheme() == AnyP::PROTO_GOPHER) - return gopherCachable(request); - if (request->url.getScheme() == AnyP::PROTO_CACHE_OBJECT) return 0; Index: squid-3.5.21/src/gopher.cc =================================================================== --- squid-3.5.21.orig/src/gopher.cc +++ /dev/null @@ -1,983 +0,0 @@ -/* - * Copyright (C) 1996-2016 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -/* DEBUG: section 10 Gopher */ - -#include "squid.h" -#include "comm.h" -#include "comm/Read.h" -#include "comm/Write.h" -#include "errorpage.h" -#include "fd.h" -#include "FwdState.h" -#include "globals.h" -#include "html_quote.h" -#include "HttpReply.h" -#include "HttpRequest.h" -#include "Mem.h" -#include "MemBuf.h" -#include "mime.h" -#include "rfc1738.h" -#include "SquidConfig.h" -#include "SquidTime.h" -#include "StatCounters.h" -#include "Store.h" -#include "tools.h" - -#if USE_DELAY_POOLS -#include "DelayPools.h" -#include "MemObject.h" -#endif - -/** - \defgroup ServerProtocolGopherInternal Server-Side Gopher Internals - \ingroup ServerProtocolGopherAPI - * Gopher is somewhat complex and gross because it must convert from - * the Gopher protocol to HTTP. - */ - -/* gopher type code from rfc. Anawat. */ -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_FILE '0' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_DIRECTORY '1' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_CSO '2' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_ERROR '3' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_MACBINHEX '4' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_DOSBIN '5' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_UUENCODED '6' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_INDEX '7' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_TELNET '8' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_BIN '9' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_REDUNT '+' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_3270 'T' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_GIF 'g' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_IMAGE 'I' - -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_HTML 'h' /* HTML */ -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_INFO 'i' -/** - \ingroup ServerProtocolGopherInternal - W3 address - */ -#define GOPHER_WWW 'w' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_SOUND 's' - -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_PLUS_IMAGE ':' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_PLUS_MOVIE ';' -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_PLUS_SOUND '<' - -/// \ingroup ServerProtocolGopherInternal -#define GOPHER_PORT 70 - -/// \ingroup ServerProtocolGopherInternal -#define TAB '\t' -/// \ingroup ServerProtocolGopherInternal -/// \todo CODE: should this be a protocol-specific thing? -#define TEMP_BUF_SIZE 4096 -/// \ingroup ServerProtocolGopherInternal -#define MAX_CSO_RESULT 1024 - -/// \ingroup ServerProtocolGopherInternal -typedef struct gopher_ds { - StoreEntry *entry; - enum { - NORMAL, - HTML_DIR, - HTML_INDEX_RESULT, - HTML_CSO_RESULT, - HTML_INDEX_PAGE, - HTML_CSO_PAGE - } conversion; - int HTML_header_added; - int HTML_pre; - char type_id; - char request[MAX_URL]; - int cso_recno; - int len; - char *buf; /* pts to a 4k page */ - Comm::ConnectionPointer serverConn; - HttpRequest *req; - FwdState::Pointer fwd; - char replybuf[BUFSIZ]; -} GopherStateData; - -static CLCB gopherStateFree; -static void gopherMimeCreate(GopherStateData *); -static void gopher_request_parse(const HttpRequest * req, - char *type_id, - char *request); -static void gopherEndHTML(GopherStateData *); -static void gopherToHTML(GopherStateData *, char *inbuf, int len); -static CTCB gopherTimeout; -static IOCB gopherReadReply; -static IOCB gopherSendComplete; -static PF gopherSendRequest; - -/// \ingroup ServerProtocolGopherInternal -static char def_gopher_bin[] = "www/unknown"; - -/// \ingroup ServerProtocolGopherInternal -static char def_gopher_text[] = "text/plain"; - -/// \ingroup ServerProtocolGopherInternal -static void -gopherStateFree(const CommCloseCbParams ¶ms) -{ - GopherStateData *gopherState = (GopherStateData *)params.data; - - if (gopherState == NULL) - return; - - if (gopherState->entry) { - gopherState->entry->unlock("gopherState"); - } - - HTTPMSGUNLOCK(gopherState->req); - - gopherState->fwd = NULL; // refcounted - - memFree(gopherState->buf, MEM_4K_BUF); - gopherState->buf = NULL; - cbdataFree(gopherState); -} - -/** - \ingroup ServerProtocolGopherInternal - * Create MIME Header for Gopher Data - */ -static void -gopherMimeCreate(GopherStateData * gopherState) -{ - StoreEntry *entry = gopherState->entry; - const char *mime_type = NULL; - const char *mime_enc = NULL; - - switch (gopherState->type_id) { - - case GOPHER_DIRECTORY: - - case GOPHER_INDEX: - - case GOPHER_HTML: - - case GOPHER_WWW: - - case GOPHER_CSO: - mime_type = "text/html"; - break; - - case GOPHER_GIF: - - case GOPHER_IMAGE: - - case GOPHER_PLUS_IMAGE: - mime_type = "image/gif"; - break; - - case GOPHER_SOUND: - - case GOPHER_PLUS_SOUND: - mime_type = "audio/basic"; - break; - - case GOPHER_PLUS_MOVIE: - mime_type = "video/mpeg"; - break; - - case GOPHER_MACBINHEX: - - case GOPHER_DOSBIN: - - case GOPHER_UUENCODED: - - case GOPHER_BIN: - /* Rightnow We have no idea what it is. */ - mime_enc = mimeGetContentEncoding(gopherState->request); - mime_type = mimeGetContentType(gopherState->request); - if (!mime_type) - mime_type = def_gopher_bin; - break; - - case GOPHER_FILE: - - default: - mime_enc = mimeGetContentEncoding(gopherState->request); - mime_type = mimeGetContentType(gopherState->request); - if (!mime_type) - mime_type = def_gopher_text; - break; - } - - assert(entry->isEmpty()); - EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT); - - HttpReply *reply = new HttpReply; - entry->buffer(); - reply->setHeaders(Http::scOkay, "Gatewaying", mime_type, -1, -1, -2); - if (mime_enc) - reply->header.putStr(HDR_CONTENT_ENCODING, mime_enc); - - entry->replaceHttpReply(reply); -} - -/** - \ingroup ServerProtocolGopherInternal - * Parse a gopher request into components. By Anawat. - */ -static void -gopher_request_parse(const HttpRequest * req, char *type_id, char *request) -{ - const char *path = req->urlpath.termedBuf(); - - if (request) - request[0] = '\0'; - - if (path && (*path == '/')) - ++path; - - if (!path || !*path) { - *type_id = GOPHER_DIRECTORY; - return; - } - - *type_id = path[0]; - - if (request) { - xstrncpy(request, path + 1, MAX_URL); - /* convert %xx to char */ - rfc1738_unescape(request); - } -} - -/** - \ingroup ServerProtocolGopherAPI - * Parse the request to determine whether it is cachable. - * - \param req Request data. - \retval 0 Not cachable. - \retval 1 Cachable. - */ -int -gopherCachable(const HttpRequest * req) -{ - int cachable = 1; - char type_id; - /* parse to see type */ - gopher_request_parse(req, - &type_id, - NULL); - - switch (type_id) { - - case GOPHER_INDEX: - - case GOPHER_CSO: - - case GOPHER_TELNET: - - case GOPHER_3270: - cachable = 0; - break; - - default: - cachable = 1; - } - - return cachable; -} - -/// \ingroup ServerProtocolGopherInternal -static void -gopherHTMLHeader(StoreEntry * e, const char *title, const char *substring) -{ - storeAppendPrintf(e, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"); - storeAppendPrintf(e, "<HTML><HEAD><TITLE>"); - storeAppendPrintf(e, title, substring); - storeAppendPrintf(e, "</TITLE>"); - storeAppendPrintf(e, "<STYLE type=\"text/css\"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}--></STYLE>\n"); - storeAppendPrintf(e, "</HEAD>\n<BODY><H1>"); - storeAppendPrintf(e, title, substring); - storeAppendPrintf(e, "</H1>\n"); -} - -/// \ingroup ServerProtocolGopherInternal -static void -gopherHTMLFooter(StoreEntry * e) -{ - storeAppendPrintf(e, "<HR noshade size=\"1px\">\n"); - storeAppendPrintf(e, "<ADDRESS>\n"); - storeAppendPrintf(e, "Generated %s by %s (%s)\n", - mkrfc1123(squid_curtime), - getMyHostname(), - visible_appname_string); - storeAppendPrintf(e, "</ADDRESS></BODY></HTML>\n"); -} - -/// \ingroup ServerProtocolGopherInternal -static void -gopherEndHTML(GopherStateData * gopherState) -{ - StoreEntry *e = gopherState->entry; - - if (!gopherState->HTML_header_added) { - gopherHTMLHeader(e, "Server Return Nothing", NULL); - storeAppendPrintf(e, "<P>The Gopher query resulted in a blank response</P>"); - } else if (gopherState->HTML_pre) { - storeAppendPrintf(e, "</PRE>\n"); - } - - gopherHTMLFooter(e); -} - -/** - \ingroup ServerProtocolGopherInternal - * Convert Gopher to HTML. - \par - * Borrow part of code from libwww2 came with Mosaic distribution. - */ -static void -gopherToHTML(GopherStateData * gopherState, char *inbuf, int len) -{ - char *pos = inbuf; - char *lpos = NULL; - char *tline = NULL; - LOCAL_ARRAY(char, line, TEMP_BUF_SIZE); - char *name = NULL; - char *selector = NULL; - char *host = NULL; - char *port = NULL; - char *escaped_selector = NULL; - const char *icon_url = NULL; - char gtype; - StoreEntry *entry = NULL; - - memset(line, '\0', TEMP_BUF_SIZE); - - entry = gopherState->entry; - - if (gopherState->conversion == gopher_ds::HTML_INDEX_PAGE) { - char *html_url = html_quote(entry->url()); - gopherHTMLHeader(entry, "Gopher Index %s", html_url); - storeAppendPrintf(entry, - "<p>This is a searchable Gopher index. Use the search\n" - "function of your browser to enter search terms.\n" - "<ISINDEX>\n"); - gopherHTMLFooter(entry); - /* now let start sending stuff to client */ - entry->flush(); - gopherState->HTML_header_added = 1; - - return; - } - - if (gopherState->conversion == gopher_ds::HTML_CSO_PAGE) { - char *html_url = html_quote(entry->url()); - gopherHTMLHeader(entry, "CSO Search of %s", html_url); - storeAppendPrintf(entry, - "<P>A CSO database usually contains a phonebook or\n" - "directory. Use the search function of your browser to enter\n" - "search terms.</P><ISINDEX>\n"); - gopherHTMLFooter(entry); - /* now let start sending stuff to client */ - entry->flush(); - gopherState->HTML_header_added = 1; - - return; - } - - SBuf outbuf; - - if (!gopherState->HTML_header_added) { - if (gopherState->conversion == gopher_ds::HTML_CSO_RESULT) - gopherHTMLHeader(entry, "CSO Search Result", NULL); - else - gopherHTMLHeader(entry, "Gopher Menu", NULL); - - outbuf.append ("<PRE>"); - - gopherState->HTML_header_added = 1; - - gopherState->HTML_pre = 1; - } - - while (pos < inbuf + len) { - int llen; - int left = len - (pos - inbuf); - lpos = (char *)memchr(pos, '\n', left); - if (lpos) { - ++lpos; /* Next line is after \n */ - llen = lpos - pos; - } else { - llen = left; - } - if (gopherState->len + llen >= TEMP_BUF_SIZE) { - debugs(10, DBG_IMPORTANT, "GopherHTML: Buffer overflow. Lost some data on URL: " << entry->url() ); - llen = TEMP_BUF_SIZE - gopherState->len - 1; - } - if (!lpos) { - /* there is no complete line in inbuf */ - /* copy it to temp buffer */ - /* note: llen is adjusted above */ - memcpy(gopherState->buf + gopherState->len, pos, llen); - gopherState->len += llen; - break; - } - if (gopherState->len != 0) { - /* there is something left from last tx. */ - memcpy(line, gopherState->buf, gopherState->len); - memcpy(line + gopherState->len, pos, llen); - llen += gopherState->len; - gopherState->len = 0; - } else { - memcpy(line, pos, llen); - } - line[llen + 1] = '\0'; - /* move input to next line */ - pos = lpos; - - /* at this point. We should have one line in buffer to process */ - - if (*line == '.') { - /* skip it */ - memset(line, '\0', TEMP_BUF_SIZE); - continue; - } - - switch (gopherState->conversion) { - - case gopher_ds::HTML_INDEX_RESULT: - - case gopher_ds::HTML_DIR: { - tline = line; - gtype = *tline; - ++tline; - name = tline; - selector = strchr(tline, TAB); - - if (selector) { - *selector = '\0'; - ++selector; - host = strchr(selector, TAB); - - if (host) { - *host = '\0'; - ++host; - port = strchr(host, TAB); - - if (port) { - char *junk; - port[0] = ':'; - junk = strchr(host, TAB); - - if (junk) - *junk++ = 0; /* Chop port */ - else { - junk = strchr(host, '\r'); - - if (junk) - *junk++ = 0; /* Chop port */ - else { - junk = strchr(host, '\n'); - - if (junk) - *junk++ = 0; /* Chop port */ - } - } - - if ((port[1] == '0') && (!port[2])) - port[0] = 0; /* 0 means none */ - } - - /* escape a selector here */ - escaped_selector = xstrdup(rfc1738_escape_part(selector)); - - switch (gtype) { - - case GOPHER_DIRECTORY: - icon_url = mimeGetIconURL("internal-menu"); - break; - - case GOPHER_HTML: - - case GOPHER_FILE: - icon_url = mimeGetIconURL("internal-text"); - break; - - case GOPHER_INDEX: - - case GOPHER_CSO: - icon_url = mimeGetIconURL("internal-index"); - break; - - case GOPHER_IMAGE: - - case GOPHER_GIF: - - case GOPHER_PLUS_IMAGE: - icon_url = mimeGetIconURL("internal-image"); - break; - - case GOPHER_SOUND: - - case GOPHER_PLUS_SOUND: - icon_url = mimeGetIconURL("internal-sound"); - break; - - case GOPHER_PLUS_MOVIE: - icon_url = mimeGetIconURL("internal-movie"); - break; - - case GOPHER_TELNET: - - case GOPHER_3270: - icon_url = mimeGetIconURL("internal-telnet"); - break; - - case GOPHER_BIN: - - case GOPHER_MACBINHEX: - - case GOPHER_DOSBIN: - - case GOPHER_UUENCODED: - icon_url = mimeGetIconURL("internal-binary"); - break; - - case GOPHER_INFO: - icon_url = NULL; - break; - - default: - icon_url = mimeGetIconURL("internal-unknown"); - break; - } - - if ((gtype == GOPHER_TELNET) || (gtype == GOPHER_3270)) { - if (strlen(escaped_selector) != 0) - outbuf.appendf("<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"telnet://%s@%s%s%s/\">%s</A>\n", - icon_url, escaped_selector, rfc1738_escape_part(host), - *port ? ":" : "", port, html_quote(name)); - else - outbuf.appendf("<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"telnet://%s%s%s/\">%s</A>\n", - icon_url, rfc1738_escape_part(host), *port ? ":" : "", - port, html_quote(name)); - - } else if (gtype == GOPHER_INFO) { - outbuf.appendf("\t%s\n", html_quote(name)); - } else { - if (strncmp(selector, "GET /", 5) == 0) { - /* WWW link */ - outbuf.appendf("<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"http://%s/%s\">%s</A>\n", - icon_url, host, rfc1738_escape_unescaped(selector + 5), html_quote(name)); - } else if (gtype == GOPHER_WWW) { - outbuf.appendf("<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"gopher://%s/%c%s\">%s</A>\n", - icon_url, rfc1738_escape_unescaped(selector), html_quote(name)); - } else { - /* Standard link */ - outbuf.appendf("<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"gopher://%s/%c%s\">%s</A>\n", - icon_url, host, gtype, escaped_selector, html_quote(name)); - } - } - - safe_free(escaped_selector); - } else { - memset(line, '\0', TEMP_BUF_SIZE); - continue; - } - } else { - memset(line, '\0', TEMP_BUF_SIZE); - continue; - } - - break; - } /* HTML_DIR, HTML_INDEX_RESULT */ - - case gopher_ds::HTML_CSO_RESULT: { - if (line[0] == '-') { - int code, recno; - char *s_code, *s_recno, *result; - - s_code = strtok(line + 1, ":\n"); - s_recno = strtok(NULL, ":\n"); - result = strtok(NULL, "\n"); - - if (!result) - break; - - code = atoi(s_code); - - recno = atoi(s_recno); - - if (code != 200) - break; - - if (gopherState->cso_recno != recno) { - outbuf.appendf("</PRE><HR noshade size=\"1px\"><H2>Record# %d<br><i>%s</i></H2>\n<PRE>", recno, html_quote(result)); - gopherState->cso_recno = recno; - } else { - outbuf.appendf("%s\n", html_quote(result)); - } - - break; - } else { - int code; - char *s_code, *result; - - s_code = strtok(line, ":"); - result = strtok(NULL, "\n"); - - if (!result) - break; - - code = atoi(s_code); - - switch (code) { - - case 200: { - /* OK */ - /* Do nothing here */ - break; - } - - case 102: /* Number of matches */ - - case 501: /* No Match */ - - case 502: { /* Too Many Matches */ - /* Print the message the server returns */ - outbuf.appendf("</PRE><HR noshade size=\"1px\"><H2>%s</H2>\n<PRE>", html_quote(result)); - break; - } - - } - } - - } /* HTML_CSO_RESULT */ - - default: - break; /* do nothing */ - - } /* switch */ - - } /* while loop */ - - if (outbuf.length() > 0) { - entry->append(outbuf.rawContent(), outbuf.length()); - /* now let start sending stuff to client */ - entry->flush(); - } - - return; -} - -/// \ingroup ServerProtocolGopherInternal -static void -gopherTimeout(const CommTimeoutCbParams &io) -{ - GopherStateData *gopherState = static_cast<GopherStateData *>(io.data); - debugs(10, 4, HERE << io.conn << ": '" << gopherState->entry->url() << "'" ); - - gopherState->fwd->fail(new ErrorState(ERR_READ_TIMEOUT, Http::scGatewayTimeout, gopherState->fwd->request)); - - if (Comm::IsConnOpen(io.conn)) - io.conn->close(); -} - -/** - \ingroup ServerProtocolGopherInternal - * This will be called when data is ready to be read from fd. - * Read until error or connection closed. - */ -static void -gopherReadReply(const Comm::ConnectionPointer &conn, char *buf, size_t len, Comm::Flag flag, int xerrno, void *data) -{ - GopherStateData *gopherState = (GopherStateData *)data; - StoreEntry *entry = gopherState->entry; - int clen; - int bin; - size_t read_sz = BUFSIZ; -#if USE_DELAY_POOLS - DelayId delayId = entry->mem_obj->mostBytesAllowed(); -#endif - - /* Bail out early on Comm::ERR_CLOSING - close handlers will tidy up for us */ - - if (flag == Comm::ERR_CLOSING) { - return; - } - - assert(buf == gopherState->replybuf); - - if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) { - gopherState->serverConn->close(); - return; - } - -#if USE_DELAY_POOLS - read_sz = delayId.bytesWanted(1, read_sz); -#endif - - /* leave one space for \0 in gopherToHTML */ - - if (flag == Comm::OK && len > 0) { -#if USE_DELAY_POOLS - delayId.bytesIn(len); -#endif - - kb_incr(&(statCounter.server.all.kbytes_in), len); - kb_incr(&(statCounter.server.other.kbytes_in), len); - } - - debugs(10, 5, HERE << conn << " read len=" << len); - - if (flag == Comm::OK && len > 0) { - AsyncCall::Pointer nil; - commSetConnTimeout(conn, Config.Timeout.read, nil); - ++IOStats.Gopher.reads; - - for (clen = len - 1, bin = 0; clen; ++bin) - clen >>= 1; - - ++IOStats.Gopher.read_hist[bin]; - - HttpRequest *req = gopherState->fwd->request; - if (req->hier.bodyBytesRead < 0) - req->hier.bodyBytesRead = 0; - - req->hier.bodyBytesRead += len; - } - - if (flag != Comm::OK) { - debugs(50, DBG_IMPORTANT, "gopherReadReply: error reading: " << xstrerror()); - - if (ignoreErrno(xerrno)) { - AsyncCall::Pointer call = commCbCall(5,4, "gopherReadReply", - CommIoCbPtrFun(gopherReadReply, gopherState)); - comm_read(conn, buf, read_sz, call); - } else { - ErrorState *err = new ErrorState(ERR_READ_ERROR, Http::scInternalServerError, gopherState->fwd->request); - err->xerrno = xerrno; - gopherState->fwd->fail(err); - gopherState->serverConn->close(); - } - } else if (len == 0 && entry->isEmpty()) { - gopherState->fwd->fail(new ErrorState(ERR_ZERO_SIZE_OBJECT, Http::scServiceUnavailable, gopherState->fwd->request)); - gopherState->serverConn->close(); - } else if (len == 0) { - /* Connection closed; retrieval done. */ - /* flush the rest of data in temp buf if there is one. */ - - if (gopherState->conversion != gopher_ds::NORMAL) - gopherEndHTML(gopherState); - - entry->timestampsSet(); - entry->flush(); - gopherState->fwd->complete(); - gopherState->serverConn->close(); - } else { - if (gopherState->conversion != gopher_ds::NORMAL) { - gopherToHTML(gopherState, buf, len); - } else { - entry->append(buf, len); - } - AsyncCall::Pointer call = commCbCall(5,4, "gopherReadReply", - CommIoCbPtrFun(gopherReadReply, gopherState)); - comm_read(conn, buf, read_sz, call); - } -} - -/** - \ingroup ServerProtocolGopherInternal - * This will be called when request write is complete. Schedule read of reply. - */ -static void -gopherSendComplete(const Comm::ConnectionPointer &conn, char *buf, size_t size, Comm::Flag errflag, int xerrno, void *data) -{ - GopherStateData *gopherState = (GopherStateData *) data; - StoreEntry *entry = gopherState->entry; - debugs(10, 5, HERE << conn << " size: " << size << " errflag: " << errflag); - - if (size > 0) { - fd_bytes(conn->fd, size, FD_WRITE); - kb_incr(&(statCounter.server.all.kbytes_out), size); - kb_incr(&(statCounter.server.other.kbytes_out), size); - } - - if (errflag) { - ErrorState *err; - err = new ErrorState(ERR_WRITE_ERROR, Http::scServiceUnavailable, gopherState->fwd->request); - err->xerrno = xerrno; - err->port = gopherState->fwd->request->port; - err->url = xstrdup(entry->url()); - gopherState->fwd->fail(err); - gopherState->serverConn->close(); - - if (buf) - memFree(buf, MEM_4K_BUF); /* Allocated by gopherSendRequest. */ - - return; - } - - /* - * OK. We successfully reach remote site. Start MIME typing - * stuff. Do it anyway even though request is not HTML type. - */ - entry->buffer(); - - gopherMimeCreate(gopherState); - - switch (gopherState->type_id) { - - case GOPHER_DIRECTORY: - /* we got to convert it first */ - gopherState->conversion = gopher_ds::HTML_DIR; - gopherState->HTML_header_added = 0; - break; - - case GOPHER_INDEX: - /* we got to convert it first */ - gopherState->conversion = gopher_ds::HTML_INDEX_RESULT; - gopherState->HTML_header_added = 0; - break; - - case GOPHER_CSO: - /* we got to convert it first */ - gopherState->conversion = gopher_ds::HTML_CSO_RESULT; - gopherState->cso_recno = 0; - gopherState->HTML_header_added = 0; - break; - - default: - gopherState->conversion = gopher_ds::NORMAL; - entry->flush(); - } - - /* Schedule read reply. */ - AsyncCall::Pointer call = commCbCall(5,5, "gopherReadReply", - CommIoCbPtrFun(gopherReadReply, gopherState)); - entry->delayAwareRead(conn, gopherState->replybuf, BUFSIZ, call); - - if (buf) - memFree(buf, MEM_4K_BUF); /* Allocated by gopherSendRequest. */ -} - -/** - \ingroup ServerProtocolGopherInternal - * This will be called when connect completes. Write request. - */ -static void -gopherSendRequest(int fd, void *data) -{ - GopherStateData *gopherState = (GopherStateData *)data; - char *buf = (char *)memAllocate(MEM_4K_BUF); - - if (gopherState->type_id == GOPHER_CSO) { - const char *t = strchr(gopherState->request, '?'); - - if (t != NULL) - ++t; /* skip the ? */ - else - t = ""; - - snprintf(buf, 4096, "query %s\r\nquit\r\n", t); - } else if (gopherState->type_id == GOPHER_INDEX) { - char *t = strchr(gopherState->request, '?'); - - if (t != NULL) - *t = '\t'; - - snprintf(buf, 4096, "%s\r\n", gopherState->request); - } else { - snprintf(buf, 4096, "%s\r\n", gopherState->request); - } - - debugs(10, 5, HERE << gopherState->serverConn); - AsyncCall::Pointer call = commCbCall(5,5, "gopherSendComplete", - CommIoCbPtrFun(gopherSendComplete, gopherState)); - Comm::Write(gopherState->serverConn, buf, strlen(buf), call, NULL); - - gopherState->entry->makePublic(); -} - -/// \ingroup ServerProtocolGopherInternal -CBDATA_TYPE(GopherStateData); - -/// \ingroup ServerProtocolGopherAPI -void -gopherStart(FwdState * fwd) -{ - StoreEntry *entry = fwd->entry; - GopherStateData *gopherState; - CBDATA_INIT_TYPE(GopherStateData); - gopherState = cbdataAlloc(GopherStateData); - gopherState->buf = (char *)memAllocate(MEM_4K_BUF); - - entry->lock("gopherState"); - gopherState->entry = entry; - - gopherState->fwd = fwd; - - debugs(10, 3, "gopherStart: " << entry->url() ); - - ++ statCounter.server.all.requests; - - ++ statCounter.server.other.requests; - - /* Parse url. */ - gopher_request_parse(fwd->request, - &gopherState->type_id, gopherState->request); - - comm_add_close_handler(fwd->serverConnection()->fd, gopherStateFree, gopherState); - - if (((gopherState->type_id == GOPHER_INDEX) || (gopherState->type_id == GOPHER_CSO)) - && (strchr(gopherState->request, '?') == NULL)) { - /* Index URL without query word */ - /* We have to generate search page back to client. No need for connection */ - gopherMimeCreate(gopherState); - - if (gopherState->type_id == GOPHER_INDEX) { - gopherState->conversion = gopher_ds::HTML_INDEX_PAGE; - } else { - if (gopherState->type_id == GOPHER_CSO) { - gopherState->conversion = gopher_ds::HTML_CSO_PAGE; - } else { - gopherState->conversion = gopher_ds::HTML_INDEX_PAGE; - } - } - - gopherToHTML(gopherState, (char *) NULL, 0); - fwd->complete(); - return; - } - - gopherState->serverConn = fwd->serverConnection(); - gopherSendRequest(fwd->serverConnection()->fd, gopherState); - AsyncCall::Pointer timeoutCall = commCbCall(5, 4, "gopherTimeout", - CommTimeoutCbPtrFun(gopherTimeout, gopherState)); - commSetConnTimeout(fwd->serverConnection(), Config.Timeout.read, timeoutCall); -} - Index: squid-3.5.21/src/gopher.h =================================================================== --- squid-3.5.21.orig/src/gopher.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 1996-2016 The Squid Software Foundation and contributors - * - * Squid software is distributed under GPLv2+ license and includes - * contributions from numerous individuals and organizations. - * Please see the COPYING and CONTRIBUTORS files for details. - */ - -/* DEBUG: section 10 Gopher */ - -#ifndef SQUID_GOPHER_H_ -#define SQUID_GOPHER_H_ - -class FwdState; -class HttpRequest; - -/** - \defgroup ServerProtocolGopherAPI Server-Side Gopher API - \ingroup ServerProtocol - */ - -/// \ingroup ServerProtocolGopherAPI -void gopherStart(FwdState *); - -/// \ingroup ServerProtocolGopherAPI -int gopherCachable(const HttpRequest *); - -#endif /* SQUID_GOPHER_H_ */ - Index: squid-3.5.21/src/mgr/IoAction.cc =================================================================== --- squid-3.5.21.orig/src/mgr/IoAction.cc +++ squid-3.5.21/src/mgr/IoAction.cc @@ -35,9 +35,6 @@ Mgr::IoActionData::operator += (const Io ftp_reads += stats.ftp_reads; for (int i = 0; i < IoStats::histSize; ++i) ftp_read_hist[i] += stats.ftp_read_hist[i]; - gopher_reads += stats.gopher_reads; - for (int i = 0; i < IoStats::histSize; ++i) - gopher_read_hist[i] += stats.gopher_read_hist[i]; return *this; } Index: squid-3.5.21/src/mgr/IoAction.h =================================================================== --- squid-3.5.21.orig/src/mgr/IoAction.h +++ squid-3.5.21/src/mgr/IoAction.h @@ -27,10 +27,8 @@ public: public: double http_reads; double ftp_reads; - double gopher_reads; double http_read_hist[IoStats::histSize]; double ftp_read_hist[IoStats::histSize]; - double gopher_read_hist[IoStats::histSize]; }; /// implement aggregated 'io' action Index: squid-3.5.21/src/squid.8.in =================================================================== --- squid-3.5.21.orig/src/squid.8.in +++ squid-3.5.21/src/squid.8.in @@ -24,7 +24,7 @@ command\-line .PP .B squid is a high\-performance proxy caching server for web clients, -supporting FTP, gopher, ICAP, ICP, HTCP and HTTP data objects. +supporting FTP, ICAP, ICP, HTCP and HTTP data objects. Unlike traditional caching software, Squid handles all requests in a single, non-blocking process. .PP Index: squid-3.5.21/src/stat.cc =================================================================== --- squid-3.5.21.orig/src/stat.cc +++ squid-3.5.21/src/stat.cc @@ -209,12 +209,6 @@ GetIoStats(Mgr::IoActionData& stats) for (i = 0; i < IoStats::histSize; ++i) { stats.ftp_read_hist[i] = IOStats.Ftp.read_hist[i]; } - - stats.gopher_reads = IOStats.Gopher.reads; - - for (i = 0; i < IoStats::histSize; ++i) { - stats.gopher_read_hist[i] = IOStats.Gopher.read_hist[i]; - } } void @@ -248,19 +242,6 @@ DumpIoStats(Mgr::IoActionData& stats, St } storeAppendPrintf(sentry, "\n"); - storeAppendPrintf(sentry, "Gopher I/O\n"); - storeAppendPrintf(sentry, "number of reads: %.0f\n", stats.gopher_reads); - storeAppendPrintf(sentry, "Read Histogram:\n"); - - for (i = 0; i < IoStats::histSize; ++i) { - storeAppendPrintf(sentry, "%5d-%5d: %9.0f %2.0f%%\n", - i ? (1 << (i - 1)) + 1 : 1, - 1 << i, - stats.gopher_read_hist[i], - Math::doublePercent(stats.gopher_read_hist[i], stats.gopher_reads)); - } - - storeAppendPrintf(sentry, "\n"); } static const char * Index: squid-3.5.21/test-suite/squidconf/regressions-3.4.0.1 =================================================================== --- squid-3.5.21.orig/test-suite/squidconf/regressions-3.4.0.1 +++ squid-3.5.21/test-suite/squidconf/regressions-3.4.0.1 @@ -44,6 +44,5 @@ refresh_pattern -i \.(gif|png|jpg|jpeg|i refresh_pattern -i \.(iso|avi|wav|mp3|mpeg|swf|flv|x-flv)$ 1440 40% 40320 refresh_pattern ^ftp: 1440 20% 10080 -refresh_pattern ^gopher: 1440 0% 1440 refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 refresh_pattern . 0 20% 4320 Index: squid-3.5.21/src/anyp/ProtocolType.cc =================================================================== --- squid-3.5.21.orig/src/anyp/ProtocolType.cc +++ squid-3.5.21/src/anyp/ProtocolType.cc @@ -13,7 +13,6 @@ const char * ProtocolType_str[] = { "HTTPS", "COAP", "COAPS", - "GOPHER", "WAIS", "CACHE_OBJECT", "ICP", Index: squid-3.5.21/src/err_type.h =================================================================== --- squid-3.5.21.orig/src/err_type.h +++ squid-3.5.21/src/err_type.h @@ -65,7 +65,7 @@ typedef enum { ERR_GATEWAY_FAILURE, /* Special Cases */ - ERR_DIR_LISTING, /* Display of remote directory (FTP, Gopher) */ + ERR_DIR_LISTING, /* Display of remote directory (FTP) */ ERR_SQUID_SIGNATURE, /* not really an error */ ERR_SHUTTING_DOWN, Index: squid-3.5.21/src/url.cc =================================================================== --- squid-3.5.21.orig/src/url.cc +++ squid-3.5.21/src/url.cc @@ -175,9 +175,6 @@ urlParseProtocol(const SBuf & protocol) if (strncasecmp(b, "coaps", len) == 0) return AnyP::PROTO_COAPS; - if (strncasecmp(b, "gopher", len) == 0) - return AnyP::PROTO_GOPHER; - if (strncasecmp(b, "wais", len) == 0) return AnyP::PROTO_WAIS; @@ -213,9 +210,6 @@ urlDefaultPort(AnyP::ProtocolType p) // Assuming IANA policy of allocating same port for base and TLS protocol versions will occur. return 5683; - case AnyP::PROTO_GOPHER: - return 70; - case AnyP::PROTO_WAIS: return 210; @@ -984,8 +978,6 @@ urlCheckRequest(const HttpRequest * r) if (r->method == Http::METHOD_PUT) rc = 1; - case AnyP::PROTO_GOPHER: - case AnyP::PROTO_WAIS: case AnyP::PROTO_WHOIS:
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
