Commitefdd4df

zshenker

committed

Merge pull requestzencoder#18 from zencoder/remove_ca_cert_bundle

Removing the Zencoder CA chain cert and updating README

2 parentse820b24 +2643a07 commitefdd4dfCopy full SHA for efdd4df

File tree

+12

-64

lines changed

+12

-64

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,17 @@`
`1`	`1`	`Zencoder API PHP Library`
`2`	`2`	`==========================`
`3`	`3`
	`4`	`+Author:[Zac Shenker] (zshenker (a) brightcove (.) com)`
	`5`	`+Company:[Brightcove/Zencoder](http://www.zencoder.com)`
	`6`	`+Version: 2.1.3`
	`7`	`+Date: 2014-07-24`
	`8`	`+Repository:<http://github.com/zencoder/zencoder-php/>`
	`9`	`+`
	`10`	`+The Zencoder CA chain certificate has been removed from the library as the bundled cert will be expiring on July 26 2014,`
	`11`	`+and should not be required as PHP/curl should be able to use the built in CA chain.`
	`12`	`+Please contact us athelp@zencoder.com with an issues.`
	`13`	`+`
	`14`	`+`
`4`	`15`	`Author:[Michael Christopher] (mchristopher (a) brightcove (.) com)`
`5`	`16`	`Company:[Zencoder - Online Video Encoder](http://www.zencoder.com)`
`6`	`17`	`Version: 2.1.1`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,7 @@ public function __construct(`
`118`	`118`	`$this->http =newServices_Zencoder_Http(`
`119`	`119`	`$api_host,`
`120`	`120`	`array("curlopts" =>array(`
`121`		`-CURLOPT_USERAGENT =>self::USER_AGENT,`
`122`		`-CURLOPT_CAINFO =>dirname(__FILE__) ."/Zencoder/zencoder_ca_chain.crt",`
	`121`	`+CURLOPT_USERAGENT =>self::USER_AGENT`
`123`	`122`	`),"api_key" =>$api_key,"debug" =>$debug)`
`124`	`123`	`);`
`125`	`124`	`$this->accounts =newServices_Zencoder_Accounts($this);`

Lines changed: 0 additions & 62 deletions

This file was deleted.

Comments

(0)