X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=showargs.c;h=3889b8c62d5f2e573da6b747e7635299074a3d75;hp=98d90446828c6276cee1709d880b85c4e1462f06;hb=990fa0b0a3c506d266fab5d2016b43bbafaad547;hpb=1df3ac22a584579c66453e938809929e8e20e160;ds=sidebyside diff --git a/showargs.c b/showargs.c index 98d90446..3889b8c6 100644 --- a/showargs.c +++ b/showargs.c @@ -1,4 +1,4 @@ -const char showargs_rcs[] = "$Id: showargs.c,v 1.1.1.1 2001/05/15 13:59:03 oes Exp $"; +const char showargs_rcs[] = "$Id: showargs.c,v 1.6 2001/05/25 22:32:56 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/showargs.c,v $ @@ -33,6 +33,72 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.1.1.1 2001/05/15 13:59:03 oes E * * Revisions : * $Log: showargs.c,v $ + * Revision 1.6 2001/05/25 22:32:56 jongfoster + * CRLF->LF + * + * Revision 1.5 2001/05/22 18:54:49 oes + * + * - Enabled filtering banners by size rather than URL + * by adding patterns that replace all standard banner + * sizes with the "Junkbuster" gif to the re_filterfile + * + * - Enabled filtering WebBugs by providing a pattern + * which kills all 1x1 images + * + * - Added support for PCRE_UNGREEDY behaviour to pcrs, + * which is selected by the (nonstandard and therefore + * capital) letter 'U' in the option string. + * It causes the quantifiers to be ungreedy by default. + * Appending a ? turns back to greedy (!). + * + * - Added a new interceptor ijb-send-banner, which + * sends back the "Junkbuster" gif. Without imagelist or + * MSIE detection support, or if tinygif = 1, or the + * URL isn't recognized as an imageurl, a lame HTML + * explanation is sent instead. + * + * - Added new feature, which permits blocking remote + * script redirects and firing back a local redirect + * to the browser. + * The feature is conditionally compiled, i.e. it + * can be disabled with --disable-fast-redirects, + * plus it must be activated by a "fast-redirects" + * line in the config file, has its own log level + * and of course wants to be displayed by show-proxy-args + * Note: Boy, all the #ifdefs in 1001 locations and + * all the fumbling with configure.in and acconfig.h + * were *way* more work than the feature itself :-( + * + * - Because a generic redirect template was needed for + * this, tinygif = 3 now uses the same. + * + * - Moved GIFs, and other static HTTP response templates + * to project.h + * + * - Some minor fixes + * + * - Removed some >400 CRs again (Jon, you really worked + * a lot! ;-) + * + * Revision 1.4 2001/05/20 16:44:47 jongfoster + * Removing last hardcoded JunkBusters.com URLs. + * + * 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 + * * Revision 1.1.1.1 2001/05/15 13:59:03 oes * Initial import of version 2.9.3 source tree * @@ -48,6 +114,7 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.1.1.1 2001/05/15 13:59:03 oes E #include #include +#include "project.h" #include "showargs.h" #include "jcc.h" #include "encode.h" @@ -100,16 +167,16 @@ char *strsav(char *old, const char *text_to_append) { if ((p = realloc(old, new_len)) == NULL) { - log_error(LOG_LEVEL_ERROR, "realloc(%d) bytes for proxy_args failed!", new_len); - exit(1); + log_error(LOG_LEVEL_FATAL, "realloc(%d) bytes for proxy_args failed!", new_len); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ } } else { if ((p = (char *)malloc(new_len)) == NULL) { - log_error(LOG_LEVEL_ERROR, "malloc(%d) bytes for proxy_args failed!", new_len); - exit(1); + log_error(LOG_LEVEL_FATAL, "malloc(%d) bytes for proxy_args failed!", new_len); + /* Never get here - LOG_LEVEL_FATAL causes program exit */ } } @@ -134,7 +201,7 @@ char *strsav(char *old, const char *text_to_append) * Returns : N/A * *********************************************************************/ -void savearg(char *c, char *o) +void savearg(char *c, char *o, struct configuration_spec * config) { char buf[BUFSIZ]; @@ -170,7 +237,7 @@ void savearg(char *c, char *o) strcat(buf, "
\n"); - proxy_args->invocation = strsav(proxy_args->invocation, buf); + config->proxy_args->invocation = strsav(config->proxy_args->invocation, buf); } @@ -188,18 +255,20 @@ void savearg(char *c, char *o) * Returns : N/A * *********************************************************************/ -void init_proxy_args(int argc, const char *argv[]) +void init_proxy_args(int argc, const char *argv[], struct configuration_spec * config) { const struct gateway *g; + char * b; int i; - freez(proxy_args->header); - freez(proxy_args->invocation); - freez(proxy_args->gateways); - freez(proxy_args->trailer); + freez(config->proxy_args->header); + freez(config->proxy_args->invocation); + freez(config->proxy_args->gateways); + freez(config->proxy_args->trailer); - proxy_args->header = strsav(proxy_args->header, + b = NULL; + b = strsav(b, "HTTP/1.0 200 OK\n" "Server: IJ/" VERSION "\n" "Content-type: text/html\n\n" @@ -219,35 +288,38 @@ void init_proxy_args(int argc, const char *argv[]) "

