X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=parsers.h;h=3267c582be360b86de20763d92dd180ecaf70cf7;hb=ddac7695906a4e739e5bf0a0628142e68601c8ff;hp=a5b2ac5e8edb61ba10bc578556bed8a854c0515d;hpb=b3ee70e4ee07171ad5cc5050748d53db7228f232;p=privoxy.git diff --git a/parsers.h b/parsers.h index a5b2ac5e..3267c582 100644 --- a/parsers.h +++ b/parsers.h @@ -1,6 +1,6 @@ #ifndef PARSERS_H_INCLUDED #define PARSERS_H_INCLUDED -#define PARSERS_H_VERSION "$Id: parsers.h,v 1.23 2002/03/13 00:27:05 jongfoster Exp $" +#define PARSERS_H_VERSION "$Id: parsers.h,v 1.34 2006/12/29 19:08:22 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.h,v $ @@ -17,7 +17,7 @@ * and `server_set_cookie'. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy 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 @@ -43,6 +43,65 @@ * * Revisions : * $Log: parsers.h,v $ + * Revision 1.34 2006/12/29 19:08:22 fabiankeil + * Reverted parts of my last commit + * to keep error handling working. + * + * Revision 1.33 2006/12/29 18:04:40 fabiankeil + * Fixed gcc43 conversion warnings. + * + * Revision 1.32 2006/12/06 19:14:23 fabiankeil + * Added prototype for get_destination_from_headers(). + * + * Revision 1.31 2006/08/17 17:15:10 fabiankeil + * - Back to timegm() using GnuPG's replacement if necessary. + * Using mktime() and localtime() could add a on hour offset if + * the randomize factor was big enough to lead to a summer/wintertime + * switch. + * + * - Removed now-useless Privoxy 3.0.3 compatibility glue. + * + * - Moved randomization code into pick_from_range(). + * + * - Changed parse_header_time definition. + * time_t isn't guaranteed to be signed and + * if it isn't, -1 isn't available as error code. + * Changed some variable types in client_if_modified_since() + * because of the same reason. + * + * Revision 1.30 2006/08/14 08:25:19 fabiankeil + * Split filter-headers{} into filter-client-headers{} + * and filter-server-headers{}. + * Added parse_header_time() to share some code. + * Replaced timegm() with mktime(). + * + * Revision 1.29 2006/08/03 02:46:41 david__schmidt + * Incorporate Fabian Keil's patch work: http://www.fabiankeil.de/sourcecode/privoxy/ + * + * Revision 1.28 2006/07/18 14:48:47 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.26.2.1 2002/09/25 14:52:46 oes + * Added basic support for OPTIONS and TRACE HTTP methods: + * - New parser function client_max_forwards which decrements + * the Max-Forwards HTTP header field of OPTIONS and TRACE + * requests by one before forwarding + * - New parser function client_host which extracts the host + * and port information from the HTTP header field if the + * request URI was not absolute + * - Don't crumble and re-add the Host: header, but only generate + * and append if missing + * + * Revision 1.26 2002/05/08 15:59:53 oes + * Changed add_to_iob signature (now returns jb_err) + * + * Revision 1.25 2002/03/26 22:29:55 swa + * we have a new homepage! + * + * Revision 1.24 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.23 2002/03/13 00:27:05 jongfoster * Killing warnings * @@ -168,15 +227,20 @@ extern "C" { extern const struct parsers client_patterns[]; extern const struct parsers server_patterns[]; +extern const struct parsers server_patterns_light[]; extern const add_header_func_ptr add_client_headers[]; extern const add_header_func_ptr add_server_headers[]; extern int flush_socket(jb_socket fd, struct client_state *csp); -extern void add_to_iob(struct client_state *csp, char *buf, int n); +extern jb_err add_to_iob(struct client_state *csp, char *buf, int n); +extern jb_err decompress_iob(struct client_state *csp); extern char *get_header(struct client_state *csp); 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 void get_http_time(int time_offset, char *buf); +extern struct tm *parse_header_time(char *header, time_t *tm); +extern jb_err get_destination_from_headers(const struct list *headers, struct http_request *http); extern jb_err crumble (struct client_state *csp, char **header); extern jb_err client_referrer (struct client_state *csp, char **header); @@ -187,6 +251,17 @@ 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_max_forwards (struct client_state *csp, char **header); +extern jb_err client_host(struct client_state *csp, char **header); +extern jb_err client_if_modified_since(struct client_state *csp, char **header); +extern jb_err client_accept_language (struct client_state *csp, char **header); +extern jb_err client_if_none_match (struct client_state *csp, char **header); +extern jb_err crunch_client_header (struct client_state *csp, char **header); +extern jb_err filter_header (struct client_state *csp, char **header); +extern jb_err filter_client_header (struct client_state *csp, char **header); +extern jb_err filter_server_header (struct client_state *csp, char **header); +extern jb_err client_x_filter (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); @@ -203,6 +278,9 @@ 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); +extern jb_err crunch_server_header (struct client_state *csp, char **header); +extern jb_err server_last_modified (struct client_state *csp, char **header); +extern jb_err server_content_disposition(struct client_state *csp, char **header); #ifdef FEATURE_FORCE_LOAD extern int strclean(const char *string, const char *substring); @@ -212,6 +290,8 @@ extern int strclean(const char *string, const char *substring); extern const char parsers_rcs[]; extern const char parsers_h_rcs[]; +extern int debug; + #ifdef __cplusplus } /* extern "C" */ #endif