Skip to content

Commit 3330e12

Browse files
committed
Merge pull request #552 from nodejitsu/caronte-merge
Http proxy 1.0
2 parents 840f6d8 + d6d2d0c commit 3330e12

File tree

92 files changed

+2416
-6519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2416
-6519
lines changed

.gitignore

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
config.json
2-
node_modules/
3-
npm-debug.log
1+
node_modules
2+
*.swp
3+
cov
4+
atest.js
5+
notes
6+
primus-proxy.js
7+
tes.js

.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
language: node_js
22
node_js:
3-
- 0.8
43
- "0.10"
54
- "0.11"
65

76
notifications:
87
email:
98
109
irc: "irc.freenode.org#nodejitsu"
10+
11+
script:
12+
npm test

CHANGELOG.md

+2-95
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,4 @@
1-
## ChangeLog for: node-http-proxy
1+
### v 1.0.0-alpha
22

3-
## Version 0.10.0 - 3/18/2013
3+
- Complete refactor with new API
44

5-
- Breaking change: `proxyResponse` events are emitted on the `HttpProxy` or `RoutingProxy` instances as originally was intended in `0.9.x`.
6-
7-
## Version 0.9.1 - 3/9/2013
8-
9-
- Ensure that `webSocketProxyError` and `proxyError` both receive the error (indexzero).
10-
11-
## Version 0.9.0 - 3/9/2013
12-
- Fix #276 Ensure response.headers.location is defined (indexzero)
13-
- Fix #248 Make options immutable in RoutingProxy (indexzero)
14-
- Fix #359 Do not modify the protocol in redirect request for external sites. (indexzero)
15-
- Fix #373 Do not use "Transfer-Encoding: chunked" header for proxied DELETE requests with no "Content-Length" header. (indexzero)
16-
- Fix #338 Set "content-length" header to "0" if it is not already set on DELETE requests. (indexzero)
17-
- Updates to README.md and Examples (ramitos, jamie-stackhouse, oost, indexzero)
18-
- Fixes to ProxyTable and Routing Proxy (adjohnson916, otavoijr)
19-
- New API for ProxyTable (mikkel, tglines)
20-
- Add `options.timeout` for specifying socket timeouts (pdoran)
21-
- Improve bin/node-http-proxy (niallo)
22-
- Don't emit `proxyError` twice (erasmospunk)
23-
- Fix memory leaks in WebSocket proxying
24-
- Support UNIX Sockets (yosefd)
25-
- Fix truncated chunked respones (jpetazzo)
26-
- Allow upstream listeners to get `proxyResponse` (colinmollenhour)
27-
28-
## Version 0.8.1 - 6/5/2012
29-
- Fix re-emitting of events in RoutingProxy (coderarity)
30-
- New load balancer and middleware examples (marak)
31-
- Docs updated including changelog (lot of gently people)
32-
33-
## Version 0.8.0 - 12/23/2011
34-
- Improve support and tests for url segment routing (maxogden)
35-
- Fix aborting connections when request close (c4milo)
36-
- Avoid 'Transfer-Encoding' on HTTP/1.0 clients (koichik).
37-
- Support for Node.js 0.6.x (mmalecki)
38-
39-
## Version 0.7.3 - 10/4/2011
40-
- Fix setting x-forwarded headers (jesusabdullah)
41-
- Updated examples (AvianFlu)
42-
43-
## Version 0.7.0 - 9/10/2011
44-
- Handles to every throw-able resume() call (isaacs)
45-
- Updated tests, README and package.json (indexzero)
46-
- Added HttpProxy.close() method (indexzero)
47-
48-
## Version 0.6.6 - 8/31/2011
49-
- Add more examples (dominictarr)
50-
- Use of 'pkginfo' (indexzero)
51-
- Handle cases where res.write throws (isaacs)
52-
- Handles to every throw-able res.end call (isaacs)
53-
54-
## Version 0.5.11 - 6/21/2011
55-
- Add more examples with WebSockets (indexzero)
56-
- Update the documentation (indexzero)
57-
58-
## Version 0.5.7 - 5/19/2011
59-
- Fix to README related to markup and fix some examples (benatkin)
60-
- Improve WebSockets handling (indexzero)
61-
- Improve WebSockets tests (indexzero)
62-
- Improve https tests (olauzon)
63-
- Add devDependencies to package.json (olauzon)
64-
- Add 'proxyError' event (indexzero)
65-
- Add 'x-forwarded-{port|proto}' headers support (indexzero)
66-
- Keep-Alive connection supported (indexzero)
67-
68-
## Version 0.5.0 - 4/15/2011
69-
- Remove winston in favor of custom events (indexzero)
70-
- Add x-forwarded-for Header (indexzero)
71-
- Fix WebSocket support (indexzero)
72-
- Add tests / examples for WebSocket support (indexzero)
73-
- Update .proxyRequest() and .proxyWebSocketRequest() APIs (indexzero)
74-
- Add HTTPS support (indexzero)
75-
- Add tests / examples for HTTPS support (indexzero)
76-
77-
## Version 0.4.1 - 3/20/2011
78-
- Include missing dependency in package.json (indexzero)
79-
80-
## Version 0.4.0 - 3/20/2011
81-
- Update for node.js 0.4.0 (indexzero)
82-
- Remove pool dependency in favor of http.Agent (indexzero)
83-
- Store buffered data using `.buffer()` instead of on the HttpProxy instance (indexzero)
84-
- Change the ProxyTable to be a lookup table instead of actively proxying (indexzero)
85-
- Allow for pure host-only matching in ProxyTable (indexzero)
86-
- Use winston for logging (indexzero)
87-
- Improve tests with async setup and more coverage (indexzero)
88-
- Improve code documentation (indexzero)
89-
90-
### Version 0.3.1 - 11/22/2010
91-
- Added node-http-proxy binary script (indexzero)
92-
- Added experimental WebSocket support (indutny)
93-
- Added forward proxy functionality (indexzero)
94-
- Added proxy table for multiple target lookup (indexzero)
95-
- Simplified tests using helpers.js (indexzero)
96-
- Fixed uncaughtException bug with invalid proxy target (indutny)
97-
- Added configurable logging for HttpProxy and ProxyTable (indexzero)

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
node-http-proxy
33

4-
Copyright (c) 2010 Charlie Robbins, Mikeal Rogers, Fedor Indutny, & Marak Squires
4+
Copyright (c) Nodejitsu 2013
55

66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

0 commit comments

Comments
 (0)