[mod][fix] https rewrite refactor ++ fixes