Absolutely minimal proxy support with a slightly modified version of Sergey Saukh's patch from bug report 155707. This is better than nothing and a weak bugfix.

Let's see if I can do better and get a better version into 4.1...

Also there must be a better way to implement the logic around proxies than sprinkling 25 lines o'stuff into every other already-too-long function.