merge from sipfullproxyauth.py