\n" ); - proxy_args->header = strsav(proxy_args->header, + b = strsav(b, "

The program was invoked as follows

\n"); for (i=0; i < argc; i++) { - proxy_args->header = strsav(proxy_args->header, argv[i]); - proxy_args->header = strsav(proxy_args->header, " "); + b = strsav(b, argv[i]); + b = strsav(b, " "); } - proxy_args->header = strsav(proxy_args->header, "
\n"); + b = strsav(b, "
\n"); + config->proxy_args->header = b; - proxy_args->invocation = strsav( - proxy_args->invocation, + config->proxy_args->invocation = strsav( + config->proxy_args->invocation, "
\n" "and the following options were set in the configuration file" "

\n" ); + b = NULL; - proxy_args->gateways = strsav(proxy_args->gateways, + b = strsav(b, "

It supports the following gateway protocols:

\n"); for (g = gateways; g->name; g++) { - proxy_args->gateways = strsav(proxy_args->gateways, g->name); - proxy_args->gateways = strsav(proxy_args->gateways, " "); + b = strsav(b, g->name); + b = strsav(b, " "); } - proxy_args->gateways = strsav(proxy_args->gateways, "
\n"); + b = strsav(b, "
\n"); + config->proxy_args->gateways = b; } @@ -262,7 +334,7 @@ void init_proxy_args(int argc, const char *argv[]) * Returns : N/A * *********************************************************************/ -void end_proxy_args(void) +void end_proxy_args(struct configuration_spec * config) { char *b = NULL; char buf[BUFSIZ]; @@ -333,6 +405,7 @@ void end_proxy_args(void) SHOW_RCS(ssplit_h_rcs) SHOW_RCS(ssplit_rcs) #ifdef _WIN32 +#ifndef _WIN_CONSOLE SHOW_RCS(w32log_h_rcs) SHOW_RCS(w32log_rcs) SHOW_RCS(w32res_h_rcs) @@ -340,6 +413,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 */ @@ -440,25 +514,27 @@ void end_proxy_args(void) b = strsav(b, "
  • #undef JAR_FILES - Disables the use of jar files to capture cookies.
    • \n"); #endif /* ndef JAR_FILES */ +#ifdef FAST_REDIRECTS + b = strsav(b, "
  • #define FAST_REDIRECTS - Enables intercepting remote script redirects.
    • \n"); +#else /* ifndef FAST_REDIRECTS */ + b = strsav(b, "
  • #undef FAST_REDIRECTS - Disables intercepting remote script redirects.
    • \n"); +#endif ndef /* FAST_REDIRECTS */ + b = strsav(b, "\n
    \n"); b = strsav(b, "

    \n" - "Code and documentation of the " BANNER " Proxy" - "TM\n" - "\n" "Copyright© 1997 Junkbusters Corporation\n" - "TM
    \n" - "Copying and distribution permitted under the" - "\n" - "GNU " - "General Public License.\n" - "    " - "

    webmaster@junkbusters.com
    " - "    " + "The " BANNER " Proxy - \n" + "" HOME_PAGE_URL "

    \n" + "Copyright © 2001 the SourceForge IJBSWA team
    \n" + "Copyright © 1997 \n" "Junkbusters Corporation
    \n" + "Copying and distribution permitted under the " + "GNU General Public License.\n" + "" "\n" ); - proxy_args->trailer = b; + config->proxy_args->trailer = b; }