|
@@ -23,6 +23,7 @@ import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import java.util.regex.Pattern;
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
+import org.apache.http.auth.UsernamePasswordCredentials;
|
|
import org.codelibs.core.lang.StringUtil;
|
|
import org.codelibs.core.lang.StringUtil;
|
|
import org.codelibs.fess.Constants;
|
|
import org.codelibs.fess.Constants;
|
|
import org.codelibs.fess.app.service.RequestHeaderService;
|
|
import org.codelibs.fess.app.service.RequestHeaderService;
|
|
@@ -237,6 +238,12 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig {
|
|
paramMap.put(HcHttpClient.REQUERT_HEADERS_PROPERTY,
|
|
paramMap.put(HcHttpClient.REQUERT_HEADERS_PROPERTY,
|
|
rhList.toArray(new org.codelibs.fess.crawler.client.http.RequestHeader[rhList.size()]));
|
|
rhList.toArray(new org.codelibs.fess.crawler.client.http.RequestHeader[rhList.size()]));
|
|
|
|
|
|
|
|
+ // proxy credentials
|
|
|
|
+ if (paramMap.get("proxyUsername") == null && paramMap.get("proxyPassword") == null) {
|
|
|
|
+ paramMap.put(HcHttpClient.PROXY_CREDENTIALS_PROPERTY, new UsernamePasswordCredentials(paramMap.remove("proxyUsername")
|
|
|
|
+ .toString(), paramMap.remove("proxyPassword").toString()));
|
|
|
|
+ }
|
|
|
|
+
|
|
return paramMap;
|
|
return paramMap;
|
|
}
|
|
}
|
|
|
|
|