Merge upstream

chans/httpclient/httpclient.go

@@ -206,6 +206,7 @@ func extractHTTPRequest(ctx *dsl.Ctx, m dsl.Msg) (*HTTPRequest, error) {
 
 	if req.Body != nil {
 		real.Body = ioutil.NopCloser(bytes.NewReader(req.body))
+		real.ContentLength = int64(len(req.body))
 	}
 
 	req.req = real

chans/httpclient/httpclient_test.go

@@ -22,6 +22,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"net/http/httptest"
@@ -150,3 +151,63 @@ func TestHTTPRequestPolling(t *testing.T) {
 		t.Fatal("received another request")
 	}
 }
+
+func TestContentLength(t *testing.T) {
+	var (
+		ctx      = dsl.NewCtx(context.Background())
+		interval = 50 * time.Millisecond // PollInterval
+
+		// Four is the only number that has the same number of
+		// letters as its value.  Fun fact.
+		body = "four"
+
+		ts = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if int(r.ContentLength) != len(body) {
+				bs, _ := ioutil.ReadAll(r.Body)
+				t.Fatalf("%d: %s", r.ContentLength, bs)
+			}
+			fmt.Fprintln(w, "{}")
+		}))
+	)
+
+	defer ts.Close()
+
+	c, err := NewHTTPClientChan(ctx, &HTTPClientOpts{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err = c.Open(ctx); err != nil {
+		t.Fatal(err)
+	}
+
+	defer func() {
+		if err := c.Close(ctx); err != nil {
+			t.Fatal(err)
+		}
+	}()
+
+	payload, err := json.Marshal(&HTTPRequest{
+		Method: "POST",
+		URL:    ts.URL,
+		HTTPRequestCtl: HTTPRequestCtl{
+			PollInterval: interval.String(),
+		},
+		Body:                     body,
+		RequestBodySerialization: "string",
+	})
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = c.Pub(ctx, dsl.Msg{
+		Payload: string(payload),
+	})
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	<-c.Recv(ctx)
+}