Merge pull request #2150 from francetv/main
support for uri for severname with use_servername_for_filenames