http-server improvements