Adjust url_code_map[] so spaces are replaced with %20 instead of '+'

[privoxy.git] / filters.c

diff --git a/filters.c b/filters.c
index 963adac..e2f490c 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.145 2011/09/04 11:10:56 fabiankeil Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.154 2011/10/30 16:22:46 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -78,6 +78,11 @@ const char filters_rcs[] = "$Id: filters.c,v 1.145 2011/09/04 11:10:56 fabiankei
 #include "urlmatch.h"
 #include "loaders.h"
 
+#ifdef HAVE_STRTOK
+/* Only used for locks */
+#include "jcc.h"
+#endif /* def HAVE_STRTOK */
+
 #ifdef _WIN32
 #include "win32.h"
 #endif
@@ -1107,51 +1112,71 @@ char *get_last_url(char *subject, const char *redirect_mode)
 
    if (0 == strcmpic(redirect_mode, "check-decoded-url"))
    {  
-     log_error(LOG_LEVEL_REDIRECTS, "Checking \"%s\" for encoded redirects.",
-               subject);
-
-      /* jwz: Check each parameter in the URL separately.
-              Sectionize the URL at "?" and "&",
-              then URL-decode each component,
-              and look for a URL in the decoded result.
-              Keep the last one we spot.
+      log_error(LOG_LEVEL_REDIRECTS,
+         "Checking \"%s\" for encoded redirects.", subject);
+
+#if defined(MUTEX_LOCKS_AVAILABLE) && defined(HAVE_STRTOK)
+      /*
+       * Check each parameter in the URL separately.
+       * Sectionize the URL at "?" and "&",
+       * then URL-decode each component,
+       * and look for a URL in the decoded result.
+       * Keep the last one we spot.
        */
-      char *found = 0;
-      char *s = strdup (subject);
-      char *token = strtok (s, "?&");
+      char *found = NULL;
+
+      privoxy_mutex_lock(&strtok_mutex);
+      char *token = strtok(subject, "?&");
       while (token)
       {
-        char *dtoken = url_decode (token);
-        if (!dtoken) continue;
-        char *h1 = strstr (dtoken, "http://");
-        char *h2 = strstr (dtoken, "https://");
-        char *h = (h1 && h2
-                   ? (h1 < h2 ? h1 : h2)
-                   : (h1 ? h1 : h2));
-        if (h)
-        {
-          freez(found);
-          found = strdup (h);
-        }
-        token = strtok (0, "?&");
+         char *dtoken = url_decode(token);
+         if (NULL == dtoken)
+         {
+            log_error(LOG_LEVEL_ERROR, "Unable to decode \"%s\".", token);
+            continue;
+         }
+         char *http_url = strstr(dtoken, "http://");
+         char *https_url = strstr(dtoken, "https://");
+         char *last_url = (http_url && https_url
+                          ? (http_url < https_url ? http_url : https_url)
+                          : (http_url ? http_url : https_url));
+         if (last_url)
+         {
+            freez(found);
+            found = strdup(last_url);
+            if (found == NULL)
+            {
+               log_error(LOG_LEVEL_ERROR,
+                  "Out of memory while searching for redirects.");
+               privoxy_mutex_unlock(&strtok_mutex);
+               return NULL;
+            }
+         }
+         freez(dtoken);
+         token = strtok(NULL, "?&");
       }
-      freez(s);
+      privoxy_mutex_unlock(&strtok_mutex);
+      freez(subject);
 
-      if (found)
+      return found;
+#else
+      new_url = url_decode(subject);
+      if (new_url != NULL)
       {
-        freez(subject);
-        return found;
+         freez(subject);
+         subject = new_url;
       }
-
-      freez (subject);
-      return NULL;
+      else
+      {
+         log_error(LOG_LEVEL_ERROR, "Unable to decode \"%s\".", subject);
+      }
+#endif /* defined(MUTEX_LOCKS_AVAILABLE) && defined(HAVE_STRTOK) */
    }
 
-
    /* Else, just look for a URL inside this one, without decoding anything. */
 
-   log_error(LOG_LEVEL_REDIRECTS, "Checking \"%s\" for unencoded redirects.", 
-             subject);
+   log_error(LOG_LEVEL_REDIRECTS,
+      "Checking \"%s\" for unencoded redirects.", subject);
 
    /*
     * Find the last URL encoded in the request
@@ -1300,8 +1325,8 @@ struct http_response *redirect_url(struct client_state *csp)
             return cgi_error_memory();
          }
 
-         if ( enlist_unique_header(rsp->headers, "Location", new_url)
-           || (NULL == (rsp->status = strdup("302 Local Redirect from Privoxy"))) )
+         if (enlist_unique_header(rsp->headers, "Location", new_url)
+           || (NULL == (rsp->status = strdup("302 Local Redirect from Privoxy"))))
          {
             freez(new_url);
             free_http_response(rsp);