From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 27 Mar 2010 18:29:59 +0000 (+0000)
Subject: In cgi_show_url_info(), don't forget to prefix URLs that only contain http:// or... 
X-Git-Tag: v_3_0_17~178
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=2e94c2f701ea14e80599be74a68394e2a4b2c5c0;hp=5f1bd5c145ac9cf6e01821b315802639d668a1d5

In cgi_show_url_info(), don't forget to prefix URLs that only contain  or https:/ in the path.

Fixes #2975765 reported by Adam Piggott.
---

diff --git a/cgisimple.c b/cgisimple.c
index c01ae091..11781bd8 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.96 2009/12/16 08:36:39 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.97 2010/03/07 12:07:51 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -1078,7 +1078,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
     * 1) "http://" or "https://" prefix present and followed by URL - OK
     * 2) Only the "http://" or "https://" part is present, no URL - change
     *    to empty string so it will be detected later as "no URL".
-    * 3) Parameter specified but doesn't contain "http(s?)://" - add a
+    * 3) Parameter specified but doesn't start with "http(s?)://" - add a
     *    "http://" prefix.
     * 4) Parameter not specified or is empty string - let this fall through
     *    for now, next block of code will handle it.
@@ -1105,9 +1105,13 @@ jb_err cgi_show_url_info(struct client_state *csp,
          url_param[0] = '\0';
       }
    }
-   else if ((url_param[0] != '\0') && (NULL == strstr(url_param, "://")))
+   else if ((NULL == strstr(url_param, "://")
+         || (strstr(url_param, "://") > strstr(url_param, "/"))))
    {
-      /* No prefix - assume http:// */
+      /*
+       * No prefix or at least no prefix before
+       * the first slash - assume http://
+       */
       char *url_param_prefixed = strdup("http://");
 
       if (JB_ERR_OK != string_join(&url_param_prefixed, url_param))