[privoxy-commits] current cgisimple.c,1.97,1.98

[<no...@so...>]

Update of /cvsroot/ijbswa/current
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8675

Modified Files:
	cgisimple.c 
Log Message:
In cgi_show_url_info(), don't forget to prefix URLs that only contain http:// or https:/ in the path.

Fixes #2975765 reported by Adam Piggott.


Index: cgisimple.c
===================================================================
RCS file: /cvsroot/ijbswa/current/cgisimple.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- cgisimple.c	7 Mar 2010 12:07:51 -0000	1.97
+++ cgisimple.c	27 Mar 2010 18:29:59 -0000	1.98
@@ -1078,7 +1078,7 @@
     * 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 @@
          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))