Version 1.3

Michael Christopher · Michael Christopher · commit 318341ca4be2 · 2011-09-21T13:49:16.000-07:00
diff --git a/README.markdown b/README.markdown
@@ -3,8 +3,8 @@ Zencoder API PHP Library
 
 Author:  [Steve Heffernan](http://www.steveheffernan.com) (steve (a) zencoder (.) c&#1;om)
 Company: [Zencoder - Online Video Encoder](http://zencoder.com)  
-Version: 1.2
-Date:    2011-08-06
+Version: 1.3
+Date:    2011-09-21
 Repository: <http://github.com/zencoder/zencoder-php/>  
 
 For more details on the Zencoder API requirements visit  
@@ -195,6 +195,7 @@ Your [notifications page](https://app.zencoder.com/notifications) will come in h
 
 VERSIONS
 ---------
+    Version 1.3 - 2011-09-21    Fixed bundled SSL certification chain and made catch_and_parse() static
     Version 1.2 - 2011-08-06    Added fixes for PHP Notices and SSL handling
     Version 1.1 - 2010-06-04    Added General API Requests
     Version 1.0 - 2010-04-02    Jobs and Notifications.
diff --git a/Zencoder.php b/Zencoder.php
@@ -7,7 +7,7 @@
 
 */
 define('ZENCODER_LIBRARY_NAME',  "ZencoderPHP");
-define('ZENCODER_LIBRARY_VERSION',  "1.2");
+define('ZENCODER_LIBRARY_VERSION',  "1.3");
 
 // Add JSON functions for PHP < 5.2.0
 if(!function_exists('json_encode')) {
@@ -179,7 +179,7 @@ class ZencoderCURL {
     CURLOPT_CONNECTTIMEOUT => 0, // Time in seconds to timeout send request. 0 is no timeout.
     CURLOPT_FOLLOWLOCATION => 1, // Follow redirects.
     CURLOPT_SSL_VERIFYPEER => 1,
-    CURLOPT_SSL_VERIFYHOST => 1
+    CURLOPT_SSL_VERIFYHOST => 2
   );
 
   var $connected;
@@ -253,7 +253,7 @@ function ZencoderOutputNotification($params) {
     if(!empty($params["job"])) $this->job = new ZencoderJob($params["job"], array("build" => true));
   }
 
-  function catch_and_parse() {
+  static function catch_and_parse() {
     $notificiation_data = json_decode(trim(file_get_contents('php://input')), true);
     return new ZencoderOutputNotification($notificiation_data);
   }
diff --git a/lib/zen_ca_chain.crt b/lib/zen_ca_chain.crt
@@ -49,3 +49,22 @@ EvrRI5YPv5wN8nlFUzeaVi/oVxBw9u6JDEmJmsEj9cIqzEHPIqtlbreUgm0vQF9Y
 3uuVK6ZyaFIZkSqudZ1OkubK3lTqGKslPOZkpnkfJn1h7X3S5XFV2JMXfBQ4MDzf
 huNMrUnjl1nOG5srztxl1Asoa06ERlFE9zMILViXIa4=
 -----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
