A few modification to analysis code for HTTP