[packages/squid.git] / squid-2.5.STABLE1-load_icons.patch

Index: squid/src/mime.c
diff -c squid/src/mime.c:1.102 squid/src/mime.c:1.102.2.1
*** squid/src/mime.c:1.102	Tue Nov 13 10:32:15 2001
--- squid/src/mime.c	Tue Oct  8 10:20:43 2002
***************
*** 402,407 ****
--- 402,408 ----
      const char *type = mimeGetContentType(icon);
      HttpReply *reply;
      http_version_t version;
+     request_t *r;
      if (type == NULL)
  	fatal("Unknown icon format while reading mime.conf\n");
      buf = internalLocalUri("/squid-internal-static/icons/", icon);
***************
*** 429,435 ****
      EBIT_SET(e->flags, ENTRY_SPECIAL);
      storeSetPublicKey(e);
      storeBuffer(e);
!     e->mem_obj->request = requestLink(urlParse(METHOD_GET, url));
      httpReplyReset(reply = e->mem_obj->reply);
      httpBuildVersion(&version, 1, 0);
      httpReplySetHeaders(reply, version, HTTP_OK, NULL,
--- 430,439 ----
      EBIT_SET(e->flags, ENTRY_SPECIAL);
      storeSetPublicKey(e);
      storeBuffer(e);
!     r = urlParse(METHOD_GET, url);
!     if (NULL == r)
! 	fatal("mimeLoadIcon: cannot parse internal URL");
!     e->mem_obj->request = requestLink(r);
      httpReplyReset(reply = e->mem_obj->reply);
      httpBuildVersion(&version, 1, 0);
      httpReplySetHeaders(reply, version, HTTP_OK, NULL,
Commit	Line	Data
d3969417 AM	1	Index: squid/src/mime.c
	2	diff -c squid/src/mime.c:1.102 squid/src/mime.c:1.102.2.1
	3	*** squid/src/mime.c:1.102 Tue Nov 13 10:32:15 2001
	4	--- squid/src/mime.c Tue Oct 8 10:20:43 2002
	5	***************
	6	* 402,407 **
	7	--- 402,408 ----
	8	const char *type = mimeGetContentType(icon);
	9	HttpReply *reply;
	10	http_version_t version;
	11	+ request_t *r;
	12	if (type == NULL)
	13	fatal("Unknown icon format while reading mime.conf\n");
	14	buf = internalLocalUri("/squid-internal-static/icons/", icon);
	15	***************
	16	* 429,435 **
	17	EBIT_SET(e->flags, ENTRY_SPECIAL);
	18	storeSetPublicKey(e);
	19	storeBuffer(e);
	20	! e->mem_obj->request = requestLink(urlParse(METHOD_GET, url));
	21	httpReplyReset(reply = e->mem_obj->reply);
	22	httpBuildVersion(&version, 1, 0);
	23	httpReplySetHeaders(reply, version, HTTP_OK, NULL,
	24	--- 430,439 ----
	25	EBIT_SET(e->flags, ENTRY_SPECIAL);
	26	storeSetPublicKey(e);
	27	storeBuffer(e);
	28	! r = urlParse(METHOD_GET, url);
	29	! if (NULL == r)
	30	! fatal("mimeLoadIcon: cannot parse internal URL");
	31	! e->mem_obj->request = requestLink(r);
	32	httpReplyReset(reply = e->mem_obj->reply);
	33	httpBuildVersion(&version, 1, 0);
	34	httpReplySetHeaders(reply, version, HTTP_OK, NULL,