Upgrade Snoopy to 1.2.4 to fix CVE-2008-4796.

The diff is noisy because upstream changed the line endings.

We are maintaining our patches to Snoopy, mostly centering around the Host header.

htdocs/lib/snoopy/AUTHORS

-Monte Ohrt <monte@ispi.net>
-	- main Snoopy work
-
-Andrei Zmievski <andrei@ispi.net>
-	- miscellaneous fixes
-	- read timeout support
-	- file submission capability
-
-Gene Wood <gene_wood@users.sourceforge.net>
-    - bug fixes
-    - security fixes
+Monte Ohrt <monte@ispi.net>
+	- main Snoopy work
+
+Andrei Zmievski <andrei@ispi.net>
+	- miscellaneous fixes
+	- read timeout support
+	- file submission capability
+
+Gene Wood <gene_wood@users.sourceforge.net>
+    - bug fixes
+    - security fixes

htdocs/lib/snoopy/ChangeLog

-Version 1.2.3
------------
-    - updated the version variable in the code to reflect the new version number
-    - fixed a typo that I introduced in 1.2.2 (the first character of the file is a "z" (gene_wood, Marc Desrousseaux, Jan Pedersen)
-    - fixed BUG # 1328793 : fetch is case sensetive when it comes to the scheme (http / https) (gene_wood)
-
-Version 1.2.2
------------
-    - incorporated PATCH # 985470 : pass port information in http 1.1 Host header ( http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.23 ) (gene_wood)
-    - fixed BUG # 1110049 : redirect is case sensitive
-    - fixed bug in security bugfix from 1.2.1 (gene_wood, kellan, zaruba)
-
-Version 1.2.1
------------
-    - fixed potential security issue with unchecked variables being passed to exec (for https with curl) (gene_wood)
-    - fixed BUG # 1086830 : submitlinks,fetchlinks and submittext expandlinks with the URI of the original page not the refreshed page (gene_wood)
-    - fixed BUG # 1077870 : Snoopy can't deal with multiple spaces in a refresh tag (gene_wood)
-    - fixed BUG # 864047 : Root relative links are treated as relative (gene_wood)
-    - fixed BUG # 1097134 : Undefined URI_PARTS["path"] generates Notice (gene_wood)
-
-Version 1.2
------------
-    - fixed BUG # 1014823 : Meta redirect regex inaccurate (gene_wood)
-    - fixed BUG # 999079 : Trailing slashes not removed in uri passed to fetchlinks (gene_wood)
-    - fixed BUG # 642958 and 912060 : $URI_PARTS["query"] causing undefined variable notices (gene_wood)
-    - fixed BUG # 626849 : cURL security risk (Tajh Leitso, gene_wood)
-    - fixed BUG # 626849 : Corrects the redirect function under the submit functions (Tajh Leitso, gene_wood)
-    - fixed BUG # 912060 : Undefined variable: postdata (gene_wood)
-    - fixed BUG # 858526 : win32 tmp/$headerfile create error (gene_wood)
-    - fixed BUG # 929682 : Called undefined function is_executable() on line 194. (gene_wood)
-    - fixed BUG # 859711 : typo: http://snoopy.sourceforge.com (gene_wood)
-    - fixed BUG # 852993 : double urlencoding breaks redirect (gene_wood)
-    - added proxy user/pass support (Robert Zwink, Monte)
-	- fixed post data array problem (stefan, Monte)
-
-Version 1.01
------------
-	- fixed problem with PHP 4.3.2 and fread() (Monte)
-
-Version 1.0
------------
-	- added textarea to stripform functionality (Monte)
-    - fixed multiple cookie setting problem (Monte)
-    - fixed problem where extra text inside <frame src (Monte)
-    - fixed problem where extra text inside <a href (Monte)
-    - removed http request header from curl fetched
-      documents, not needed (Monte)
-    - added carriage return to newlines on headers (Monte)
-    - fixed bug with curl, removed single quotes
-	- fixed bug with curl and "&" in the URL
-	- added ability to post files. (Andrei)
-
-Version 0.94
-------------
-    - Added fetchform() function
-    - Fixed misc issues with frames
-    - Added SSL support via cURL
-    - fixed bug with posting arrays of data
-    - added status variable for http status
-
-Version 0.93
-------------
-    - fixed bug with hostname match in a redirect location header
-    - added $lastredirectaddr variable
-
-Version 0.92
-------------
-    - fixed redirect bug with MS web server
-    - added ability to pass set cookies through redirects
-    - added ability to traverse html frames
-
-Version 0.91
-------------
-    - fixed bug with return headers being overwritten.
-      Please read the NEWS file for important notes. (Monte)
-
-Version 0.9
------------
-    - added support for read timeouts (Andrei)
-    - standardized distribution (Andrei)
-
-Version 0.1e
-------------
-    - fixed bug in fetchlinks logic (Monte)
-
-Version 0.1d
-------------
-    - fixed redirect bug without fully qualified url (Monte)
-
-Version 0.1c
-------------
-    - fixed bug on submitting formvars after a redirect (Monte)
-
-Version 0.1b
-------------
-    - fixed bug to allow empty post vars on a submit (Monte)
-
-Version 0.1
-------------
-    - initial release (Monte)
+Version 1.2.4
+-------------
+
+    - fix command line escapement vulnerability with execution of curl binary on https fetches (mohrt)
+
+Version 1.2.3
+-----------
+    - updated the version variable in the code to reflect the new version number
+    - fixed a typo that I introduced in 1.2.2 (the first character of the file is a "z" (gene_wood, Marc Desrousseaux, Jan Pedersen)
+    - fixed BUG # 1328793 : fetch is case sensetive when it comes to the scheme (http / https) (gene_wood)
+
+Version 1.2.2
+-----------
+    - incorporated PATCH # 985470 : pass port information in http 1.1 Host header ( http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.23 ) (gene_wood)
+    - fixed BUG # 1110049 : redirect is case sensitive
+    - fixed bug in security bugfix from 1.2.1 (gene_wood, kellan, zaruba)
+
+Version 1.2.1
+-----------
+    - fixed potential security issue with unchecked variables being passed to exec (for https with curl) (gene_wood)
+    - fixed BUG # 1086830 : submitlinks,fetchlinks and submittext expandlinks with the URI of the original page not the refreshed page (gene_wood)
+    - fixed BUG # 1077870 : Snoopy can't deal with multiple spaces in a refresh tag (gene_wood)
+    - fixed BUG # 864047 : Root relative links are treated as relative (gene_wood)
+    - fixed BUG # 1097134 : Undefined URI_PARTS["path"] generates Notice (gene_wood)
+
+Version 1.2
+-----------
+    - fixed BUG # 1014823 : Meta redirect regex inaccurate (gene_wood)
+    - fixed BUG # 999079 : Trailing slashes not removed in uri passed to fetchlinks (gene_wood)
+    - fixed BUG # 642958 and 912060 : $URI_PARTS["query"] causing undefined variable notices (gene_wood)
+    - fixed BUG # 626849 : cURL security risk (Tajh Leitso, gene_wood)
+    - fixed BUG # 626849 : Corrects the redirect function under the submit functions (Tajh Leitso, gene_wood)
+    - fixed BUG # 912060 : Undefined variable: postdata (gene_wood)
+    - fixed BUG # 858526 : win32 tmp/$headerfile create error (gene_wood)
+    - fixed BUG # 929682 : Called undefined function is_executable() on line 194. (gene_wood)
+    - fixed BUG # 859711 : typo: http://snoopy.sourceforge.com (gene_wood)
+    - fixed BUG # 852993 : double urlencoding breaks redirect (gene_wood)
+    - added proxy user/pass support (Robert Zwink, Monte)
+	- fixed post data array problem (stefan, Monte)
+
+Version 1.01
+-----------
+	- fixed problem with PHP 4.3.2 and fread() (Monte)
+
+Version 1.0
+-----------
+	- added textarea to stripform functionality (Monte)
+    - fixed multiple cookie setting problem (Monte)
+    - fixed problem where extra text inside <frame src (Monte)
+    - fixed problem where extra text inside <a href (Monte)
+    - removed http request header from curl fetched
+      documents, not needed (Monte)
+    - added carriage return to newlines on headers (Monte)
+    - fixed bug with curl, removed single quotes
+	- fixed bug with curl and "&" in the URL
+	- added ability to post files. (Andrei)
+
+Version 0.94
+------------
+    - Added fetchform() function
+    - Fixed misc issues with frames
+    - Added SSL support via cURL
+    - fixed bug with posting arrays of data
+    - added status variable for http status
+
+Version 0.93
+------------
+    - fixed bug with hostname match in a redirect location header
+    - added $lastredirectaddr variable
+
+Version 0.92
+------------
+    - fixed redirect bug with MS web server
+    - added ability to pass set cookies through redirects
+    - added ability to traverse html frames
+
+Version 0.91
+------------
+    - fixed bug with return headers being overwritten.
+      Please read the NEWS file for important notes. (Monte)
+
+Version 0.9
+-----------
+    - added support for read timeouts (Andrei)
+    - standardized distribution (Andrei)
+
+Version 0.1e
+------------
+    - fixed bug in fetchlinks logic (Monte)
+
+Version 0.1d
+------------
+    - fixed redirect bug without fully qualified url (Monte)
+
+Version 0.1c
+------------
+    - fixed bug on submitting formvars after a redirect (Monte)
+
+Version 0.1b
+------------
+    - fixed bug to allow empty post vars on a submit (Monte)
+
+Version 0.1
+------------
+    - initial release (Monte)

htdocs/lib/snoopy/FAQ

-Q:	Why can't I fetch https pages?
-A:	Using Snoopy to fetch an https page requires curl. Check if curl is installed on your host. If curl is installed, it may be located in a different place than the default. By default Snoopy looks for curl in /usr/local/bin/curl. Run 'which curl' and find out your location. If it differs from the default, then you'll need to set the $snoopy->curl_path variable to the location of your curl installation. Here's an example of the code :
-		include "Snoopy.class.php";
-		$snoopy = new Snoopy;
-		$snoopy->curl_path="/usr/bin/curl";
-
-Q:	where does the function preg_match_all come from?
-A:	PCRE functions in PHP 3.0.9 and later
-
-Q:	I get the error: Warning: Wrong parameter count for fsockopen()
-A:	Upgrade your verion of PHP to 3.0.9 or later
-
-Q:	Snoopy cuts of my results every time. What's wrong?
-A:	Upgrade your verion of PHP to 3.0.9 or later
+Q:	Why can't I fetch https pages?
+A:	Using Snoopy to fetch an https page requires curl. Check if curl is installed on your host. If curl is installed, it may be located in a different place than the default. By default Snoopy looks for curl in /usr/local/bin/curl. Run 'which curl' and find out your location. If it differs from the default, then you'll need to set the $snoopy->curl_path variable to the location of your curl installation. Here's an example of the code :
+		include "Snoopy.class.php";
+		$snoopy = new Snoopy;
+		$snoopy->curl_path="/usr/bin/curl";
+
+Q:	where does the function preg_match_all come from?
+A:	PCRE functions in PHP 3.0.9 and later
+
+Q:	I get the error: Warning: Wrong parameter count for fsockopen()
+A:	Upgrade your verion of PHP to 3.0.9 or later
+
+Q:	Snoopy cuts of my results every time. What's wrong?
+A:	Upgrade your verion of PHP to 3.0.9 or later

htdocs/lib/snoopy/INSTALL

-Put Snoopy.class.php into one of the directories specified in your
-php.ini include_path directive.
+Put Snoopy.class.php into one of the directories specified in your
+php.ini include_path directive.

htdocs/lib/snoopy/Makefile.am

-EXTRA_DIST = Snoopy.class.inc FAQ TODO
-DIST_COMMON = AUTHORS COPYING ChangeLog INSTALL NEWS README
-dist-hook:
-	rm $(distdir)/Makefile.in
-MAINTAINERCLEANFILES = config.status Makefile.in configure

htdocs/lib/snoopy/NEWS

-RELEASE NOTE: v1.2.3
-November 7, 2005
-
-A typo was introduced in 1.2.2 which broke the whole release. This has been fixed.
-A couple small fixes have been implemented also.
-
-RELEASE NOTE: v1.2.2
-October 30, 2005
-
-Fixed a bug with the bugfix for the security hole.
-
-RELEASE NOTE: v1.2.1
-October 24, 2005
-
-Fixed a few outstanding bugs and a potential security hole.
-
-RELEASE NOTE: v1.2
-November 17, 2004
-
-Fixed a number of outstanding bugs.
-
-RELEASE NOTE: v1.01
-
-PHP fixed a bug with fread() which consequently broke the way Snoopy called it. This has been fixed.
-Renamed Snoopy.class.inc to Snoopy.class.php for proper file extention.
-
-RELEASE NOTE: v1.0
-
-Added fetchform() function for fetching form elements from an html page.
-For SSL support, you must have cURL installed. see http://curl.haxx.se
-for details. Snoopy does not use the cURL library fuctions within PHP,
-as these are not stable as of this Snoopy release.
-Fixed bug with posting arrays of data.
-Added status variable to track http status.
-Several other bug fixes, see Changelog.
-RELEASE NOTE: v0.93
-
-A bug was fixed with redirection headers not containing the hostname, doubling up the redirection location URL.
-
-There is also a new variable, $lastredirectaddr that contains the last redirection URL.
-
-RELEASE NOTE: v0.92
-March 9, 2000
-
-A bug was fixed with redirection on MS web servers. Also, cookies are now passed through redirects.
-
-This release also adds the ability to traverse html framed pages. Just set $maxframes to the recursion depth you want to allow, and results are returned in $this->results as an array. See the README for an example.
-
--Monte
-
-RELEASE NOTE: v0.91
-February 22, 2000
-
-In previous versions of Snoopy, $this->header was an array containing key/value pairs of headers returned from fetched content, not including HTTP and GET headers. If a key value was the same, the old value was overwritten (Two Set-Cookie: headers for example). This was overcome by making $this->header a simple array containing every header returned. Therefore, it will now be up to the programmer to split these headers into key/value pairs if so desired.
-
--Monte
+RELEASE NOTE: v1.2.4
+October 22, 2008
+
+https fetches were not properly escaping shell args for curl binary execution. This is fixed.
+
+RELEASE NOTE: v1.2.3
+November 7, 2005
+
+A typo was introduced in 1.2.2 which broke the whole release. This has been fixed.
+A couple small fixes have been implemented also.
+
+RELEASE NOTE: v1.2.2
+October 30, 2005
+
+Fixed a bug with the bugfix for the security hole.
+
+RELEASE NOTE: v1.2.1
+October 24, 2005
+
+Fixed a few outstanding bugs and a potential security hole.
+
+RELEASE NOTE: v1.2
+November 17, 2004
+
+Fixed a number of outstanding bugs.
+
+RELEASE NOTE: v1.01
+
+PHP fixed a bug with fread() which consequently broke the way Snoopy called it. This has been fixed.
+Renamed Snoopy.class.inc to Snoopy.class.php for proper file extention.
+
+RELEASE NOTE: v1.0
+
+Added fetchform() function for fetching form elements from an html page.
+For SSL support, you must have cURL installed. see http://curl.haxx.se
+for details. Snoopy does not use the cURL library fuctions within PHP,
+as these are not stable as of this Snoopy release.
+Fixed bug with posting arrays of data.
+Added status variable to track http status.
+Several other bug fixes, see Changelog.
+RELEASE NOTE: v0.93
+
+A bug was fixed with redirection headers not containing the hostname, doubling up the redirection location URL.
+
+There is also a new variable, $lastredirectaddr that contains the last redirection URL.
+
+RELEASE NOTE: v0.92
+March 9, 2000
+
+A bug was fixed with redirection on MS web servers. Also, cookies are now passed through redirects.
+
+This release also adds the ability to traverse html framed pages. Just set $maxframes to the recursion depth you want to allow, and results are returned in $this->results as an array. See the README for an example.
+
+-Monte
+
+RELEASE NOTE: v0.91
+February 22, 2000
+
+In previous versions of Snoopy, $this->header was an array containing key/value pairs of headers returned from fetched content, not including HTTP and GET headers. If a key value was the same, the old value was overwritten (Two Set-Cookie: headers for example). This was overcome by making $this->header a simple array containing every header returned. Therefore, it will now be up to the programmer to split these headers into key/value pairs if so desired.
+
+-Monte

htdocs/lib/snoopy/README

-NAME:
-
-	Snoopy - the PHP net client v1.2.2
-	
-SYNOPSIS:
-
-	include "Snoopy.class.php";
-	$snoopy = new Snoopy;
-	
-	$snoopy->fetchtext("http://www.php.net/");
-	print $snoopy->results;
-	
-	$snoopy->fetchlinks("http://www.phpbuilder.com/");
-	print $snoopy->results;
-	
-	$submit_url = "http://lnk.ispi.net/texis/scripts/msearch/netsearch.html";
-	
-	$submit_vars["q"] = "amiga";
-	$submit_vars["submit"] = "Search!";
-	$submit_vars["searchhost"] = "Altavista";
-		
-	$snoopy->submit($submit_url,$submit_vars);
-	print $snoopy->results;
-	
-	$snoopy->maxframes=5;
-	$snoopy->fetch("http://www.ispi.net/");
-	echo "<PRE>\n";
-	echo htmlentities($snoopy->results[0]); 
-	echo htmlentities($snoopy->results[1]); 
-	echo htmlentities($snoopy->results[2]); 
-	echo "</PRE>\n";
-
-	$snoopy->fetchform("http://www.altavista.com");
-	print $snoopy->results;
-
-DESCRIPTION:
-
-	What is Snoopy?
-	
-	Snoopy is a PHP class that simulates a web browser. It automates the
-	task of retrieving web page content and posting forms, for example.
-
-	Some of Snoopy's features:
-	
-	* easily fetch the contents of a web page
-	* easily fetch the text from a web page (strip html tags)
-	* easily fetch the the links from a web page
-	* supports proxy hosts
-	* supports basic user/pass authentication
-	* supports setting user_agent, referer, cookies and header content
-	* supports browser redirects, and controlled depth of redirects
-	* expands fetched links to fully qualified URLs (default)
-	* easily submit form data and retrieve the results
-	* supports following html frames (added v0.92)
-	* supports passing cookies on redirects (added v0.92)
-	
-	
-REQUIREMENTS:
-
-	Snoopy requires PHP with PCRE (Perl Compatible Regular Expressions),
-	which should be PHP 3.0.9 and up. For read timeout support, it requires
-	PHP 4 Beta 4 or later. Snoopy was developed and tested with PHP 3.0.12.
-
-CLASS METHODS:
-
-	fetch($URI)
-	-----------
-	
-	This is the method used for fetching the contents of a web page.
-	$URI is the fully qualified URL of the page to fetch.
-	The results of the fetch are stored in $this->results.
-	If you are fetching frames, then $this->results
-	contains each frame fetched in an array.
-		
-	fetchtext($URI)
-	---------------	
-	
-	This behaves exactly like fetch() except that it only returns
-	the text from the page, stripping out html tags and other
-	irrelevant data.		
-
-	fetchform($URI)
-	---------------	
-	
-	This behaves exactly like fetch() except that it only returns
-	the form elements from the page, stripping out html tags and other
-	irrelevant data.		
-
-	fetchlinks($URI)
-	----------------
-
-	This behaves exactly like fetch() except that it only returns
-	the links from the page. By default, relative links are
-	converted to their fully qualified URL form.
-
-	submit($URI,$formvars)
-	----------------------
-	
-	This submits a form to the specified $URI. $formvars is an
-	array of the form variables to pass.
-		
-		
-	submittext($URI,$formvars)
-	--------------------------
-
-	This behaves exactly like submit() except that it only returns
-	the text from the page, stripping out html tags and other
-	irrelevant data.		
-
-	submitlinks($URI)
-	----------------
-
-	This behaves exactly like submit() except that it only returns
-	the links from the page. By default, relative links are
-	converted to their fully qualified URL form.
-
-
-CLASS VARIABLES:	(default value in parenthesis)
-
-	$host			the host to connect to
-	$port			the port to connect to
-	$proxy_host		the proxy host to use, if any
-	$proxy_port		the proxy port to use, if any
-	$agent			the user agent to masqerade as (Snoopy v0.1)
-	$referer		referer information to pass, if any
-	$cookies		cookies to pass if any
-	$rawheaders		other header info to pass, if any
-	$maxredirs		maximum redirects to allow. 0=none allowed. (5)
-	$offsiteok		whether or not to allow redirects off-site. (true)
-	$expandlinks	whether or not to expand links to fully qualified URLs (true)
-	$user			authentication username, if any
-	$pass			authentication password, if any
-	$accept			http accept types (image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*)
-	$error			where errors are sent, if any
-	$response_code	responde code returned from server
-	$headers		headers returned from server
-	$maxlength		max return data length
-	$read_timeout	timeout on read operations (requires PHP 4 Beta 4+)
-					set to 0 to disallow timeouts
-	$timed_out		true if a read operation timed out (requires PHP 4 Beta 4+)
-	$maxframes		number of frames we will follow
-	$status			http status of fetch
-	$temp_dir		temp directory that the webserver can write to. (/tmp)
-	$curl_path		system path to cURL binary, set to false if none
-	
-
-EXAMPLES:
-
-	Example: 	fetch a web page and display the return headers and
-				the contents of the page (html-escaped):
-	
-	include "Snoopy.class.php";
-	$snoopy = new Snoopy;
-	
-	$snoopy->user = "joe";
-	$snoopy->pass = "bloe";
-	
-	if($snoopy->fetch("http://www.slashdot.org/"))
-	{
-		echo "response code: ".$snoopy->response_code."<br>\n";
-		while(list($key,$val) = each($snoopy->headers))
-			echo $key.": ".$val."<br>\n";
-		echo "<p>\n";
-		
-		echo "<PRE>".htmlspecialchars($snoopy->results)."</PRE>\n";
-	}
-	else
-		echo "error fetching document: ".$snoopy->error."\n";
-
-
-
-	Example:	submit a form and print out the result headers
-				and html-escaped page:
-
-	include "Snoopy.class.php";
-	$snoopy = new Snoopy;
-	
-	$submit_url = "http://lnk.ispi.net/texis/scripts/msearch/netsearch.html";
-	
-	$submit_vars["q"] = "amiga";
-	$submit_vars["submit"] = "Search!";
-	$submit_vars["searchhost"] = "Altavista";
-
-		
-	if($snoopy->submit($submit_url,$submit_vars))
-	{
-		while(list($key,$val) = each($snoopy->headers))
-			echo $key.": ".$val."<br>\n";
-		echo "<p>\n";
-		
-		echo "<PRE>".htmlspecialchars($snoopy->results)."</PRE>\n";
-	}
-	else
-		echo "error fetching document: ".$snoopy->error."\n";
-
-
-
-	Example:	showing functionality of all the variables:
-	
-
-	include "Snoopy.class.php";
-	$snoopy = new Snoopy;
-
-	$snoopy->proxy_host = "my.proxy.host";
-	$snoopy->proxy_port = "8080";
-	
-	$snoopy->agent = "(compatible; MSIE 4.01; MSN 2.5; AOL 4.0; Windows 98)";
-	$snoopy->referer = "http://www.microsnot.com/";
-	
-	$snoopy->cookies["SessionID"] = 238472834723489l;
-	$snoopy->cookies["favoriteColor"] = "RED";
-	
-	$snoopy->rawheaders["Pragma"] = "no-cache";
-	
-	$snoopy->maxredirs = 2;
-	$snoopy->offsiteok = false;
-	$snoopy->expandlinks = false;
-	
-	$snoopy->user = "joe";
-	$snoopy->pass = "bloe";
-	
-	if($snoopy->fetchtext("http://www.phpbuilder.com"))
-	{
-		while(list($key,$val) = each($snoopy->headers))
-			echo $key.": ".$val."<br>\n";
-		echo "<p>\n";
-		
-		echo "<PRE>".htmlspecialchars($snoopy->results)."</PRE>\n";
-	}
-	else
-		echo "error fetching document: ".$snoopy->error."\n";
-
-
-	Example: 	fetched framed content and display the results
-	
-	include "Snoopy.class.php";
-	$snoopy = new Snoopy;
-	
-	$snoopy->maxframes = 5;
-	
-	if($snoopy->fetch("http://www.ispi.net/"))
-	{
-		echo "<PRE>".htmlspecialchars($snoopy->results[0])."</PRE>\n";
-		echo "<PRE>".htmlspecialchars($snoopy->results[1])."</PRE>\n";
-		echo "<PRE>".htmlspecialchars($snoopy->results[2])."</PRE>\n";
-	}
-	else
-		echo "error fetching document: ".$snoopy->error."\n";
-