fix Host header with port or IPv6 address

Makefile

@@ -45,7 +45,7 @@ $(ODIR): $(LDIR)/libluajit.a
 
 $(ODIR)/bytecode.o: scripts/wrk.lua
 	@echo LUAJIT $<
-	@$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(PWD)/$< $(PWD)/$@'
+	@$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@'
 
 $(ODIR)/%.o : %.c
 	@echo CC $<

scripts/wrk.lua

@@ -9,14 +9,16 @@ local wrk = {
 }
 
 function wrk.format(method, path, headers, body)
-   local host    = wrk.host
    local method  = method  or wrk.method
    local path    = path    or wrk.path
    local headers = headers or wrk.headers
    local body    = body    or wrk.body
    local s       = {}
 
-   headers["Host"]           = port and (host .. ":" .. port) or host
+   if not headers["Host"] then
+      headers["Host"] = wrk.headers["Host"]
+   end
+
    headers["Content-Length"] = body and string.len(body)
 
    s[1] = string.format("%s %s HTTP/1.1", method, path)
@@ -30,8 +32,22 @@ function wrk.format(method, path, headers, body)
    return table.concat(s, "\r\n")
 end
 
-function wrk.init(args) req = wrk.format() end
+function wrk.init(args)
-function wrk.request()  return req         end
+   if not wrk.headers["Host"] then
+      local host = wrk.host
+      local port = wrk.port
+
+      host = host:find(":") and ("[" .. host .. "]")  or host
+      host = port           and (host .. ":" .. port) or host
+
+      wrk.headers["Host"] = host
+   end
+   req = wrk.format()
+end
+
+function wrk.request()
+   return req
+end
 
 init     = wrk.init
 request  = wrk.request

src/wrk.h

@@ -14,7 +14,7 @@
 #include "script.h"
 #include "http_parser.h"
 
-#define VERSION  "3.0.1"
+#define VERSION  "3.0.3"
 #define RECVBUF  8192
 #define SAMPLES  100000000