[WIP] Bug 1026426 — Handle short URLs

oh, nvm, I've read "expire", not sure why. Discard previous comment.