Consolidated HTTP CONNECT and normal HTTP request handling and more cleanups #302