Bump copyright

diff --git a/doc/webserver/sponsors/index.html b/doc/webserver/sponsors/index.html
index 6aa5c08..e217ade 100644 (file)
--- a/doc/webserver/sponsors/index.html
+++ b/doc/webserver/sponsors/index.html
@@ -12,7 +12,6 @@
   <p>This page lists <a href="../">Privoxy</a> sponsors and their <a href="../faq/general.html#SPONSOR">sponsor
   level</a> with the exception of sponsors that preferred not to be listed here.</p>
   <h3>Silver sponsors</h3>
-  <p><a href="https://scrubtheweb.com/">https://scrubtheweb.com/</a></p>
   <p><a href="https://www.lalal.ai/"><img src="../images/sponsors/lalal.ai_logo.png" alt=
   "Vocal Remover by Lalal.ai"></a></p>
   <h3>Bronze sponsors</h3>

diff --git a/errlog.c b/errlog.c
index 27bb4e0..3446b72 100644 (file)
--- a/errlog.c
+++ b/errlog.c
@@ -86,7 +86,7 @@ static FILE *logfp = NULL;
 static int debug = (LOG_LEVEL_FATAL | LOG_LEVEL_ERROR);
 
 /* static functions */
-static void fatal_error(const char * error_message);
+static void fatal_error(const char *error_message);
 #ifdef _WIN32
 static char *w32_socket_strerr(int errcode, char *tmp_buf);
 #endif
@@ -652,7 +652,7 @@ void log_error(int loglevel, const char *fmt, ...)
    char outbuf[LOG_BUFFER_SIZE+1];
    char tempbuf[LOG_BUFFER_SIZE];
    size_t length = 0;
-   const char * src = fmt;
+   const char *src = fmt;
    long thread_id;
    char timestamp[30];
    const size_t log_buffer_size = LOG_BUFFER_SIZE;
@@ -692,8 +692,8 @@ void log_error(int loglevel, const char *fmt, ...)
 #endif
       if (loglevel == LOG_LEVEL_FATAL)
       {
-         fatal_error("Fatal error. You're not supposed to"
-            "see this message. Please file a bug report.");
+         fatal_error("Fatal error. You're not supposed to "
+            "see this message. Please file a bug report.\n");
       }
       return;
    }

diff --git a/filters.c b/filters.c
index 9915bf5..7f4a3e4 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -4,7 +4,7 @@
  *
  * Purpose     :  Declares functions to parse/crunch headers and pages.
  *
- * Copyright   :  Written by and Copyright (C) 2001-2020 the
+ * Copyright   :  Written by and Copyright (C) 2001-2024 the
  *                Privoxy team. https://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
@@ -1393,7 +1393,7 @@ int is_untrusted_url(const struct client_state *csp)
    struct block_spec *b;
    struct pattern_spec **trusted_url;
    struct http_request rhttp[1];
-   const char * referer;
+   const char *referer;
    jb_err err;
 
    /*
@@ -1417,12 +1417,24 @@ int is_untrusted_url(const struct client_state *csp)
       }
    }
 
-   if (NULL == (referer = get_header_value(csp->headers, "Referer:")))
+#ifdef FEATURE_HTTPS_INSPECTION
+   if (client_use_ssl(csp))
    {
-      /* no referrer was supplied */
-      return 1;
+      if (NULL == (referer = get_header_value(csp->https_headers, "Referer:")))
+      {
+         /* no referrer was supplied */
+         return 1;
+      }
+   }
+   else
+#endif
+   {
+      if (NULL == (referer = get_header_value(csp->headers, "Referer:")))
+      {
+         /* no referrer was supplied */
+         return 1;
+      }
    }
-
 
    /*
     * If not, do we maybe trust its referrer?