Skip to content

Commit efdd4df

Browse files
author
zshenker
committed
Merge pull request #18 from zencoder/remove_ca_cert_bundle
Removing the Zencoder CA chain cert and updating README
2 parents e820b24 + 2643a07 commit efdd4df

File tree

3 files changed

+12
-64
lines changed

3 files changed

+12
-64
lines changed

Diff for: README.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
Zencoder API PHP Library
22
==========================
33

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 at [email protected] with an issues.
13+
14+
415
Author: [Michael Christopher] (mchristopher (a) brightcove (.) c&#1;om)
516
Company: [Zencoder - Online Video Encoder](http://www.zencoder.com)
617
Version: 2.1.1

Diff for: Services/Zencoder.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ public function __construct(
118118
$this->http = new Services_Zencoder_Http(
119119
$api_host,
120120
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
123122
), "api_key" => $api_key, "debug" => $debug)
124123
);
125124
$this->accounts = new Services_Zencoder_Accounts($this);

Diff for: Services/Zencoder/zencoder_ca_chain.crt

-62
This file was deleted.

0 commit comments

Comments
 (0)