Revert "Experiment: wait for input"

This reverts commit ca2d0f7d60.
This commit is contained in:
M66B 2021-10-22 09:28:04 +02:00
parent 1733edce59
commit d531ec0e2c
1 changed files with 7 additions and 32 deletions

View File

@ -75,23 +75,8 @@ public class ResponseInputStream {
boolean gotCRLF=false;
// Read a CRLF terminated line from the InputStream
int wait = 1;
while (!gotCRLF) {
b = bin.read();
if (b == -1) {
wait *= 10;
if (wait > 1000)
throw new IOException("Connection dropped by server?" ,
new Throwable(new String(buffer, 0, idx)));
else
try {
Thread.sleep(wait);
continue;
} catch (InterruptedException ex) {
eu.faircode.email.Log.w(ex);
}
} else
wait = 1;
while (!gotCRLF &&
((b = bin.read()) != -1)) {
if (b == '\n') {
if ((idx > 0) && buffer[idx-1] == '\r')
gotCRLF = true;
@ -106,6 +91,9 @@ public class ResponseInputStream {
buffer[idx++] = (byte)b;
}
if (b == -1)
throw new IOException("Connection dropped by server?");
// Now lets check for literals : {<digits>}CRLF
// Note: index needs to >= 5 for the above sequence to occur
if (idx < 5 || buffer[idx-3] != '}')
@ -143,23 +131,10 @@ public class ResponseInputStream {
* so call repeatedly till we are done
*/
int actual;
wait = 1;
while (count > 0) {
actual = bin.read(buffer, idx, count);
if (actual == -1) {
wait *= 10;
if (wait > 1000)
throw new IOException("Connection dropped by server?" ,
new Throwable(new String(buffer, 0, idx)));
else
try {
Thread.sleep(wait);
continue;
} catch (InterruptedException ex) {
eu.faircode.email.Log.w(ex);
}
} else
wait = 1;
if (actual == -1)
throw new IOException("Connection dropped by server?");
count -= actual;
idx += actual;
}