Merge branch 'master' of github.com:imathis/octopress

This commit is contained in:
Frederic Hemberger 2011-10-18 17:46:36 +02:00
commit d2755dc082

View File

@ -71,7 +71,13 @@ module Jekyll
def get_gist_from_web(gist, file) def get_gist_from_web(gist, file)
gist_url = get_gist_url_for gist, file gist_url = get_gist_url_for gist, file
raw_uri = URI.parse gist_url raw_uri = URI.parse gist_url
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 https = Net::HTTP.new raw_uri.host, raw_uri.port
end
https.use_ssl = true https.use_ssl = true
https.verify_mode = OpenSSL::SSL::VERIFY_NONE https.verify_mode = OpenSSL::SSL::VERIFY_NONE
request = Net::HTTP::Get.new raw_uri.request_uri request = Net::HTTP::Get.new raw_uri.request_uri