* Changed the favicon support to LINK tags in the HEAD of static stuff,

  to make life easier.  (Thanks to prosthetik for this)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index ca740bd7dc0953fc512210219e84687991a117fd..ab1f7698cdf9007043ef5ff9e2e1523276e9cc05 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 505.4  2004/02/25 23:00:21  ajc
+* Changed the favicon support to LINK tags in the HEAD of static stuff,
+  to make life easier.  (Thanks to prosthetik for this)
+
 Revision 505.3  2004/02/25 15:20:11  ajc
 * Support for favicon.ico in the static/ directory
 
@@ -1674,4 +1678,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 8053141d609218a520d9d67aeb16dfbb21e9e993..3e3302a1b6685fb3983ac4700d671caf94bbf2df 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -316,13 +316,6 @@ void context_loop(int sock)
                                "?force_close_session=yes HTTP/1.0");
        }
 
-       /*
-        * favicon.ico can't be in the root...
-        */
-       if (!strncasecmp(buf, "/favicon.ico", 12)) {
-               strcpy(req->line, "GET /static/favicon.ico");
-       }
-
        /* These are the URL's which may be executed without a
         * session cookie already set.  If it's not one of these,
         * force the session to close because cookies are

diff --git a/webcit/static/head.html b/webcit/static/head.html
index 0a8ada22a5e65c19a9c948e2b880058859ccfa53..6cbd7cc8d92020fbae174d85d878ed71cc1f99c2 100644 (file)
--- a/webcit/static/head.html
+++ b/webcit/static/head.html
@@ -8,6 +8,7 @@
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
        <META HTTP-EQUIV="Content-Language" CONTENT="en">
        <LINK REL="StyleSheet" HREF="/static/style.css" TYPE="text/css" MEDIA="screen">
+       <LINK REL="shortcut icon" HREF="/static/favicon.ico" TYPE="image/x-icon">
 <?REFRESHTAG>
 </HEAD>
 <?PAGERSCRIPT>

diff --git a/webcit/static/mainframeset.html b/webcit/static/mainframeset.html
index e07f5dc3bc714ce0b1c981ffadc4333c0e27fe8f..55ef53bfec6dee5abfd6eb591faa3cc7d38016d7 100644 (file)
--- a/webcit/static/mainframeset.html
+++ b/webcit/static/mainframeset.html
@@ -4,6 +4,7 @@
        <TITLE>Citadel</TITLE>
        <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
        <META HTTP-EQUIV="Content-Language" CONTENT="en">
+       <LINK REL="shortcut icon" HREF="/static/favicon.ico" TYPE="image/x-icon">
 </HEAD>
 
 <FRAMESET COLS="80, *" FRAMESPACING="0" BORDER="FALSE" FRAMEBORDER="0">