diff options
| author | Frederic Hemberger <mail@frederic-hemberger.de> | 2011-10-18 17:46:36 +0200 |
|---|---|---|
| committer | Frederic Hemberger <mail@frederic-hemberger.de> | 2011-10-18 17:46:36 +0200 |
| commit | d2755dc0821a5316f872b553add535d430e99b1a (patch) | |
| tree | 8f208b00323c0a380b716d43795084170043b039 /plugins | |
| parent | 81e814a3543d9bb5793c427fd6623d89ec505d78 (diff) | |
| parent | 8b1a441aa13b5859cfe28443fbc3a8db80ccc0a7 (diff) | |
| download | my_new_personal_website-d2755dc0821a5316f872b553add535d430e99b1a.tar.xz my_new_personal_website-d2755dc0821a5316f872b553add535d430e99b1a.zip | |
Merge branch 'master' of github.com:imathis/octopress
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/gist_tag.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/gist_tag.rb b/plugins/gist_tag.rb index ac5ee3c6..74dd3b37 100644 --- a/plugins/gist_tag.rb +++ b/plugins/gist_tag.rb @@ -71,7 +71,13 @@ module Jekyll def get_gist_from_web(gist, file) gist_url = get_gist_url_for gist, file raw_uri = URI.parse gist_url - https = Net::HTTP.new raw_uri.host, raw_uri.port + proxy = ENV['http_proxy'] + if proxy + proxy_uri = URI.parse(proxy) + https = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port).new raw_uri.host, raw_uri.port + else + https = Net::HTTP.new raw_uri.host, raw_uri.port + end https.use_ssl = true https.verify_mode = OpenSSL::SSL::VERIFY_NONE request = Net::HTTP::Get.new raw_uri.request_uri |