From: jongfoster Date: Sun, 24 Mar 2002 15:23:33 +0000 (+0000) Subject: Name changes X-Git-Tag: v_2_9_13~16 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=76514c066f4b46ba1d63e2255edfb59f6e3ce3b3 Name changes --- diff --git a/actionlist.h b/actionlist.h index d74b7a81..f65c9650 100644 --- a/actionlist.h +++ b/actionlist.h @@ -39,6 +39,9 @@ * * Revisions : * $Log: actionlist.h,v $ + * Revision 1.12 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.11 2002/03/12 01:42:49 oes * Introduced modular filters * @@ -102,7 +105,7 @@ DEFINE_CGI_PARAM_RADIO ("hide-referer", ACTION_HIDE_REFERER, ACTION_STRI DEFINE_CGI_PARAM_RADIO ("hide-referer", ACTION_HIDE_REFERER, ACTION_STRING_REFERER, "block", 0) DEFINE_CGI_PARAM_CUSTOM ("hide-referer", ACTION_HIDE_REFERER, ACTION_STRING_REFERER, "http://www.google.com/") DEFINE_ACTION_STRING ("hide-user-agent", ACTION_HIDE_USER_AGENT, ACTION_STRING_USER_AGENT) -DEFINE_CGI_PARAM_NO_RADIO("hide-user-agent", ACTION_HIDE_USER_AGENT, ACTION_STRING_USER_AGENT, "JunkBuster/3.0 (Anonymized)") +DEFINE_CGI_PARAM_NO_RADIO("hide-user-agent", ACTION_HIDE_USER_AGENT, ACTION_STRING_USER_AGENT, "Privoxy/3.0 (Anonymous)") DEFINE_ACTION_BOOL ("image", ACTION_IMAGE) DEFINE_ACTION_STRING ("image-blocker", ACTION_IMAGE_BLOCKER, ACTION_STRING_IMAGE_BLOCKER) DEFINE_CGI_PARAM_RADIO ("image-blocker", ACTION_IMAGE_BLOCKER, ACTION_STRING_IMAGE_BLOCKER, "pattern", 1) diff --git a/cgi.c b/cgi.c index 73461ddb..b5b963d8 100644 --- a/cgi.c +++ b/cgi.c @@ -1,4 +1,4 @@ -const char cgi_rcs[] = "$Id: cgi.c,v 1.50 2002/03/16 23:54:06 jongfoster Exp $"; +const char cgi_rcs[] = "$Id: cgi.c,v 1.51 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgi.c,v $ @@ -38,6 +38,9 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.50 2002/03/16 23:54:06 jongfoster Exp $"; * * Revisions : * $Log: cgi.c,v $ + * Revision 1.51 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.50 2002/03/16 23:54:06 jongfoster * Adding graceful termination feature, to help look for memory leaks. * If you enable this (which, by design, has to be done by hand @@ -359,7 +362,7 @@ static const struct cgi_dispatcher cgi_dispatchers[] = { "Show which actions apply to a URL and why" }, { "toggle", cgi_toggle, - "Toggle JunkBuster on or off" }, + "Toggle Privoxy on or off" }, #ifdef FEATURE_CGI_EDIT_ACTIONS { "edit-actions", cgi_edit_actions, @@ -856,15 +859,15 @@ void cgi_init_error_messages(void) { memset(cgi_error_memory_response, '\0', sizeof(*cgi_error_memory_response)); cgi_error_memory_response->head = - "HTTP/1.0 500 Internal JunkBuster Proxy Error\r\n" + "HTTP/1.0 500 Internal Privoxy Error\r\n" "Content-Type: text/html\r\n" "\r\n"; cgi_error_memory_response->body = "\r\n" - "500 Internal JunkBuster Proxy Error\r\n" + "500 Internal Privoxy Error\r\n" "\r\n" - "

500 Internal JunkBuster Proxy Error

\r\n" - "

JunkBuster ran out of memory while processing your request.

\r\n" + "

500 Internal Privoxy Error

\r\n" + "

Privoxy ran out of memory while processing your request.

\r\n" "

Please contact your proxy administrator, or try again later

\r\n" "\r\n" "\r\n"; @@ -926,13 +929,13 @@ jb_err cgi_error_no_template(struct client_state *csp, const char *template_name) { static const char status[] = - "500 Internal JunkBuster Proxy Error"; + "500 Internal Privoxy Error"; static const char body_prefix[] = "\r\n" - "500 Internal JunkBuster Proxy Error\r\n" + "500 Internal Privoxy Error\r\n" "\r\n" - "

500 Internal JunkBuster Proxy Error

\r\n" - "

JunkBuster encountered an error while processing your request:

\r\n" + "

500 Internal Privoxy Error

\r\n" + "

Privoxy encountered an error while processing your request:

\r\n" "

Could not load template file "; static const char body_suffix[] = "

\r\n" @@ -940,10 +943,10 @@ jb_err cgi_error_no_template(struct client_state *csp, "

If you are the proxy administrator, please put the required file " "in the (confdir)/templates directory. The " "location of the (confdir) directory " - "is specified in the main JunkBuster config " - "file. (It's typically the JunkBuster install directory" + "is specified in the main Privoxy config " + "file. (It's typically the Privoxy install directory" #ifndef _WIN32 - ", or /etc/junkbuster/" + ", or /etc/privoxy/" #endif /* ndef _WIN32 */ ").

\r\n" "\r\n" @@ -1136,7 +1139,7 @@ struct http_response *finish_http_response(struct http_response *rsp) { /* * Set Expires to about 10 min into the future so it'll get reloaded - * occasionally, e.g. if IJB gets upgraded. + * occasionally, e.g. if Privoxy gets upgraded. */ if (!err) diff --git a/cgiedit.c b/cgiedit.c index a7cbd7de..2766f115 100644 --- a/cgiedit.c +++ b/cgiedit.c @@ -1,4 +1,4 @@ -const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.22 2002/03/24 13:25:43 swa Exp $"; +const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.23 2002/03/24 13:32:41 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $ @@ -42,6 +42,9 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.22 2002/03/24 13:25:43 swa Exp $" * * Revisions : * $Log: cgiedit.c,v $ + * Revision 1.23 2002/03/24 13:32:41 swa + * name change related issues + * * Revision 1.22 2002/03/24 13:25:43 swa * name change related issues * @@ -266,7 +269,7 @@ struct file_line struct editable_file { struct file_line * lines; - const char * filename; /* Full pathname - e.g. "/etc/junkbuster/wibble.action" */ + const char * filename; /* Full pathname - e.g. "/etc/privoxy/wibble.action" */ const char * identifier; /* Filename stub - e.g. "wibble". Use for CGI param. */ /* Pre-encoded with url_encode() for ease of use. */ const char * version_str; /* Last modification time, as a string. For CGI param */ @@ -2455,7 +2458,7 @@ jb_err cgi_edit_actions(struct client_state *csp, return JB_ERR_MEMORY; } if (enlist_unique_header(rsp->headers, "Location", - CGI_PREFIX "edit-actions-list?f=ijb")) + CGI_PREFIX "edit-actions-list?f=default")) { free(rsp->status); rsp->status = NULL; diff --git a/cgisimple.c b/cgisimple.c index 710466ac..d81c1b35 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.19 2002/03/16 23:54:06 jongfoster Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.20 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.19 2002/03/16 23:54:06 jongfo * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.20 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.19 2002/03/16 23:54:06 jongfoster * Adding graceful termination feature, to help look for memory leaks. * If you enable this (which, by design, has to be done by hand @@ -252,7 +255,7 @@ jb_err cgi_error_404(struct client_state *csp, return JB_ERR_MEMORY; } - rsp->status = strdup("404 JunkBuster configuration page not found"); + rsp->status = strdup("404 Privoxy configuration page not found"); if (rsp->status == NULL) { free_map(exports); @@ -268,7 +271,7 @@ jb_err cgi_error_404(struct client_state *csp, * * Function : cgi_die * - * Description : CGI function to shut down JunkBuster. + * Description : CGI function to shut down Privoxy. * NOTE: Turning this on in a production build * would be a BAD idea. An EXTREMELY BAD idea. * In short, don't do it. @@ -499,7 +502,7 @@ jb_err cgi_transparent_image(struct client_state *csp, * Function : cgi_show_version * * Description : CGI function that returns a a web page describing the - * file versions of IJB. + * file versions of Privoxy. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) @@ -542,7 +545,7 @@ jb_err cgi_show_version(struct client_state *csp, * Function : cgi_show_status * * Description : CGI function that returns a a web page describing the - * current status of IJB. + * current status of Privoxy. * * Parameters : * 1 : csp = Current client state (buffers, headers, etc...) @@ -762,7 +765,7 @@ jb_err cgi_show_status(struct client_state *csp, * Function : cgi_show_url_info * * Description : CGI function that determines and shows which actions - * junkbuster will perform for a given url, and which + * Privoxy will perform for a given url, and which * matches starting from the defaults have lead to that. * * Parameters : diff --git a/errlog.c b/errlog.c index fde6cfe4..b9ad70c4 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.33 2002/03/13 00:27:04 jongfoster Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -33,6 +33,9 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.33 2002/03/13 00:27:04 jongfoster E * * Revisions : * $Log: errlog.c,v $ + * Revision 1.34 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.33 2002/03/13 00:27:04 jongfoster * Killing warnings * @@ -269,7 +272,7 @@ static char *w32_socket_strerr(int errcode, char *tmp_buf); static void fatal_error(const char * error_message) { #if defined(_WIN32) && !defined(_WIN_CONSOLE) - MessageBox(g_hwndLogFrame, error_message, "Internet JunkBuster Error", + MessageBox(g_hwndLogFrame, error_message, "Privoxy Error", MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST); /* Cleanup - remove taskbar icon etc. */ @@ -332,7 +335,7 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel) logfp = fp; } - log_error(LOG_LEVEL_INFO, "Internet JunkBuster version " VERSION); + log_error(LOG_LEVEL_INFO, "Privoxy version " VERSION); if (prog_name != NULL) { log_error(LOG_LEVEL_INFO, "Program name: %s", prog_name); @@ -427,41 +430,41 @@ void log_error(int loglevel, char *fmt, ...) switch (loglevel) { case LOG_LEVEL_ERROR: - outc = sprintf(outbuf, "IJB(%ld) Error: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Error: ", this_thread); break; case LOG_LEVEL_FATAL: - outc = sprintf(outbuf, "IJB(%ld) Fatal error: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Fatal error: ", this_thread); break; case LOG_LEVEL_GPC: - outc = sprintf(outbuf, "IJB(%ld) Request: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Request: ", this_thread); break; case LOG_LEVEL_CONNECT: - outc = sprintf(outbuf, "IJB(%ld) Connect: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Connect: ", this_thread); break; case LOG_LEVEL_LOG: - outc = sprintf(outbuf, "IJB(%ld) Writing: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Writing: ", this_thread); break; case LOG_LEVEL_HEADER: - outc = sprintf(outbuf, "IJB(%ld) Header: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Header: ", this_thread); break; case LOG_LEVEL_INFO: - outc = sprintf(outbuf, "IJB(%ld) Info: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Info: ", this_thread); break; case LOG_LEVEL_RE_FILTER: - outc = sprintf(outbuf, "IJB(%ld) Re-Filter: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Re-Filter: ", this_thread); break; #ifdef FEATURE_FORCE_LOAD case LOG_LEVEL_FORCE: - outc = sprintf(outbuf, "IJB(%ld) Force: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Force: ", this_thread); break; #endif /* def FEATURE_FORCE_LOAD */ #ifdef FEATURE_FAST_REDIRECTS case LOG_LEVEL_REDIRECTS: - outc = sprintf(outbuf, "IJB(%ld) Redirect: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Redirect: ", this_thread); break; #endif /* def FEATURE_FAST_REDIRECTS */ case LOG_LEVEL_DEANIMATE: - outc = sprintf(outbuf, "IJB(%ld) Gif-Deanimate: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Gif-Deanimate: ", this_thread); break; case LOG_LEVEL_CLF: outbuf = outbuf_save; @@ -470,14 +473,14 @@ void log_error(int loglevel, char *fmt, ...) break; #ifdef FEATURE_KILL_POPUPS case LOG_LEVEL_POPUPS: - outc = sprintf(outbuf, "IJB(%ld) Kill-Popups: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Kill-Popups: ", this_thread); break; #endif /* def FEATURE_KILL_POPUPS */ case LOG_LEVEL_CGI: - outc = sprintf(outbuf, "IJB(%ld) CGI: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) CGI: ", this_thread); break; default: - outc = sprintf(outbuf, "IJB(%ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); + outc = sprintf(outbuf, "Privoxy(%ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); break; } @@ -552,7 +555,7 @@ void log_error(int loglevel, char *fmt, ...) else { /* Error */ - sprintf(outbuf, "IJB(%ld) Error: log_error(): Bad format string:\n" + sprintf(outbuf, "Privoxy(%ld) Error: log_error(): Bad format string:\n" "Format = \"%s\"\n" "Exiting.", this_thread, fmt); /* FIXME RACE HAZARD: should start critical section error_log_use here */ @@ -695,7 +698,7 @@ void log_error(int loglevel, char *fmt, ...) } break; default: - sprintf(outbuf, "IJB(%ld) Error: log_error(): Bad format string:\n" + sprintf(outbuf, "Privoxy(%ld) Error: log_error(): Bad format string:\n" "Format = \"%s\"\n" "Exiting.", this_thread, fmt); /* FIXME RACE HAZARD: should start critical section error_log_use here */ diff --git a/filters.c b/filters.c index 48554aad..15775dfb 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.49 2002/03/16 20:29:14 oes Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.50 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -38,6 +38,9 @@ const char filters_rcs[] = "$Id: filters.c,v 1.49 2002/03/16 20:29:14 oes Exp $" * * Revisions : * $Log: filters.c,v $ + * Revision 1.50 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.49 2002/03/16 20:29:14 oes * Cosmetics * @@ -740,7 +743,7 @@ struct http_response *block_url(struct client_state *csp) else { - rsp->status = strdup("302 Local Redirect from Junkbuster"); + rsp->status = strdup("302 Local Redirect from Privoxy"); if (rsp->status == NULL) { free_http_response(rsp); @@ -769,7 +772,7 @@ struct http_response *block_url(struct client_state *csp) { p = CGI_PREFIX "send-banner?type=pattern"; } - rsp->status = strdup("302 Local Redirect from Junkbuster"); + rsp->status = strdup("302 Local Redirect from Privoxy"); if (rsp->status == NULL) { free_http_response(rsp); @@ -1042,7 +1045,7 @@ struct http_response *redirect_url(struct client_state *csp) } if ( enlist_unique_header(rsp->headers, "Location", q) - || (NULL == (rsp->status = strdup("302 Local Redirect from Junkbuster"))) ) + || (NULL == (rsp->status = strdup("302 Local Redirect from Privoxy"))) ) { free_http_response(rsp); return cgi_error_memory(); diff --git a/jcc.c b/jcc.c index e4dadaab..7eb369e5 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.83 2002/03/16 23:54:06 jongfoster Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.84 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -33,6 +33,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.83 2002/03/16 23:54:06 jongfoster Exp $"; * * Revisions : * $Log: jcc.c,v $ + * Revision 1.84 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.83 2002/03/16 23:54:06 jongfoster * Adding graceful termination feature, to help look for memory leaks. * If you enable this (which, by design, has to be done by hand @@ -1607,7 +1610,7 @@ static int32 server_thread(void *data) *********************************************************************/ void usage(const char *myname) { - printf("JunkBuster proxy version " VERSION " (" HOME_PAGE_URL ")\n" + printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n" "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [--user user[.group]] [configfile]\n" "Aborting.\n", myname); @@ -1677,7 +1680,7 @@ int main(int argc, const char *argv[]) else if(strcmp(argv[argc_pos], "--version") == 0) { - printf("Junkbuster version " VERSION " (" HOME_PAGE_URL ")\n"); + printf("Privoxy version " VERSION " (" HOME_PAGE_URL ")\n"); exit(0); } @@ -1902,7 +1905,7 @@ int main(int argc, const char *argv[]) * on failure. * * Parameters : - * 1 : config = Junkbuster configuration. Specifies port + * 1 : config = Privoxy configuration. Specifies port * to bind to. * * Returns : Port that was opened. @@ -1941,7 +1944,7 @@ static jb_socket bind_port_helper(struct configuration_spec * config) { case -3 : log_error(LOG_LEVEL_FATAL, "can't bind to %s:%d: " - "There may be another junkbuster or some other " + "There may be another Privoxy or some other " "proxy running on port %d", (NULL != config->haddr) ? config->haddr : "INADDR_ANY", config->hport, config->hport); @@ -2157,7 +2160,7 @@ static void listen_loop(void) NP_Entry, (ULONG)server_thread, NP_Output, Output(), NP_CloseOutput, FALSE, - NP_Name, (ULONG)"junkbuster child", + NP_Name, (ULONG)"privoxy child", NP_StackSize, 200*1024, TAG_DONE))) { @@ -2251,6 +2254,9 @@ static void listen_loop(void) sweep(); sweep(); +#if defined(unix) + free(basedir); +#endif #if defined(_WIN32) && !defined(_WIN_CONSOLE) /* Cleanup - remove taskbar icon etc. */ TermLogWindow(); diff --git a/pcre/config.h b/pcre/config.h index 89b7ac4b..c767cbb4 100644 --- a/pcre/config.h +++ b/pcre/config.h @@ -1,5 +1,5 @@ -/* For JunkBuster, we just use JunkBuster's config.h */ +/* For Privoxy, we just use Privoxy's config.h */ #include "../config.h" diff --git a/project.h b/project.h index 263aae05..12eb23ce 100644 --- a/project.h +++ b/project.h @@ -1,6 +1,6 @@ #ifndef PROJECT_H_INCLUDED #define PROJECT_H_INCLUDED -#define PROJECT_H_VERSION "$Id: project.h,v 1.57 2002/03/16 20:28:34 oes Exp $" +#define PROJECT_H_VERSION "$Id: project.h,v 1.58 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/project.h,v $ @@ -36,6 +36,9 @@ * * Revisions : * $Log: project.h,v $ + * Revision 1.58 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.57 2002/03/16 20:28:34 oes * Added descriptions to the filters so users will know what they select in the cgi editor * @@ -759,7 +762,7 @@ struct url_actions #define CSP_FLAG_TOGGLED_ON 0x20 /* Set if we are toggled on (FEATURE_TOGGLE) */ /* - * The state of a JunkBuster processing thread. + * The state of a Privoxy processing thread. */ struct client_state { @@ -858,7 +861,7 @@ struct cgi_dispatcher /* - * A data file used by JunkBuster. Kept in a linked list. + * A data file used by Privoxy. Kept in a linked list. */ struct file_list { @@ -1047,7 +1050,7 @@ struct configuration_spec #define SZ(X) (sizeof(X) / sizeof(*X)) #ifdef FEATURE_FORCE_LOAD -#define FORCE_PREFIX "/IJB-FORCE-LOAD" +#define FORCE_PREFIX "/PRIVOXY-FORCE" #endif /* def FEATURE_FORCE_LOAD */ #ifdef FEATURE_NO_GIFS @@ -1084,7 +1087,7 @@ struct configuration_spec /* HTTP snipplets */ static const char CSUCCEED[] = "HTTP/1.0 200 Connection established\n" - "Proxy-Agent: IJ/" VERSION "\r\n\r\n"; + "Proxy-Agent: Privoxy/" VERSION "\r\n\r\n"; static const char CHEADER[] = "HTTP/1.0 400 Invalid header received from browser\r\n\r\n"; diff --git a/templates/blocked b/templates/blocked index bced08f1..9097b522 100644 --- a/templates/blocked +++ b/templates/blocked @@ -92,8 +92,7 @@

BLOCKED

This is the Internet JUNKBUSTER - @version@ on @my-hostname@ (@my-ip-address@), port @my-port@, @if-enabled-display-then@Enabled@else-not-enabled-display@Disabled@endif-enabled-display@