Skip to content

Commit f345a1a

Browse files
indexzeroindexzero
committedMar 12, 2016
[dist] Update LICENSE to reflect 2015 changes.
1 parent 0183529 commit f345a1a

24 files changed

+52
-54
lines changed
 

‎LICENSE

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

22
node-http-proxy
33

4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2010-2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55

66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -20,4 +20,4 @@
2020
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
2121
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2222
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
23-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,14 @@ proxyServer.listen(8015);
333333
* **ignorePath**: true/false, Default: false - specify whether you want to ignore the proxy path of the incoming request (note: you will have to append / manually if required).
334334
* **localAddress**: Local interface string to bind for outgoing connections
335335
* **changeOrigin**: true/false, Default: false - changes the origin of the host header to the target URL
336-
* **auth**: Basic authentication i.e. 'user:password' to compute an Authorization header.
336+
* **auth**: Basic authentication i.e. 'user:password' to compute an Authorization header.
337337
* **hostRewrite**: rewrites the location hostname on (301/302/307/308) redirects.
338338
* **autoRewrite**: rewrites the location host/port on (301/302/307/308) redirects based on requested host/port. Default: false.
339339
* **protocolRewrite**: rewrites the location protocol on (301/302/307/308) redirects to 'http' or 'https'. Default: null.
340340
* **headers**: object with extra headers to be added to target requests.
341341

342-
**NOTE:**
343-
`options.ws` and `options.ssl` are optional.
342+
**NOTE:**
343+
`options.ws` and `options.ssl` are optional.
344344
`options.target` and `options.forward` cannot both be missing
345345

