From fbc7a7dd5fa61486610cf11c09e0007f2900a3e1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 03 Dec 2014 15:05:49 -0500
Subject: [PATCH] Add support for specifying the `Proxy-Authorization` header for the PluginManager
---
src/main/java/com/gitblit/manager/PluginManager.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/PluginManager.java b/src/main/java/com/gitblit/manager/PluginManager.java
index a43cbdc..bc3be52 100644
--- a/src/main/java/com/gitblit/manager/PluginManager.java
+++ b/src/main/java/com/gitblit/manager/PluginManager.java
@@ -589,7 +589,7 @@
protected Proxy getProxy(URL url) {
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 {
@@ -598,7 +598,8 @@
}
protected String getProxyAuthorization(URL url) {
- return "";
+ String proxyAuth = runtimeManager.getSettings().getString(Keys.plugins.httpProxyAuthorization, "");
+ return proxyAuth;
}
/**
--
Gitblit v1.9.1