[2.3.x] + fix a typo (thanks to Ryan) :)
[2.3.x] + minor refactoring
[2.3.x] +restore HttpProtocolFinder