Merge branch 'master' into tcp_pool

Conflicts:
	output_http.go
	output_http_test.go

test_input.go

@@ -26,6 +26,10 @@ func (i *TestInput) EmitPOST() {
 	i.data <- []byte("POST /pub/WWW/ HTTP/1.1\nHost: www.w3.org\r\n\r\na=1&b=2\r\n\r\n")
 }
 
+func (i *TestInput) EmitOPTIONS() {
+	i.data <- []byte("OPTIONS / HTTP/1.1\nHost: www.w3.org\r\n\r\n")
+}
+
 func (i *TestInput) String() string {
 	return "Test Input"
 }