From: jongfoster <jongfoster@users.sourceforge.net>
Date: Sun, 20 May 2001 16:44:47 +0000 (+0000)
Subject: Removing last hardcoded JunkBusters.com URLs.
X-Git-Tag: v_2_9_9~515
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@/faq/%22https:/%22javascript:back()/user-manual/diff?a=commitdiff_plain;h=f31670ca5360e64312185b670be81939f7a1c0f5;p=privoxy.git
Removing last hardcoded JunkBusters.com URLs.
---
diff --git a/filters.c b/filters.c
index d1262186..f61f4fc1 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.1.1.1 2001/05/15 13:58:52 oes Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.2 2001/05/20 01:21:20 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -38,6 +38,19 @@ const char filters_rcs[] = "$Id: filters.c,v 1.1.1.1 2001/05/15 13:58:52 oes Exp
*
* Revisions :
* $Log: filters.c,v $
+ * Revision 1.2 2001/05/20 01:21:20 jongfoster
+ * Version 2.9.4 checkin.
+ * - Merged popupfile and cookiefile, and added control over PCRS
+ * filtering, in new "permissionsfile".
+ * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration
+ * file error you now get a message box (in the Win32 GUI) rather
+ * than the program exiting with no explanation.
+ * - Made killpopup use the PCRS MIME-type checking and HTTP-header
+ * skipping.
+ * - Removed tabs from "config"
+ * - Moved duplicated url parsing code in "loaders.c" to a new funcition.
+ * - Bumped up version number.
+ *
* Revision 1.1.1.1 2001/05/15 13:58:52 oes
* Initial import of version 2.9.3 source tree
*
@@ -1186,17 +1199,9 @@ char *show_proxy_args(struct http_request *http, struct client_state *csp)
"<p><a href=\"show-proxy-args\">Back to proxy status</a></p>\n"
"<br>\n"
"<small><small><p>\n"
- "Code and documentation of the " BANNER " Proxy"
- "<sup><small>TM</small></sup>\n"
- "<a href=\"http://www.junkbusters.com/ht/en/legal.html#copy\">\n" "Copyright</a>© 1997 Junkbusters Corporation\n"
- "<a href=\"http://www.junkbusters.com/ht/en/legal.html#marks\"><sup><small>TM</small></sup></a><br>\n"
- "Copying and distribution permitted under the"
- "<a href=\"http://www.gnu.org/copyleft/gpl.html\">\n"
- "<small>GNU</small></a> "
- "General Public License.\n"
- "</small>"
- "<address><kbd>webmaster@junkbusters.com</kbd></address>"
- "</small>"
+ "The " BANNER " Proxy - \n"
+ "<a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a>\n"
+ "</small></small>"
"</body></html>\n");
return(s);
}
diff --git a/showargs.c b/showargs.c
index 999b60c1..d8035381 100644
--- a/showargs.c
+++ b/showargs.c
@@ -1,4 +1,4 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.2 2001/05/17 23:01:01 oes Exp $";
+const char showargs_rcs[] = "$Id: showargs.c,v 1.3 2001/05/20 01:21:20 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/showargs.c,v $
@@ -33,6 +33,19 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.2 2001/05/17 23:01:01 oes Exp $
*
* Revisions :
* $Log: showargs.c,v $
+ * Revision 1.3 2001/05/20 01:21:20 jongfoster
+ * Version 2.9.4 checkin.
+ * - Merged popupfile and cookiefile, and added control over PCRS
+ * filtering, in new "permissionsfile".
+ * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration
+ * file error you now get a message box (in the Win32 GUI) rather
+ * than the program exiting with no explanation.
+ * - Made killpopup use the PCRS MIME-type checking and HTTP-header
+ * skipping.
+ * - Removed tabs from "config"
+ * - Moved duplicated url parsing code in "loaders.c" to a new funcition.
+ * - Bumped up version number.
+ *
* Revision 1.2 2001/05/17 23:01:01 oes
* - Cleaned CRLF's from the sources and related files
*
@@ -335,7 +348,8 @@ void end_proxy_args(void)
SHOW_RCS(showargs_rcs)
SHOW_RCS(ssplit_h_rcs)
SHOW_RCS(ssplit_rcs)
-#ifdef _WIN32
+#ifdef _WIN32
+#ifndef _WIN_CONSOLE
SHOW_RCS(w32log_h_rcs)
SHOW_RCS(w32log_rcs)
SHOW_RCS(w32res_h_rcs)
@@ -343,6 +357,7 @@ void end_proxy_args(void)
SHOW_RCS(w32rulesdlg_rcs)
SHOW_RCS(w32taskbar_h_rcs)
SHOW_RCS(w32taskbar_rcs)
+#endif /* ndef _WIN_CONSOLE */
SHOW_RCS(win32_h_rcs)
SHOW_RCS(win32_rcs)
#endif /* def _WIN32 */
@@ -447,17 +462,13 @@ void end_proxy_args(void)
b = strsav(b,
"<small><small><p>\n"
- "Code and documentation of the " BANNER " Proxy"
- "<sup><small>TM</small></sup>\n"
- "<a href=\"http://www.junkbusters.com/ht/en/legal.html#copy\">\n" "Copyright</a>© 1997 Junkbusters Corporation\n"
- "<a href=\"http://www.junkbusters.com/ht/en/legal.html#marks\"><sup><small>TM</small></sup></a><br>\n"
- "Copying and distribution permitted under the"
- "<a href=\"http://www.gnu.org/copyleft/gpl.html\">\n"
- "<small>GNU</small></a> "
- "General Public License.\n"
- "</small>"
- "<address><kbd>webmaster@junkbusters.com</kbd></address>"
- "</small>"
+ "The " BANNER " Proxy - \n"
+ "<a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a><p>\n"
+ "Copyright © 2001 <a href=\"" HOME_PAGE_URL "\">the SourceForge IJBSWA team</a><br>\n"
+ "Copyright © 1997 <a href=\"http://www.junkbusters.com/\">\n" "Junkbusters Corporation</a><br>\n"
+ "Copying and distribution permitted under the "
+ "<a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU General Public License.</a>\n"
+ "</small></small>"
"</body></html>\n"
);