---------------------
PatchSet 11269 
Date: 2007/02/26 23:53:44
Author: hno
Branch: SQUID_2_6
Tag: (none) 
Log:
MFC: Gopher cleanups and bugfixes

Merged changes:
2007/02/26 22:02:45 hno +28 -40  Fix gopher to build a proper parsed HTTP reply
                                 instead of hardcoding a custom HTTP stream.
2007/02/26 23:45:49 hno  +2  -2  Clean up gopher listings somewhat. Links was
                                 overly escaped.

Members: 
	src/gopher.c:1.178->1.178.2.1 

Index: squid/src/gopher.c
===================================================================
RCS file: /cvsroot/squid/squid/src/gopher.c,v
retrieving revision 1.178
retrieving revision 1.178.2.1
diff -u -r1.178 -r1.178.2.1
--- squid/src/gopher.c	25 Aug 2006 12:26:07 -0000	1.178
+++ squid/src/gopher.c	26 Feb 2007 23:53:44 -0000	1.178.2.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: gopher.c,v 1.178 2006/08/25 12:26:07 serassio Exp $
+ * $Id: gopher.c,v 1.178.2.1 2007/02/26 23:53:44 hno Exp $
  *
  * DEBUG: section 10    Gopher
  * AUTHOR: Harvest Derived
@@ -89,7 +89,6 @@
 } GopherStateData;
 
 static PF gopherStateFree;
-static void gopher_mime_content(MemBuf * mb, const char *name, const char *def);
 static void gopherMimeCreate(GopherStateData *);
 static void gopher_request_parse(const request_t * req,
     char *type_id,
@@ -101,9 +100,6 @@
 static CWCB gopherSendComplete;
 static PF gopherSendRequest;
 
-static char def_gopher_bin[] = "www/unknown";
-static char def_gopher_text[] = "text/plain";
-
 static void
 gopherStateFree(int fdnotused, void *data)
 {
@@ -122,71 +118,65 @@
 }
 
 
-/* figure out content type from file extension */
-static void
-gopher_mime_content(MemBuf * mb, const char *name, const char *def_ctype)
-{
-    char *ctype = mimeGetContentType(name);
-    char *cenc = mimeGetContentEncoding(name);
-    if (cenc)
-	memBufPrintf(mb, "Content-Encoding: %s\r\n", cenc);
-    memBufPrintf(mb, "Content-Type: %s\r\n",
-	ctype ? ctype : def_ctype);
-}
-
-
-
 /* create MIME Header for Gopher Data */
 static void
 gopherMimeCreate(GopherStateData * gopherState)
 {
-    MemBuf mb;
-
-    memBufDefInit(&mb);
-
-    memBufPrintf(&mb,
-	"HTTP/1.0 200 OK Gatewaying\r\n"
-	"Server: Squid/%s\r\n"
-	"Date: %s\r\n",
-	version_string, mkrfc1123(squid_curtime));
+    StoreEntry *e = gopherState->entry;
+    HttpReply *reply = e->mem_obj->reply;
+    http_version_t version;
+    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:
-	memBufPrintf(&mb, "Content-Type: text/html\r\n");
+	mime_type = "text/html";
 	break;
     case GOPHER_GIF:
     case GOPHER_IMAGE:
     case GOPHER_PLUS_IMAGE:
-	memBufPrintf(&mb, "Content-Type: image/gif\r\n");
+	mime_type = "image/gif";
 	break;
     case GOPHER_SOUND:
     case GOPHER_PLUS_SOUND:
-	memBufPrintf(&mb, "Content-Type: audio/basic\r\n");
+	mime_type = "audio/basic";
 	break;
     case GOPHER_PLUS_MOVIE:
-	memBufPrintf(&mb, "Content-Type: video/mpeg\r\n");
+	mime_type = "video/mpeg";
 	break;
     case GOPHER_MACBINHEX:
+	mime_type = "application/macbinary";
+	break;
     case GOPHER_DOSBIN:
     case GOPHER_UUENCODED:
     case GOPHER_BIN:
-	/* Rightnow We have no idea what it is. */
-	gopher_mime_content(&mb, gopherState->request, def_gopher_bin);
-	break;
     case GOPHER_FILE:
     default:
-	gopher_mime_content(&mb, gopherState->request, def_gopher_text);
+	/* Rightnow We have no idea what it is. */
+	mime_type = mimeGetContentType(gopherState->request);
+	mime_enc = mimeGetContentEncoding(gopherState->request);
 	break;
     }
-    memBufPrintf(&mb, "\r\n");
+
+    storeBuffer(e);
+    httpReplyReset(reply);
     EBIT_CLR(gopherState->entry->flags, ENTRY_FWD_HDR_WAIT);
-    storeAppend(gopherState->entry, mb.buf, mb.size);
-    memBufClean(&mb);
+    httpBuildVersion(&version, 1, 0);
+    httpReplySetHeaders(reply, version, HTTP_OK, "Gatewaying", mime_type, -1, -1, -1);
+    if (mime_enc)
+	httpHeaderPutStr(&reply->header, HDR_CONTENT_ENCODING, mime_enc);
+    httpReplySwapOut(reply, e);
+    reply->hdr_sz = e->mem_obj->inmem_hi;
+    storeTimestampsSet(e);
+    if (EBIT_TEST(e->flags, ENTRY_CACHABLE)) {
+	storeSetPublicKey(e);
+    } else {
+	storeRelease(e);
+    }
 }
 
 /* Parse a gopher request into components.  By Anawat. */
@@ -504,7 +494,7 @@
 			    } else {
 				/* Standard link */
 				snprintf(tmpbuf, TEMP_BUF_SIZE, "<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"gopher://%s/%c%s\">%s</A>\n",
-				    icon_url, host, gtype, escaped_selector, html_quote(name));
+				    icon_url, host, gtype, rfc1738_escape(selector), html_quote(name));
 			    }
 			}
 			safe_free(escaped_selector);