allow multiple response_body references, closes #27

Author: asg017

do.go

@@ -466,6 +466,8 @@ type HttpDoCursor struct {
 	// Remote network address, filled in when HTTP connection is made, IP address
 	RemoteAddr string
 
+	response_body []byte
+
 	columns []vtab.Column
 }
 
@@ -531,18 +533,24 @@ func (cur *HttpDoCursor) Column(ctx vtab.Context, c int) error {
 			ctx.ResultText(string(buf))
 		}
 	case "response_body":
-		start := time.Now()
-		cur.timing.BodyStart = &start
-
-		body, err := ioutil.ReadAll(cur.response.Body)
-		end := time.Now()
-		cur.timing.BodyEnd = &end
-
-		if err != nil {
-			ctx.ResultError(err)
+		if cur.response_body == nil {
+			start := time.Now()
+			cur.timing.BodyStart = &start
+
+			body, err := ioutil.ReadAll(cur.response.Body)
+			end := time.Now()
+			cur.timing.BodyEnd = &end
+
+			if err != nil {
+				ctx.ResultError(err)
+			} else {
+				ctx.ResultBlob(body)
+				cur.response_body = body
+			}
 		} else {
-			ctx.ResultBlob(body)
+			ctx.ResultBlob(cur.response_body)
 		}
+
 	case "remote_address":
 		ctx.ResultText(cur.RemoteAddr)
 	case "timings":

tests/test-loadable.py

@@ -173,6 +173,16 @@ def test_http_get(self):
     self.assertTrue(d["remote_address"] in ("127.0.0.1:8080", "[::1]:8080"))
     self.assertEqual(d["meta"], None)
 
+  @skip_do
+  def test_http_get_multiple_response_body(self):
+    d = db.execute("select response_body as r1, response_body as r2 from http_get('http://localhost:8080/base64/YWxleA==')").fetchone()
+    self.assertEqual(d["r1"], b"alex")
+    self.assertEqual(d["r2"], b"alex")
+
+    d = db.execute("select response_body from json_each('[\"YWxleA==\", \"YW5nZWw=\"]') join http_get('http://localhost:8080/base64/' || value)").fetchall()
+    self.assertEqual(d[0]["response_body"], b"alex")
+    self.assertEqual(d[1]["response_body"], b"angel")
+  
   @skip_do
   def test_http_get_body(self):
     d, = db.execute("""