canonical redirect now preserves protocol
Merge pull request #227 from will123195/2.2

canonical redirect now preserves protocol