Adds support for more complex protocol by having the url regexp closer to rfc1738.