tree 3733b3c81b59e0bb5e3c93770233476f2ff2bb73
parent 5db69f3f6616ea199a7840f0602b988f8d5504b9
author Conley Owens <cco3@android.com> 1391209431 -0800
committer Conley Owens <cco3@android.com> 1391213191 -0800

Fix persistent-https relative url resolving

Previously, we would remove 'persistent-' then tack it on at the end
if it had been previously found.  However, this would ignore urljoin's
decision on whether or not the second path was relative.  Instead, we
were always assuming it was relative and that we didn't want to use
a different absolute url with a different protocol.

This change handles persistent-https:// in the same way we handled the
absense of an explicit protocol.  The only difference is that this time
instead of temporarily replacing it with 'gopher://', we use 'wais://'.

Change-Id: I6e8ad1eb4b911931a991481717f1ade01315db2a