Merge pull request philsturgeon#11 from ricick/master

Phil Sturgeon · Phil Sturgeon · commit a61bb18861c9 · 2012-07-23T08:22:27.000-07:00
Changing relative cert path to absolute
diff --git a/libraries/Curl.php b/libraries/Curl.php
@@ -212,7 +212,10 @@ public function ssl($verify_peer = TRUE, $verify_host = 2, $path_to_cert = NULL)
 		{
 			$this->option(CURLOPT_SSL_VERIFYPEER, TRUE);
 			$this->option(CURLOPT_SSL_VERIFYHOST, $verify_host);
-			$this->option(CURLOPT_CAINFO, $path_to_cert);
+			if (isset($path_to_cert)) {
+				$path_to_cert = realpath($path_to_cert);
+				$this->option(CURLOPT_CAINFO, $path_to_cert);
+			}
 		}
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,10 @@ public function ssl($verify_peer = TRUE, $verify_host = 2, $path_to_cert = NULL)`
`212`	`212`	`{`
`213`	`213`	`$this->option(CURLOPT_SSL_VERIFYPEER, TRUE);`
`214`	`214`	`$this->option(CURLOPT_SSL_VERIFYHOST, $verify_host);`
`215`		`- $this->option(CURLOPT_CAINFO, $path_to_cert);`
	`215`	`+ if (isset($path_to_cert)) {`
	`216`	`+ $path_to_cert = realpath($path_to_cert);`
	`217`	`+ $this->option(CURLOPT_CAINFO, $path_to_cert);`
	`218`	`+ }`
`216`	`219`	`}`
`217`	`220`	`else`
`218`	`221`	`{`