Added support for specifying the filename (also needs escaping)
Also match HTTP 0.9 requests
Set the filename explicitly