add URI general name support
3 files changed