Fixes #590 - Fix conditional proxy requests#608

Merged

karlcow merged 3 commits intomasterfrom

Apr 13, 2015

Commits on Apr 10, 2015

Issue #590 - Allow proxy_request to take a headers argument.
Mike Taylor
committed
Issue #590 - Pass in the request_headers to proxy requests.
Mike Taylor
committed
Issue #590 - Only try to merge headers when headers is passed in.
Mike Taylor
committed