Forward port of patch # 500311: Work around for buggy https servers.
Fixes #494762.
3 files changed