Another fix related to request not being caught

Author: ExplodingBottle

src/io/github/explodingbottle/jmagicproxy/proxy/SimpleInputOutputPipeThread.java

@@ -86,6 +86,7 @@ private Integer handleLineRead(int readLength) throws IOException {
 			lastReadBlock = new StringBuilder();
 		if (lastReadLine == null)
 			lastReadLine = new StringBuilder();
+		boolean gotItOnce = false;
 		for (int it = 0; it < readLength; it++) {
 			byte r = transferBuffer[it];
 			lastReadBlock.append((char) r);
@@ -94,6 +95,7 @@ private Integer handleLineRead(int readLength) throws IOException {
 				String readLine = lastReadLine.toString();
 				try {
 					HttpResponse.createFromHeaderBlock(lastReadBlock);
+					gotItOnce = true;
 				} catch (MalformedParsableContent e1) {
 					lastReadBlock = new StringBuilder();
 					lastReadLine = new StringBuilder();
@@ -136,6 +138,11 @@ private Integer handleLineRead(int readLength) throws IOException {
 				lastReadLine = new StringBuilder();
 			}
 		}
+
+		if (!gotItOnce) {
+			lastReadBlock = new StringBuilder();
+			lastReadLine = new StringBuilder();
+		}
 		return toRet;
 	}
 

src/io/github/explodingbottle/jmagicproxy/proxy/SocketHandlerThread.java

@@ -127,6 +127,7 @@ private Integer handleLineRead(int readLength) {
 			lastReadBlock = new StringBuilder();
 		if (lastReadLine == null)
 			lastReadLine = new StringBuilder();
+		boolean gotItOnce = false;
 		for (int it = 0; it < readLength; it++) {
 			byte r = buffer[it];
 			lastReadBlock.append((char) r);
@@ -135,6 +136,7 @@ private Integer handleLineRead(int readLength) {
 				String readLine = lastReadLine.toString();
 				try {
 					HttpRequestHeader.createFromHeaderBlock(lastReadBlock);
+					gotItOnce = true;
 				} catch (MalformedParsableContent e1) {
 					lastReadBlock = new StringBuilder();
 					lastReadLine = new StringBuilder();
@@ -180,6 +182,11 @@ private Integer handleLineRead(int readLength) {
 				lastReadLine = new StringBuilder();
 			}
 		}
+
+		if (!gotItOnce) {
+			lastReadBlock = new StringBuilder();
+			lastReadLine = new StringBuilder();
+		}
 		return toRet;
 	}
 

src/io/github/explodingbottle/jmagicproxy/proxy/ssl/SSLCommunicationServer.java

@@ -147,6 +147,7 @@ private Integer handleLineRead(int readLength) {
 			lastReadBlock = new StringBuilder();
 		if (lastReadLine == null)
 			lastReadLine = new StringBuilder();
+		boolean gotItOnce = false;
 		for (int it = 0; it < readLength; it++) {
 			byte r = buffer[it];
 			lastReadBlock.append((char) r);
@@ -155,6 +156,7 @@ private Integer handleLineRead(int readLength) {
 				String readLine = lastReadLine.toString();
 				try {
 					HttpRequestHeader.createFromHeaderBlock(lastReadBlock);
+					gotItOnce = true;
 				} catch (MalformedParsableContent e1) {
 					lastReadBlock = new StringBuilder();
 					lastReadLine = new StringBuilder();
@@ -185,6 +187,10 @@ private Integer handleLineRead(int readLength) {
 				lastReadLine = new StringBuilder();
 			}
 		}
+		if (!gotItOnce) {
+			lastReadBlock = new StringBuilder();
+			lastReadLine = new StringBuilder();
+		}
 		return toRet;
 	}
 

src/io/github/explodingbottle/jmagicproxy/proxy/ssl/SSLInputOutputPipeThread.java

@@ -84,6 +84,7 @@ private Integer handleLineRead(int readLength) throws IOException {
 			lastReadBlock = new StringBuilder();
 		if (lastReadLine == null)
 			lastReadLine = new StringBuilder();
+		boolean gotItOnce = false;
 		for (int it = 0; it < readLength; it++) {
 			byte r = transferBuffer[it];
 			lastReadBlock.append((char) r);
@@ -92,6 +93,7 @@ private Integer handleLineRead(int readLength) throws IOException {
 				String readLine = lastReadLine.toString();
 				try {
 					HttpResponse.createFromHeaderBlock(lastReadBlock);
+					gotItOnce = true;
 				} catch (MalformedParsableContent e1) {
 					lastReadBlock = new StringBuilder();
 					lastReadLine = new StringBuilder();
@@ -129,6 +131,11 @@ private Integer handleLineRead(int readLength) throws IOException {
 				lastReadLine = new StringBuilder();
 			}
 		}
+
+		if (!gotItOnce) {
+			lastReadBlock = new StringBuilder();
+			lastReadLine = new StringBuilder();
+		}
 		return toRet;
 	}