Updating to support new SSL & SPDY changes