From: Roland Rosenfeld Date: Sat, 23 Sep 2006 13:26:38 +0000 (+0000) Subject: Replace TABs by spaces in source code. X-Git-Tag: v_3_0_5~4 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=d42a366b562c60b5f1b88bfdfde4e2f94f45b4ec Replace TABs by spaces in source code. --- diff --git a/filters.c b/filters.c index 399a507f..886239a0 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.64 2006/08/31 10:55:49 fabiankeil Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.65 2006/09/21 12:54:43 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -39,6 +39,9 @@ const char filters_rcs[] = "$Id: filters.c,v 1.64 2006/08/31 10:55:49 fabiankeil * * Revisions : * $Log: filters.c,v $ + * Revision 1.65 2006/09/21 12:54:43 fabiankeil + * Fix +redirect{}. Didn't work with -fast-redirects. + * * Revision 1.64 2006/08/31 10:55:49 fabiankeil * Block requests for untrusted URLs with status * code 403 instead of 200. @@ -769,7 +772,7 @@ struct http_response *block_url(struct client_state *csp) if (((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0) && is_imageurl(csp)) { - char *p; + char *p; /* determine HOW images should be blocked */ p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER]; diff --git a/jcc.c b/jcc.c index e902e19a..552f1220 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.102 2006/09/06 13:03:04 fabiankeil Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.103 2006/09/21 12:54:43 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -33,6 +33,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.102 2006/09/06 13:03:04 fabiankeil Exp $" * * Revisions : * $Log: jcc.c,v $ + * Revision 1.103 2006/09/21 12:54:43 fabiankeil + * Fix +redirect{}. Didn't work with -fast-redirects. + * * Revision 1.102 2006/09/06 13:03:04 fabiankeil * Respond with 400 and a short text message * if the client tries to use Privoxy as FTP proxy. @@ -1291,7 +1294,7 @@ static void chat(struct client_state *csp) while ( (csp->sfd = forwarded_connect(fwd, http, csp)) && (errno == EINVAL) && (forwarded_connect_retries++ < max_forwarded_connect_retries)) { - log_error(LOG_LEVEL_ERROR, "failed request #%u to connect to %s. Trying again.", + log_error(LOG_LEVEL_ERROR, "failed request #%u to connect to %s. Trying again.", forwarded_connect_retries, http->hostport); } diff --git a/miscutil.c b/miscutil.c index 53958a25..9604c90e 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.41 2006/08/18 16:03:17 david__schmidt Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.42 2006/09/09 14:01:45 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -36,6 +36,11 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.41 2006/08/18 16:03:17 david__s * * Revisions : * $Log: miscutil.c,v $ + * Revision 1.42 2006/09/09 14:01:45 fabiankeil + * Integrated Oliver Yeoh's domain pattern fix + * to make sure *x matches xx. Closes Patch 1217393 + * and Bug 1170767. + * * Revision 1.41 2006/08/18 16:03:17 david__schmidt * Tweak for OS/2 build happiness. * @@ -1130,7 +1135,7 @@ time_t timegm(struct tm *tm) { strcpy(old_zone,"TZ="); strcat(old_zone,zone); - putenv(old_zone); + putenv(old_zone); } } else diff --git a/parsers.c b/parsers.c index 92d1567f..b4cdd66a 100644 --- a/parsers.c +++ b/parsers.c @@ -1,4 +1,4 @@ -const char parsers_rcs[] = "$Id: parsers.c,v 1.71 2006/09/21 19:55:17 fabiankeil Exp $"; +const char parsers_rcs[] = "$Id: parsers.c,v 1.72 2006/09/23 12:37:21 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.c,v $ @@ -40,6 +40,11 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.71 2006/09/21 19:55:17 fabiankeil * * Revisions : * $Log: parsers.c,v $ + * Revision 1.72 2006/09/23 12:37:21 fabiankeil + * Don't print a log message every time filter_headers is + * entered or left. It only creates noise without any real + * information. + * * Revision 1.71 2006/09/21 19:55:17 fabiankeil * Fix +hide-if-modified-since{-n}. * @@ -1113,7 +1118,7 @@ jb_err filter_header(struct client_state *csp, char **header) if ( 0 == size ) { - log_error(LOG_LEVEL_HEADER, "Removing empty header %s", *header); + log_error(LOG_LEVEL_HEADER, "Removing empty header %s", *header); freez(*header); } @@ -2427,7 +2432,7 @@ jb_err client_x_filter(struct client_state *csp, char **header) { log_error(LOG_LEVEL_INFO, "Ignored the client's request to fetch without filtering."); } - else + else { if (csp->action->flags & ACTION_FORCE_TEXT_MODE) { diff --git a/w32taskbar.c b/w32taskbar.c index bc35db8a..0b9ebba7 100644 --- a/w32taskbar.c +++ b/w32taskbar.c @@ -1,7 +1,7 @@ -const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.7.2.2 2003/03/19 21:27:42 gliptak Exp $"; +const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.9 2006/07/18 14:48:48 david__schmidt Exp $"; /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/Attic/w32taskbar.c,v $ + * File : $Source: /cvsroot/ijbswa/current/w32taskbar.c,v $ * * Purpose : Functions for creating, setting and destroying the * workspace tray icon @@ -32,6 +32,10 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.7.2.2 2003/03/19 21:27:42 g * * Revisions : * $Log: w32taskbar.c,v $ + * Revision 1.9 2006/07/18 14:48:48 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.7.2.2 2003/03/19 21:27:42 gliptak * Corrected compilation error/typo * @@ -122,7 +126,7 @@ HWND CreateTrayWindow(HINSTANCE hInstance) RegisterClass(&wc); /* TaskbarCreated is sent to a window when it should re-add its tray icons */ - g_traycreatedmsg = RegisterWindowMessage("TaskbarCreated"); + g_traycreatedmsg = RegisterWindowMessage("TaskbarCreated"); g_hwndTrayX = CreateWindow(szWndName, szWndName, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,