I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

reset eepget length variable after a redirect

Browse Source
This commit is contained in:
zzz
2010-10-06 01:11:21 +00:00
parent 895c9a33a9
commit 09d1eb17d4
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/src/net/i2p/util/EepGet.java
View File

@ -537,6 +537,15 @@ public class EepGet {
if (_redirects > 5) if (_redirects > 5)
throw new IOException("Too many redirects: to " + _redirectLocation); throw new IOException("Too many redirects: to " + _redirectLocation);
if (_log.shouldLog(Log.INFO)) _log.info("Redirecting to " + _redirectLocation); if (_log.shouldLog(Log.INFO)) _log.info("Redirecting to " + _redirectLocation);
// reset some important variables, we don't want to save the values from the redirect
_bytesRemaining = -1;
_redirectLocation = null;
_etag = null;
_lastModified = null;
_contentType = null;
_encodingChunked = false;
sendRequest(timeout); sendRequest(timeout);
doFetch(timeout); doFetch(timeout);
return; return;

10
core/java/src/net/i2p/util/EepHead.java
View File

@ -116,6 +116,7 @@ public class EepHead extends EepGet {
else else
timeout.setInactivityTimeout(60*1000); timeout.setInactivityTimeout(60*1000);
// Should we even follow redirects for HEAD?
if (_redirectLocation != null) { if (_redirectLocation != null) {
//try { //try {
URL oldURL = new URL(_actualURL); URL oldURL = new URL(_actualURL);
@ -143,6 +144,15 @@ public class EepHead extends EepGet {
if (_redirects > 5) if (_redirects > 5)
throw new IOException("Too many redirects: to " + _redirectLocation); throw new IOException("Too many redirects: to " + _redirectLocation);
if (_log.shouldLog(Log.INFO)) _log.info("Redirecting to " + _redirectLocation); if (_log.shouldLog(Log.INFO)) _log.info("Redirecting to " + _redirectLocation);
// reset some important variables, we don't want to save the values from the redirect
_bytesRemaining = -1;
_redirectLocation = null;
_etag = null;
_lastModified = null;
_contentType = null;
_encodingChunked = false;
sendRequest(timeout); sendRequest(timeout);
doFetch(timeout); doFetch(timeout);
return; return;