346346
If you are using the `proxyServer.listen` method, the following options are also applicable:
@@ -458,7 +458,7 @@ Logo created by [Diego Pasquali](http://dribbble.com/diegopq)
458458

459459
>The MIT License (MIT)
460460
>
461-
>Copyright (c) 2010 - 2016 Nodejitsu Inc.
461+
>Copyright (c) 2010 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
462462
>
463463
>Permission is hereby granted, free of charge, to any person obtaining a copy
464464
>of this software and associated documentation files (the "Software"), to deal

‎examples/balancer/simple-balancer-with-websockets.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
simple-balancer.js: Example of a simple round robin balancer for websockets
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@ var http = require('http'),
2929

3030
//
3131
// A simple round-robin load balancing strategy.
32-
//
32+
//
3333
// First, list the servers you want to use in your rotation.
3434
//
3535
var addresses = [
@@ -64,21 +64,20 @@ function nextProxy() {
6464
return proxy;
6565
}
6666

67-
//
68-
// Get the 'next' proxy and send the http request
67+
//
68+
// Get the 'next' proxy and send the http request
6969
//
7070

71-
var server = http.createServer(function (req, res) {
71+
var server = http.createServer(function (req, res) {
7272
nextProxy().web(req, res);
7373
});
7474

75-
//
76-
// Get the 'next' proxy and send the upgrade request
75+
//
76+
// Get the 'next' proxy and send the upgrade request
7777
//
7878

7979
server.on('upgrade', function (req, socket, head) {
8080
nextProxy().ws(req, socket, head);
8181
});
8282

8383
server.listen(8001);
84-

‎examples/balancer/simple-balancer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
simple-balancer.js: Example of a simple round robin balancer
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -28,7 +28,7 @@ var http = require('http'),
2828
httpProxy = require('../../lib/http-proxy');
2929
//
3030
// A simple round-robin load balancing strategy.
31-
//
31+
//
3232
// First, list the servers you want to use in your rotation.
3333
//
3434
var addresses = [

‎examples/http/basic-proxy.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
basic-proxy.js: Basic example of proxying over HTTP
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -31,10 +31,10 @@ var util = require('util'),
3131

3232
var welcome = [
3333
'# # ##### ##### ##### ##### ##### #### # # # #',
34-
'# # # # # # # # # # # # # # # # ',
35-
'###### # # # # ##### # # # # # # ## # ',
36-
'# # # # ##### ##### ##### # # ## # ',
37-
'# # # # # # # # # # # # # ',
34+
'# # # # # # # # # # # # # # # # ',
35+
'###### # # # # ##### # # # # # # ## # ',
36+
'# # # # ##### ##### ##### # # ## # ',
37+
'# # # # # # # # # # # # # ',
3838
'# # # # # # # # #### # # # '
3939
].join('\n');
4040

‎examples/http/concurrent-proxy.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
concurrent-proxy.js: check levelof concurrency through proxy.
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -44,7 +44,7 @@ httpProxy.createServer({
4444
//
4545

4646

47-
var connections = [],
47+
var connections = [],
4848
go;
4949

5050
http.createServer(function (req, res) {
@@ -53,9 +53,9 @@ http.createServer(function (req, res) {
5353
res.write('request successfully proxied to: ' + req.url + '\n' + JSON.stringify(req.headers, true, 2));
5454
res.end();
5555
});
56-
56+
5757
process.stdout.write(connections.length + ', ');
58-
58+
5959
if (connections.length > 110 || go) {
6060
go = true;
6161
while (connections.length) {

‎examples/http/custom-proxy-error.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
custom-proxy-error.js: Example of using the custom `proxyError` event.
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -47,7 +47,7 @@ proxy.on('error', function (err, req, res) {
4747
res.writeHead(500, {
4848
'Content-Type': 'text/plain'
4949
});
50-
50+
5151
res.end('Something went wrong. And we are reporting a custom error message.');
5252
});
5353

‎examples/http/error-handling.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
error-handling.js: Example of handle erros for HTTP and WebSockets
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

‎examples/http/forward-and-target-proxy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
forward-and-target-proxy.js: Example of proxying over HTTP with additional forward proxy
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

‎examples/http/forward-proxy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
forward-proxy.js: Example of proxying over HTTP with additional forward proxy
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

‎examples/http/latent-proxy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
latent-proxy.js: Example of proxying over HTTP with latency
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

‎examples/http/proxy-http-to-https.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
proxy-http-to-https.js: Basic example of proxying over HTTP to a target HTTPS server
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

‎examples/http/proxy-https-to-http.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
proxy-https-to-http.js: Basic example of proxying over HTTPS to a target HTTP server
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -32,9 +32,9 @@ var https = require('https'),
3232
colors = require('colors'),
3333
httpProxy = require('../../lib/http-proxy'),
3434
fixturesDir = path.join(__dirname, '..', '..', 'test', 'fixtures');
35-
35+
3636
//
37-
// Create the target HTTP server
37+
// Create the target HTTP server
3838
//
3939
http.createServer(function (req, res) {
4040
res.writeHead(200, { 'Content-Type': 'text/plain' });

‎examples/http/proxy-https-to-https.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
proxy-https-to-https.js: Basic example of proxying over HTTPS to a target HTTPS server
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -36,9 +36,9 @@ var https = require('https'),
3636
key: fs.readFileSync(path.join(fixturesDir, 'agent2-key.pem'), 'utf8'),
3737
cert: fs.readFileSync(path.join(fixturesDir, 'agent2-cert.pem'), 'utf8')
3838
};
39-
39+
4040
//
41-
// Create the target HTTPS server
41+
// Create the target HTTPS server
4242
//
4343
https.createServer(httpsOpts, function (req, res) {
4444
res.writeHead(200, { 'Content-Type': 'text/plain' });

‎examples/http/sse.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
sse.js: Basic example of proxying over HTTP
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -50,7 +50,7 @@ var server = http.createServer(function(req, res) {
5050
});
5151

5252
//
53-
// Use SSE
53+
// Use SSE
5454
//
5555

5656
var sse = new SSE(server, {path: '/'});

‎examples/http/standalone-proxy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
standalone-proxy.js: Example of proxying over HTTP with a standalone HTTP server.
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

‎examples/middleware/bodyDecoder-middleware.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
bodyDecoder-middleware.js: Basic example of `connect.bodyParser()` middleware in node-http-proxy
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

‎examples/middleware/gzip-middleware.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
gzip-middleware.js: Basic example of `connect-gzip` middleware in node-http-proxy
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

‎examples/middleware/modifyResponse-middleware.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
modifyBody-middleware.js: Example of middleware which modifies response
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

‎examples/websocket/latent-websocket-proxy.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
standalone-websocket-proxy.js: Example of proxying websockets over HTTP with a standalone HTTP server.
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -59,7 +59,7 @@ server.sockets.on('connection', function (client) {
5959
//
6060
var proxy = new httpProxy.createProxyServer({
6161
target: {
62-
host: 'localhost',
62+
host: 'localhost',
6363
port: 9016
6464
}
6565
});
@@ -69,7 +69,7 @@ var proxyServer = http.createServer(function (req, res) {
6969
});
7070

7171
//
72-
// Listen to the `upgrade` event and proxy the
72+
// Listen to the `upgrade` event and proxy the
7373
// WebSocket requests as well.
7474
//
7575
proxyServer.on('upgrade', function (req, socket, head) {

‎examples/websocket/standalone-websocket-proxy.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
standalone-websocket-proxy.js: Example of proxying websockets over HTTP with a standalone HTTP server.
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the
@@ -68,7 +68,7 @@ var proxyServer = http.createServer(function (req, res) {
6868
});
6969

7070
//
71-
// Listen to the `upgrade` event and proxy the
71+
// Listen to the `upgrade` event and proxy the
7272
// WebSocket requests as well.
7373
//
7474
proxyServer.on('upgrade', function (req, socket, head) {

‎examples/websocket/websocket-proxy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
web-socket-proxy.js: Example of proxying over HTTP and WebSockets.
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
Permission is hereby granted, free of charge, to any person obtaining
77
a copy of this software and associated documentation files (the

‎package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
"url": "https://github.com/nodejitsu/node-http-proxy.git"
77
},
88
"description": "HTTP proxying for the masses",
9-
"author": "Nodejitsu Inc. <info@nodejitsu.com>",
9+
"author": "Charlie Robbins <charlie.robbins@gmail.com>",
1010
"maintainers": [
11-
"yawnt <yawnt@nodejitsu.com>",
12-
"indexzero <charlie@nodejitsu.com>"
11+
"jcrugzz <jcrugzz@gmail.com>"
1312
],
1413
"main": "index.js",
1514
"dependencies": {

‎test/examples-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
examples-test.js: Test to run all the examples
33
4-
Copyright (c) Nodejitsu 2013
4+
Copyright (c) 2013 - 2016 Charlie Robbins, Jarrett Cruger & the Contributors.
55
66
*/
77
var path = require('path'),

0 commit comments

Comments
 (0)
Please sign in to comment.