Merge branch 'master' into fetchhttp-hc

Conflicts:
	modules/src/main/java/org/archive/modules/fetcher/FetchHTTP.java
This commit is contained in:
Noah Levitt
2012-07-16 20:05:05 -07:00
@@ -1147,18 +1147,20 @@ public class FetchHTTP extends AbstractFetchHTTP implements Lifecycle {
} catch (URIException e) {
return false;
}
boolean result = false;
CrawlServer server = serverCache.getServerFor(serverKey);
if (server.hasCredentials()) {
for (Credential cred : server.getCredentials()) {
if (cred.isEveryTime()) {
// cred.populate(curi, this.http, method);
CommonsHttpCredentialUtil.populate(curi, this.http, method, cred);
if (CommonsHttpCredentialUtil.populate(curi, this.http, method, cred)) {
result = true;
}
}
}
}
boolean result = false;
// Now look in the curi. The Curi will have credentials loaded either
// by the handle401 method if its a rfc2617 or it'll have been set into
// the curi by the preconditionenforcer as this login uri came through.