This will need to be tested. Last time I looked at merging these changes, this didn't work, resulting in an engine that only supported mms and https.