X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=project.h;h=6ba5c578932112d96d719e6f9e793149d048e238;hb=e9cce70a7b744e3b7ce9bafcf64c7827c1c1f675;hp=86252656c2ae2fc5fab936f8e9cb66ffef6c5229;hpb=52bd067225c1e12ecf7156e5707161ed7df8e8c4;p=privoxy.git diff --git a/project.h b/project.h index 86252656..6ba5c578 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.54 2002/03/09 20:03:52 jongfoster Exp $" +#define PROJECT_H_VERSION "$Id: project.h,v 1.61 2002/03/26 22:29:55 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/project.h,v $ @@ -10,7 +10,7 @@ * (though it does declare some macros). * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,27 @@ * * Revisions : * $Log: project.h,v $ + * Revision 1.61 2002/03/26 22:29:55 swa + * we have a new homepage! + * + * Revision 1.60 2002/03/24 15:52:17 jongfoster + * Changing CGI URL prefixes for new name + * + * Revision 1.59 2002/03/24 15:23:33 jongfoster + * Name changes + * + * 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 + * + * Revision 1.56 2002/03/13 20:27:30 oes + * Fixing bug with CT_TABOO + * + * Revision 1.55 2002/03/12 01:42:50 oes + * Introduced modular filters + * * Revision 1.54 2002/03/09 20:03:52 jongfoster * - Making various functions return int rather than size_t. * (Undoing a recent change). Since size_t is unsigned on @@ -633,10 +654,10 @@ struct iob #define IOB_PEEK(CSP) ((CSP->iob->cur > CSP->iob->eod) ? (CSP->iob->eod - CSP->iob->cur) : 0) #define IOB_RESET(CSP) if(CSP->iob->buf) free(CSP->iob->buf); memset(CSP->iob, '\0', sizeof(CSP->iob)); -/* Keys for csp->content_type */ +/* Bits for csp->content_type */ #define CT_TEXT 1 /* Suitable for pcrs filtering */ #define CT_GIF 2 /* Suitable for GIF filtering */ -#define CT_TABOO 3 /* DONT filter */ +#define CT_TABOO 4 /* DONT filter */ #define ACTION_MASK_ALL (~0U) @@ -750,7 +771,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 { @@ -849,7 +870,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 { @@ -929,7 +950,8 @@ struct forward_spec */ struct re_filterfile_spec { - char *filtername; /* Name from FILTER: statement in re_filterfile (or "default") */ + char *name; /* Name from FILTER: statement in re_filterfile */ + char *description; /* Description from FILTER: statement in re_filterfile */ struct list patterns[1]; /* The patterns from the re_filterfile */ pcrs_job *joblist; /* The resulting compiled pcrs_jobs */ struct re_filterfile_spec *next; /* The pointer for chaining */ @@ -1037,7 +1059,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 @@ -1048,7 +1070,7 @@ struct configuration_spec /* Hardwired URLs */ -#define HOME_PAGE_URL "http://ijbswa.sourceforge.net" +#define HOME_PAGE_URL "http://www.privoxy.org" #define REDIRECT_URL HOME_PAGE_URL "/redirect.php?v=" VERSION "&to=" /* @@ -1060,9 +1082,9 @@ struct configuration_spec * 2) CGI_SITE_2_PATH must not end with /, one will be added automatically. * 3) CGI_SITE_2_PATH must start with /, unless it is the empty string. */ -#define CGI_SITE_1_HOST "i.j.b" -#define CGI_SITE_2_HOST "ijbswa.sourceforge.net" -#define CGI_SITE_2_PATH "/config" +#define CGI_SITE_1_HOST "p.p" +#define CGI_SITE_2_HOST "config.privoxy.org" +#define CGI_SITE_2_PATH "" /* * The prefix for CGI pages. Written out in generated HTML. @@ -1074,7 +1096,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";