Add proper support for HTTP close connection option