X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=parsers.h;h=cf9d7eff2ded102b4a7901c955960f9452fcd405;hp=ad3521b9e97d67ab1555c8fb9f032ff294040c5c;hb=338493a4d2247ce0021acbd073fe6baef97a97b1;hpb=87a69fc505def6be1c8a4d24ae225c3623b5e861 diff --git a/parsers.h b/parsers.h index ad3521b9..cf9d7eff 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.1.1.1 2001/05/15 13:59:01 oes Exp $" +#ifndef PARSERS_H_INCLUDED +#define PARSERS_H_INCLUDED +#define PARSERS_H_VERSION "$Id: parsers.h,v 1.19 2002/01/17 21:03:47 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.h,v $ @@ -13,7 +13,7 @@ * `client_x_forwarded_adder', `client_xtra_adder', * `content_type', `crumble', `destroy_list', `enlist', * `flush_socket', `free_http_request', `get_header', - * `list_to_text', `match', `parse_http_request', `sed', + * `list_to_text', `parse_http_request', `sed', * and `server_set_cookie'. * * Copyright : Written by and Copyright (C) 2001 the SourceForge @@ -43,6 +43,82 @@ * * Revisions : * $Log: parsers.h,v $ + * Revision 1.19 2002/01/17 21:03:47 jongfoster + * Moving all our URL and URL pattern parsing code to urlmatch.c. + * + * Revision 1.18 2001/10/26 17:40:23 oes + * Introduced get_header_value() + * Removed client_accept() + * + * Revision 1.17 2001/10/13 12:47:32 joergs + * Removed client_host, added client_host_adder + * + * Revision 1.16 2001/10/07 18:50:16 oes + * Added server_content_encoding, renamed server_transfer_encoding + * + * Revision 1.15 2001/10/07 18:01:55 oes + * Changed server_http11 to server_http + * + * Revision 1.14 2001/10/07 15:45:48 oes + * added client_accept_encoding, client_te, client_accept_encoding_adder + * + * renamed content_type and content_length + * + * fixed client_host and strclean prototypes + * + * Revision 1.13 2001/09/29 12:56:03 joergs + * IJB now changes HTTP/1.1 to HTTP/1.0 in requests and answers. + * + * Revision 1.12 2001/09/13 23:05:50 jongfoster + * Changing the string paramater to the header parsers a "const". + * + * Revision 1.11 2001/07/31 14:46:53 oes + * Added prototype for connection_close_adder + * + * 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 + * + * Revision 1.9 2001/07/29 18:43:08 jongfoster + * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to + * ANSI C rules. + * + * Revision 1.8 2001/07/13 14:01:54 oes + * Removed all #ifdef PCRS + * + * 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 + * + * 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 + * to use the actions file rather than the global config. + * + * Revision 1.4 2001/05/27 13:19:06 oes + * Patched Joergs solution for the content-length in. + * + * Revision 1.3 2001/05/26 13:39:32 jongfoster + * Only crunches Content-Length header if applying RE filtering. + * Without this fix, Microsoft Windows Update wouldn't work. + * + * 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:59:01 oes * Initial import of version 2.9.3 source tree * @@ -58,47 +134,45 @@ extern "C" { extern const struct parsers client_patterns[]; extern const struct parsers server_patterns[]; -extern const struct interceptors intercept_patterns[]; -extern void (* const add_client_headers[])(struct client_state *); -extern void (* const add_server_headers[])(struct client_state *); +extern const add_header_func_ptr add_client_headers[]; +extern const add_header_func_ptr add_server_headers[]; extern int flush_socket(int fd, struct client_state *csp); extern int add_to_iob(struct client_state *csp, char *buf, int n); extern char *get_header(struct client_state *csp); -extern void enlist(struct list *h, const char *s); -extern void destroy_list(struct list *h); - -extern char *sed(const struct parsers pats[], void (* const more_headers[])(struct client_state *), struct client_state *csp); - -extern void free_http_request(struct http_request *http); -extern void parse_http_request(char *req, struct http_request *http, struct client_state *csp); - -extern char *crumble(const struct parsers *v, char *s, struct client_state *csp); - -extern char *client_referrer(const struct parsers *v, char *s, struct client_state *csp); -extern char *client_uagent(const struct parsers *v, char *s, struct client_state *csp); -extern char *client_ua(const struct parsers *v, char *s, struct client_state *csp); -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 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 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 */ - -#if defined(DETECT_MSIE_IMAGES) -extern char *client_accept(const struct parsers *v, char *s, struct client_state *csp); -#endif /* defined(DETECT_MSIE_IMAGES) */ +extern char *get_header_value(const struct list *header_list, const char *header_name); +extern char *sed(const struct parsers pats[], const add_header_func_ptr more_headers[], struct client_state *csp); + +extern jb_err crumble (struct client_state *csp, char **header); +extern jb_err client_referrer (struct client_state *csp, char **header); +extern jb_err client_uagent (struct client_state *csp, char **header); +extern jb_err client_ua (struct client_state *csp, char **header); +extern jb_err client_from (struct client_state *csp, char **header); +extern jb_err client_send_cookie (struct client_state *csp, char **header); +extern jb_err client_x_forwarded (struct client_state *csp, char **header); +extern jb_err client_accept_encoding (struct client_state *csp, char **header); +extern jb_err client_te (struct client_state *csp, char **header); + +extern jb_err client_host_adder (struct client_state *csp); +extern jb_err client_cookie_adder (struct client_state *csp); +extern jb_err client_xtra_adder (struct client_state *csp); +extern jb_err client_accept_encoding_adder(struct client_state *csp); +extern jb_err client_x_forwarded_adder (struct client_state *csp); + +extern jb_err connection_close_adder (struct client_state *csp); + +extern jb_err server_set_cookie (struct client_state *csp, char **header); +extern jb_err server_content_type (struct client_state *csp, char **header); +extern jb_err server_content_length (struct client_state *csp, char **header); +extern jb_err server_content_md5 (struct client_state *csp, char **header); +extern jb_err server_content_encoding(struct client_state *csp, char **header); +extern jb_err server_transfer_coding (struct client_state *csp, char **header); +extern jb_err server_http (struct client_state *csp, char **header); + +#ifdef FEATURE_FORCE_LOAD +extern int strclean(const char *string, const char *substring); +#endif /* def FEATURE_FORCE_LOAD */ /* Revision control strings from this header and associated .c file */ extern const char parsers_rcs[]; @@ -108,7 +182,7 @@ extern const char parsers_h_rcs[]; } /* extern "C" */ #endif -#endif /* ndef _PARSERS_H */ +#endif /* ndef PARSERS_H_INCLUDED */ /* Local Variables: