From 5e82ca562d603adc9b5d268dfa4fa79dfa1b352c Mon Sep 17 00:00:00 2001
From: Paul Dix <paul@pauldix.net>
Date: Thu, 26 Mar 2015 08:01:27 -0400
Subject: [PATCH] Update server and handler to work with streamed responses

---
 httpd/handler.go      | 6 ++++++
 httpd/handler_test.go | 1 +
 2 files changed, 7 insertions(+)

diff --git a/httpd/handler.go b/httpd/handler.go
index d11066b320..9610ff53c2 100644
--- a/httpd/handler.go
+++ b/httpd/handler.go
@@ -30,6 +30,10 @@ const (
 	DefaultChunkSize = 10000
 )
 
+const (
+	DefaultChunkSize = 10000
+)
+
 // TODO: Standard response headers (see: HeaderHandler)
 // TODO: Compression (see: CompressionHeaderHandler)
 
@@ -201,6 +205,8 @@ func (h *Handler) serveQuery(w http.ResponseWriter, r *http.Request, user *influ
 	chunkSize := DefaultChunkSize
 	if chunked {
 		if cs, err := strconv.ParseInt(q.Get("chunk_size"), 10, 64); err == nil {
+			chunkSize = DefaultChunkSize
+		} else {
 			chunkSize = int(cs)
 		}
 	}
diff --git a/httpd/handler_test.go b/httpd/handler_test.go
index 670f52963d..ddf5840f3a 100644
--- a/httpd/handler_test.go
+++ b/httpd/handler_test.go
@@ -11,6 +11,7 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"os"
+	"reflect"
 	"regexp"
 	"strings"
 	"testing"