From eaf38167c9a21326865db5cbb021b11abdfbc496 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 9 Dec 2006 13:49:16 +0000 Subject: [PATCH] Fix configure option --disable-toggle. Thanks to Peter Thoenen for reporting this. --- AUTHORS | 1 + cgi.c | 8 +++++++- cgiedit.c | 16 +++++++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6fcf9f10..9e5eb750 100644 --- a/AUTHORS +++ b/AUTHORS @@ -66,6 +66,7 @@ alphabetical order): Spinor S Bart Schelstraete Oliver Stoeneberg + Peter Thoenen Martin Thomas Bobby G. Vinyard Jörg Weinmann diff --git a/cgi.c b/cgi.c index 45f18d42..2bb6a373 100644 --- a/cgi.c +++ b/cgi.c @@ -1,4 +1,4 @@ -const char cgi_rcs[] = "$Id: cgi.c,v 1.79 2006/11/13 19:05:50 fabiankeil Exp $"; +const char cgi_rcs[] = "$Id: cgi.c,v 1.80 2006/12/08 14:45:32 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgi.c,v $ @@ -38,6 +38,10 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.79 2006/11/13 19:05:50 fabiankeil Exp $"; * * Revisions : * $Log: cgi.c,v $ + * Revision 1.80 2006/12/08 14:45:32 fabiankeil + * Don't lose the FORCE_PREFIX in case of + * connection problems. Fixes #612235. + * * Revision 1.79 2006/11/13 19:05:50 fabiankeil * Make pthread mutex locking more generic. Instead of * checking for OSX and OpenBSD, check for FEATURE_PTHREAD @@ -571,10 +575,12 @@ static const struct cgi_dispatcher cgi_dispatchers[] = { "Look up which actions apply to a URL and why", TRUE }, #ifdef FEATURE_CGI_EDIT_ACTIONS +#ifdef FEATURE_TOGGLE { "toggle", cgi_toggle, "Toggle Privoxy on or off", FALSE }, +#endif /* def FEATURE_TOGGLE */ { "edit-actions", /* Edit the actions list */ cgi_edit_actions, NULL, FALSE }, diff --git a/cgiedit.c b/cgiedit.c index 49e6cf95..5cd0fb31 100644 --- a/cgiedit.c +++ b/cgiedit.c @@ -1,7 +1,7 @@ -const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.41.2.12 2006/01/30 15:16:25 david__schmidt Exp $"; +const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.43 2006/07/18 14:48:45 david__schmidt Exp $"; /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/Attic/cgiedit.c,v $ + * File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $ * * Purpose : CGI-based actionsfile editor. * @@ -42,6 +42,10 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.41.2.12 2006/01/30 15:16:25 david * * Revisions : * $Log: cgiedit.c,v $ + * Revision 1.43 2006/07/18 14:48:45 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.41.2.12 2006/01/30 15:16:25 david__schmidt * Remove a little residual debugging info * @@ -329,8 +333,10 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.41.2.12 2006/01/30 15:16:25 david #include "miscutil.h" #include "errlog.h" #include "loaders.h" -#include "loadcfg.h" +#ifdef FEATURE_TOGGLE /* loadcfg.h is for global_toggle_state only */ +#include "loadcfg.h" +#endif /* def FEATURE_TOGGLE */ #include "urlmatch.h" const char cgiedit_h_rcs[] = CGIEDIT_H_VERSION; @@ -4228,7 +4234,7 @@ jb_err cgi_edit_actions_section_swap(struct client_state *csp, return cgi_redirect(rsp, target); } - +#ifdef FEATURE_TOGGLE /********************************************************************* * * Function : cgi_toggle @@ -4296,7 +4302,7 @@ jb_err cgi_toggle(struct client_state *csp, return template_fill_for_cgi(csp, template_name, exports, rsp); } - +#endif /* def FEATURE_TOGGLE */ /********************************************************************* * -- 2.39.2