Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/manager/PluginManager.java

@@ -15,13 +15,15 @@
 */
package com.gitblit.manager;

import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.URL;
import java.net.URLConnection;
@@ -60,8 +62,7 @@
import com.gitblit.utils.FileUtils;
import com.gitblit.utils.JsonUtils;
import com.gitblit.utils.StringUtils;
import com.google.common.io.Files;
import com.google.common.io.InputSupplier;
import com.google.common.io.ByteStreams;
import com.google.inject.Inject;
import com.google.inject.Singleton;

@@ -532,12 +533,9 @@
      // try to get the server-specified last-modified date of this artifact
      long lastModified = conn.getHeaderFieldDate("Last-Modified", System.currentTimeMillis());

      Files.copy(new InputSupplier<InputStream>() {
         @Override
         public InputStream getInput() throws IOException {
            return new BufferedInputStream(conn.getInputStream());
         }
      }, tmpFile);
      try (InputStream is = conn.getInputStream(); OutputStream os = new FileOutputStream(tmpFile);) {
         ByteStreams.copy(is, os);
      }

      File destFile = new File(pFolder, StringUtils.getLastPathElement(u.getPath()));
      if (destFile.exists()) {
@@ -586,11 +584,19 @@
   }

   protected Proxy getProxy(URL url) {
      return java.net.Proxy.NO_PROXY;
      String proxyHost = runtimeManager.getSettings().getString(Keys.plugins.httpProxyHost, "");
      String proxyPort = runtimeManager.getSettings().getString(Keys.plugins.httpProxyPort, "");

      if (!StringUtils.isEmpty(proxyHost)  && !StringUtils.isEmpty(proxyPort)) {
         return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, Integer.parseInt(proxyPort)));
      } else {
         return java.net.Proxy.NO_PROXY;
      }
   }

   protected String getProxyAuthorization(URL url) {
      return "";
      String proxyAuth = runtimeManager.getSettings().getString(Keys.plugins.httpProxyAuthorization, "");
      return proxyAuth;
   }

   /**