add htpasswd bcrypt, refactor apr1 impl
udpate tests