X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=parsers.h;h=458d2c7cb775adf356faa4530e8c2934b3a1dbc4;hp=6d4bcef6b839cdc775e9a1d8116b9e990ebe71db;hb=3939d3eae875607c76d7bb3314ff6ca6d0590f40;hpb=34fc68ad1f19d0ed17f8ecd47d197fcf3f6f9d05

diff --git a/parsers.h b/parsers.h
index 6d4bcef6..458d2c7c 100644
--- a/parsers.h
+++ b/parsers.h
@@ -1,6 +1,6 @@
-#ifndef _PARSERS_H
-#define _PARSERS_H
-#define PARSERS_H_VERSION "$Id: parsers.h,v 1.6 2001/06/03 11:03:48 oes Exp $"
+#ifndef PARSERS_H_INCLUDED
+#define PARSERS_H_INCLUDED
+#define PARSERS_H_VERSION "$Id: parsers.h,v 1.10 2001/07/30 22:08:36 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.h,v $
@@ -43,60 +43,25 @@
  *
  * Revisions   :
  *    $Log: parsers.h,v $
- *    Revision 1.6  2001/06/03 11:03:48  oes
- *    Makefile/in
+ *    Revision 1.10  2001/07/30 22:08:36  jongfoster
+ *    Tidying up #defines:
+ *    - All feature #defines are now of the form FEATURE_xxx
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
  *
- *    introduced cgi.c
+ *    Revision 1.9  2001/07/29 18:43:08  jongfoster
+ *    Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to
+ *    ANSI C rules.
  *
- *    actions.c:
+ *    Revision 1.8  2001/07/13 14:01:54  oes
+ *    Removed all #ifdef PCRS
  *
- *    adapted to new enlist_unique arg format
- *
- *    conf loadcfg.c
- *
- *    introduced confdir option
- *
- *    filters.c filtrers.h
- *
- *     extracted-CGI relevant stuff
- *
- *    jbsockets.c
- *
- *     filled comment
- *
- *    jcc.c
- *
- *     support for new cgi mechansim
- *
- *    list.c list.h
- *
- *    functions for new list type: "map"
- *    extended enlist_unique
- *
- *    miscutil.c .h
- *    introduced bindup()
- *
- *    parsers.c parsers.h
+ *    Revision 1.7  2001/06/29 13:32:14  oes
+ *    Removed logentry from cancelled commit
  *
+ *    Revision 1.6  2001/06/03 19:12:38  oes
  *    deleted const struct interceptors
  *
- *    pcrs.c
- *    added FIXME
- *
- *    project.h
- *
- *    added struct map
- *    added struct http_response
- *    changes struct interceptors to struct cgi_dispatcher
- *    moved HTML stuff to cgi.h
- *
- *    re_filterfile:
- *
- *    changed
- *
- *    showargs.c
- *    NO TIME LEFT
- *
  *    Revision 1.5  2001/05/31 21:30:33  jongfoster
  *    Removed list code - it's now in list.[ch]
  *    Renamed "permission" to "action", and changed many features
@@ -158,27 +123,25 @@ extern char *client_ua(const struct parsers *v, char *s, struct client_state *cs
 extern char *client_from(const struct parsers *v, char *s, struct client_state *csp);
 extern char *client_send_cookie(const struct parsers *v, char *s, struct client_state *csp);
 extern char *client_x_forwarded(const struct parsers *v, char *s, struct client_state *csp);
+
 extern void client_cookie_adder(struct client_state *csp);
 extern void client_xtra_adder(struct client_state *csp);
+extern void connection_close_adder(struct client_state *csp); 
 extern void client_x_forwarded_adder(struct client_state *csp);
+
 extern char *server_set_cookie(const struct parsers *v, char *s, struct client_state *csp);
 
-#if defined(PCRS) || defined(KILLPOPUPS)
 extern char *content_type(const struct parsers *v, char *s, struct client_state *csp);
-#endif /* defined(PCRS) || defined(KILLPOPUPS) */
-
-#ifdef PCRS
 extern char *content_length(const struct parsers *v, char *s, struct client_state *csp);
-#endif /* def PCRS */
 
-#ifdef FORCE_LOAD
+#ifdef FEATURE_FORCE_LOAD
 char *client_host(const struct parsers *v, char *s, struct client_state *csp);
 int strclean(const char *string, const char *substring);
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
 
-#if defined(DETECT_MSIE_IMAGES)
+#if defined(FEATURE_IMAGE_DETECT_MSIE)
 extern char *client_accept(const struct parsers *v, char *s, struct client_state *csp);
-#endif /* defined(DETECT_MSIE_IMAGES) */
+#endif /* defined(FEATURE_IMAGE_DETECT_MSIE) */
 
 /* Revision control strings from this header and associated .c file */
 extern const char parsers_rcs[];
@@ -188,7 +151,7 @@ extern const char parsers_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _PARSERS_H */
+#endif /* ndef PARSERS_H_INCLUDED */
 
 /*
   Local Variables: