jtp: support lack of carriage return

jtp/jtp.go

@@ -188,7 +188,7 @@ func validateHeaders(buf *bufio.Reader) error {
 			return err
 		}
 
-		if line == "\r\n" {
+		if line == "\r\n" || line == "\n" {
 			break
 		}
 
@@ -221,7 +221,7 @@ func findLocation(buf *bufio.Reader, baseLink *url.URL) (*url.URL, error) {
 			return nil, err
 		}
 
-		if line == "\r\n" {
+		if line == "\r\n" || line == "\n" {
 			break
 		}
 

jtp/jtp_test.go

@@ -3,9 +3,9 @@ package jtp
 import (
 	"testing"
 	"mimicry/util"
-	// "net/url"
-	// "encoding/json"
-	// "os"
+	"net/url"
+	"encoding/json"
+	"os"
 )
 
 func TestStatusLineNoInfo(t *testing.T) {
@@ -19,19 +19,19 @@ func TestStatusLineNoInfo(t *testing.T) {
 
 // TODO: put this behind an --online flag or figure out
 // how to nicely do offline tests
-// func TestBasic(t *testing.T) {
-// 	link, err := url.Parse("https://httpbin.org/redirect/20")
-// 	if err != nil {
-// 		panic(err)
-// 	}
+func TestBasic(t *testing.T) {
+	link, err := url.Parse("https://httpbin.org/redirect/20")
+	if err != nil {
+		panic(err)
+	}
 
-// 	dict, err := Get(link, 20)
-// 	if err != nil {
-// 		panic(err)
-// 	}
+	dict, err := Get(link, 20)
+	if err != nil {
+		panic(err)
+	}
 
-// 	err = json.NewEncoder(os.Stdout).Encode(dict)
-// 	if err != nil {
-// 		panic(err)
-// 	}
-// }
+	err = json.NewEncoder(os.Stdout).Encode(dict)
+	if err != nil {
+		panic(err)
+	}
+}