Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: http-party/node-http-proxy
base: 7cb98a4e4173
Choose a base ref
...
head repository: http-party/node-http-proxy
compare: f6bac7b2576b
Choose a head ref
  • 6 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 9, 2014

  1. Added targetTimeout option and two tests for timeout

    @Rush
    Rush committed Jun 9, 2014
    Copy the full SHA
    0f24351 View commit details
    Browse the repository at this point in the history

  2. Fix #657

    @Rush
    Rush committed Jun 9, 2014
    Copy the full SHA
    159ca83 View commit details
    Browse the repository at this point in the history

  3. Fix #657

    @Rush
    Rush committed Jun 9, 2014
    Copy the full SHA
    4193d3b View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2014

  1. Change name targetTimeout to proxyTimeout

    @Rush
    Rush committed Jun 10, 2014
    Copy the full SHA
    7b79a74 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:RushPL/node-http-proxy

    @Rush
    Rush committed Jun 10, 2014
    Copy the full SHA
    48d46e6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #658 from RushPL/master 

    Added proxyTimeout option and two tests for timeout
    @jcrugzz
    jcrugzz committed Jun 10, 2014
    Copy the full SHA
    f6bac7b View commit details
    Browse the repository at this point in the history