commit ebc82a7e018dbd04dd1d810bc418cc6cce1f4485 Author: David Fifield david@bamsoftware.com Date: Wed Apr 8 23:57:00 2015 -0700

http.Error adds its own newline. --- meek-server/meek-server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index 172614d..ac5aa3e 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -56,11 +56,11 @@ var ptInfo pt.ServerInfo var handlerChan = make(chan int)

func httpBadRequest(w http.ResponseWriter) { - http.Error(w, "Bad request.\n", http.StatusBadRequest) + http.Error(w, "Bad request.", http.StatusBadRequest) }

func httpInternalServerError(w http.ResponseWriter) { - http.Error(w, "Internal server error.\n", http.StatusInternalServerError) + http.Error(w, "Internal server error.", http.StatusInternalServerError) }

// Every session id maps to an existing OR port connection, which we keep open