zencoder 2.3.1 → 2.3.2

Sign up to get free protection for your applications and to get access to all the features.
data/README.markdown CHANGED
@@ -190,6 +190,8 @@ By default we'll send and receive JSON for all our communication. If you would r
190
190
 
191
191
  We try to find the files necessary for SSL verification on your system, but sometimes this results in an error. If you'd like to skip SSL verification you can pass an option in the secondary options hash.
192
192
 
193
+ **NOTE: WE HIGHLY DISCOURAGE THIS! THIS WILL LEAVE YOU VULNERABLE TO MAN-IN-THE-MIDDLE ATTACKS!**
194
+
193
195
  Zencoder::Job.create({:input => 's3://bucket/key.mp4'}, {:skip_ssl_verify => true})
194
196
 
195
197
  Alternatively you can add it to the default options.
@@ -210,6 +212,10 @@ The Net::HTTP backend will do its best to locate your local SSL certs to allow S
210
212
 
211
213
  Zencoder::HTTP::NetHTTP.root_cert_paths << '/my/custom/cert/path'
212
214
 
215
+ If the ruby installed on your system is already aware of where your root cert path is and/or you would like us to NOT set it, you can do the following.
216
+
217
+ Zencoder::HTTP::NetHTTP.skip_setting_root_cert_path = true
218
+
213
219
  ## Advanced JSON and XML
214
220
 
215
221
  ### Alternate JSON and XML Libraries
@@ -7,7 +7,8 @@ module Zencoder
7
7
 
8
8
  attr_accessor :method, :url, :uri, :body, :params, :headers, :timeout, :skip_ssl_verify, :options
9
9
 
10
- cattr_accessor :root_cert_paths
10
+ class_attribute :root_cert_paths
11
+ class_attribute :skip_setting_root_cert_path
11
12
 
12
13
  self.root_cert_paths = ['/etc/ssl/certs',
13
14
  '/var/ssl',
@@ -72,9 +73,10 @@ module Zencoder
72
73
 
73
74
  if u.scheme == 'https'
74
75
  http.use_ssl = true
76
+ root_cert_path = locate_root_cert_path
75
77
 
76
- if !skip_ssl_verify && root_cert_path = locate_root_cert_path
77
- http.ca_path = root_cert_path
78
+ if !skip_ssl_verify && (self.class.skip_setting_root_cert_path || root_cert_path)
79
+ http.ca_path = root_cert_path unless self.class.skip_setting_root_cert_path
78
80
  http.verify_mode = OpenSSL::SSL::VERIFY_PEER
79
81
  http.verify_depth = 5
80
82
  else
@@ -1,3 +1,3 @@
1
1
  module Zencoder
2
- GEM_VERSION = '2.3.1'
2
+ GEM_VERSION = '2.3.2'
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zencoder
3
3
  version: !ruby/object:Gem::Version
4
- hash: 1
5
- prerelease: false
4
+ hash: 7
5
+ prerelease:
6
6
  segments:
7
7
  - 2
8
8
  - 3
9
- - 1
10
- version: 2.3.1
9
+ - 2
10
+ version: 2.3.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Nathan Sutton
@@ -16,8 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2010-11-19 00:00:00 -06:00
20
- default_executable:
19
+ date: 2011-11-01 00:00:00 Z
21
20
  dependencies:
22
21
  - !ruby/object:Gem::Dependency
23
22
  name: activesupport
@@ -115,7 +114,6 @@ files:
115
114
  - LICENSE
116
115
  - README.markdown
117
116
  - Rakefile
118
- has_rdoc: true
119
117
  homepage: http://github.com/zencoder/zencoder-rb
120
118
  licenses: []
121
119
 
@@ -145,9 +143,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
145
143
  requirements: []
146
144
 
147
145
  rubyforge_project: zencoder
148
- rubygems_version: 1.3.7
146
+ rubygems_version: 1.8.7
149
147
  signing_key:
150
148
  specification_version: 3
151
149
  summary: Zencoder <http://zencoder.com> integration library.
152
150
  test_files: []
153
151
 
152
+ has_rdoc: