1.18.1

* Skip sending the proxyReq event when the expect header is present

* Adjust padding to match advisory

Co-authored-by: Smylnycky, Jason M <jason.smylnycky@cengage.com>

.auto-changelog

@@ -0,0 +1,6 @@
+{
+  "output": "CHANGELOG.md",
+  "template": "keepachangelog",
+  "unreleased": true,
+  "commitLimit": false
+}

.gitattributes

@@ -0,0 +1 @@
+package-lock.json binary

.npmignore

@@ -2,6 +2,8 @@ test
 examples
 doc
 benchmark
+coverage
+.nyc_output
 .travis.yml
 CHANGELOG.md
-UPGRADING.md
+UPGRADING.md

.travis.yml

@@ -1,16 +1,12 @@
 sudo: false
 language: node_js
 node_js:
-  - "4"
-  - "6"
   - "8"
+  - "10"
+  - "12"
 script:
   - npm test
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 matrix:
   fast_finish: true
-notifications:
-  email:
-    - travis@nodejitsu.com
-  irc: "irc.freenode.org#nodejitsu"

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at <https://github.com/nodejitsu/node-http-proxy>. All
+reported by contacting the project team at <https://github.com/http-party/node-http-proxy>. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

README.md

@@ -1,8 +1,8 @@
 <p align="center">
-  <img src="https://raw.github.com/nodejitsu/node-http-proxy/master/doc/logo.png"/>
+  <img src="https://raw.github.com/http-party/node-http-proxy/master/doc/logo.png"/>
 </p>
 
-# node-http-proxy [![Build Status](https://travis-ci.org/nodejitsu/node-http-proxy.svg?branch=master)](https://travis-ci.org/nodejitsu/node-http-proxy) [![codecov](https://codecov.io/gh/nodejitsu/node-http-proxy/branch/master/graph/badge.svg)](https://codecov.io/gh/nodejitsu/node-http-proxy)
+# node-http-proxy [![Build Status](https://travis-ci.org/http-party/node-http-proxy.svg?branch=master)](https://travis-ci.org/http-party/node-http-proxy) [![codecov](https://codecov.io/gh/http-party/node-http-proxy/branch/master/graph/badge.svg)](https://codecov.io/gh/http-party/node-http-proxy)
 
 `node-http-proxy` is an HTTP programmable proxying library that supports
 websockets. It is suitable for implementing components such as reverse
@@ -45,7 +45,7 @@ Click [here](UPGRADING.md)
 ### Core Concept
 
 A new proxy is created by calling `createProxyServer` and passing
-an `options` object as argument ([valid properties are available here](lib/http-proxy.js#L22-L50))
+an `options` object as argument ([valid properties are available here](lib/http-proxy.js#L26-L42))
 
 ```javascript
 var httpProxy = require('http-proxy');
@@ -137,7 +137,7 @@ var proxy = httpProxy.createProxyServer({});
 var server = http.createServer(function(req, res) {
   // You can define here your custom logic to handle the request
   // and then proxy the request.
-  proxy.web(req, res, { target: 'http://127.0.0.1:5060' });
+  proxy.web(req, res, { target: 'http://127.0.0.1:5050' });
 });
 
 console.log("listening on port 5050")
@@ -175,7 +175,7 @@ var server = http.createServer(function(req, res) {
   // You can define here your custom logic to handle the request
   // and then proxy the request.
   proxy.web(req, res, {
-    target: 'http://127.0.0.1:5060'
+    target: 'http://127.0.0.1:5050'
   });
 });
 
@@ -501,12 +501,12 @@ data.
       selfHandleResponse : true
     };
     proxy.on('proxyRes', function (proxyRes, req, res) {
-        var body = new Buffer('');
+        var body = [];
-        proxyRes.on('data', function (data) {
+        proxyRes.on('data', function (chunk) {
-            body = Buffer.concat([body, data]);
+            body.push(chunk);
         });
         proxyRes.on('end', function () {
-            body = body.toString();
+            body = Buffer.concat(body).toString();
             console.log("res from proxied server:", body);
             res.end("my response to cli");
         });
@@ -534,7 +534,7 @@ Logo created by [Diego Pasquali](http://dribbble.com/diegopq)
 
 ### Contributing and Issues
 
-* Read carefully our [Code Of Conduct](https://github.com/nodejitsu/node-http-proxy/blob/master/CODE_OF_CONDUCT.md)
+* Read carefully our [Code Of Conduct](https://github.com/http-party/node-http-proxy/blob/master/CODE_OF_CONDUCT.md)
 * Search on Google/Github
 * If you can't find anything, open an issue
 * If you feel comfortable about fixing the issue, fork the repo

UPGRADING.md

@@ -12,11 +12,11 @@ httpProxy.createServer({
 }).listen(8003);
 ```
 
-Check the [README.md](https://github.com/nodejitsu/node-http-proxy/blob/caronte/README.md) for a more detailed explanation of the parameters.
+Check the [README.md](https://github.com/http-party/node-http-proxy/blob/caronte/README.md) for a more detailed explanation of the parameters.
 
 ## Proxying
 
-Web proxying is done by calling the `.web()` method on a Proxy instance. You can check among some use cases in the [examples folder](https://github.com/nodejitsu/node-http-proxy/tree/caronte/examples/http)
+Web proxying is done by calling the `.web()` method on a Proxy instance. You can check among some use cases in the [examples folder](https://github.com/http-party/node-http-proxy/tree/caronte/examples/http)
 
 ```javascript
 //
@@ -32,7 +32,7 @@ httpProxy.createProxyServer({
 
 ```
 
-Websockets are proxied by the `.ws()` method. The [examples folder](https://github.com/nodejitsu/node-http-proxy/tree/caronte/examples/websocket) again provides a lot of useful snippets!
+Websockets are proxied by the `.ws()` method. The [examples folder](https://github.com/http-party/node-http-proxy/tree/caronte/examples/websocket) again provides a lot of useful snippets!
 
 ```javascript
 var proxy = new httpProxy.createProxyServer({
@@ -90,7 +90,7 @@ which were in the core and delegate them to eventual "userland" modules.
 
 ### Middleware API
 
-The new API makes it really easy to implement code that behaves like the old Middleware API. You can check some examples [here](https://github.com/nodejitsu/node-http-proxy/tree/caronte/examples/middleware)
+The new API makes it really easy to implement code that behaves like the old Middleware API. You can check some examples [here](https://github.com/http-party/node-http-proxy/tree/caronte/examples/middleware)
 
 ### ProxyTable API
 

examples/http/ntlm-authentication.js

@@ -1,4 +1,4 @@
-var httpProxy = require('http-proxy');
+var httpProxy = require('../../lib/http-proxy');
 var Agent = require('agentkeepalive');
 
 var agent =  new Agent({

examples/http/reverse-proxy.js

@@ -23,7 +23,7 @@
 
 var http = require('http'),
     net = require('net'),
-    httpProxy = require('http-proxy'),
+    httpProxy = require('../../lib/http-proxy'),
     url = require('url'),
     util = require('util');
 
@@ -31,8 +31,9 @@ var proxy = httpProxy.createServer();
 
 var server = http.createServer(function (req, res) {
   util.puts('Receiving reverse proxy request for:' + req.url);
-
+  var parsedUrl = url.parse(req.url);
-  proxy.web(req, res, {target: req.url, secure: false});
+  var target = parsedUrl.protocol + '//' + parsedUrl.hostname;
+  proxy.web(req, res, {target: target, secure: false});
 }).listen(8213);
 
 server.on('connect', function (req, socket) {

examples/middleware/bodyDecoder-middleware.js

@@ -29,6 +29,7 @@ var http = require('http'),
     request = require('request'),
     colors = require('colors'),
     util = require('util'),
+    queryString = require('querystring'),
     bodyParser = require('body-parser'),
     httpProxy = require('../../lib/http-proxy'),
     proxy = httpProxy.createProxyServer({});
@@ -36,12 +37,23 @@ var http = require('http'),
 
 //restream parsed body before proxying
 proxy.on('proxyReq', function(proxyReq, req, res, options) {
-  if(req.body) {
+  if (!req.body || !Object.keys(req.body).length) {
-    let bodyData = JSON.stringify(req.body);
+    return;
-    // incase if content-type is application/x-www-form-urlencoded -> we need to change to application/json
+  }
-    proxyReq.setHeader('Content-Type','application/json');
+
+  var contentType = proxyReq.getHeader('Content-Type');
+  var bodyData;
+
+  if (contentType === 'application/json') {
+    bodyData = JSON.stringify(req.body);
+  }
+
+  if (contentType === 'application/x-www-form-urlencoded') {
+    bodyData = queryString.stringify(req.body);
+  }
+
+  if (bodyData) {
     proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData));
-    // stream the content
     proxyReq.write(bodyData);
   }
 });
@@ -94,5 +106,3 @@ http.createServer(app1).listen(9013, function(){
     console.log('return for urlencoded request:' ,err, data)
   })
 });
-
-

examples/middleware/modifyResponse-middleware.js

@@ -28,24 +28,26 @@ var util = require('util'),
     colors = require('colors'),
     http = require('http'),
     connect = require('connect'),
+    app = connect(),
     httpProxy = require('../../lib/http-proxy');
 
 //
 // Basic Connect App
 //
-connect.createServer(
+app.use(function (req, res, next) {
-  function (req, res, next) {
+  var _write = res.write;
-    var _write = res.write;
 
-    res.write = function (data) {
+  res.write = function (data) {
-      _write.call(res, data.toString().replace("Ruby", "nodejitsu"));
+    _write.call(res, data.toString().replace("Ruby", "http-party"));
-    }
-    next();
-  },
-  function (req, res) {
-    proxy.web(req, res);
   }
-).listen(8013);
+  next();
+});
+
+app.use(function (req, res) {
+  proxy.web(req, res)
+});
+
+http.createServer(app).listen(8013);
 
 //
 // Basic Http Proxy Server
@@ -59,7 +61,7 @@ var proxy = httpProxy.createProxyServer({
 //
 http.createServer(function (req, res) {
   res.writeHead(200, { 'Content-Type': 'text/plain' });
-  res.end('Hello, I know Ruby\n');
+  res.end('Hello, I love Ruby\n');
 }).listen(9013);
 
 util.puts('http proxy server'.blue + ' started '.green.bold + 'on port '.blue + '8013'.yellow);

examples/package.json

@@ -3,13 +3,12 @@
   "description": "packages required to run the examples",
   "version": "0.0.0",
   "dependencies": {
-    "agentkeepalive": "^2.0.3",
+    "agentkeepalive": "^4.0.0",
-    "colors": "~0.6.2",
+    "colors": "~1.3.0",
-    "connect": "~2.11.0",
     "connect-restreamer": "~1.0.0",
-    "request": "~2.27.0",
+    "request": "~2.88.0",
     "socket.io": "~0.9.16",
     "socket.io-client": "~0.9.16",
-    "sse": "0.0.6"
+    "sse": "0.0.8"
   }
 }

lib/http-proxy.js

@@ -37,9 +37,9 @@ function createProxyServer(options) {
    *    changeOrigin: <true/false, Default: false - changes the origin of the host header to the target URL>
    *    preserveHeaderKeyCase: <true/false, Default: false - specify whether you want to keep letter case of response header key >
    *    auth   : Basic authentication i.e. 'user:password' to compute an Authorization header.
-   *    hostRewrite: rewrites the location hostname on (301/302/307/308) redirects, Default: null.
+   *    hostRewrite: rewrites the location hostname on (201/301/302/307/308) redirects, Default: null.
-   *    autoRewrite: rewrites the location host/port on (301/302/307/308) redirects based on requested host/port. Default: false.
+   *    autoRewrite: rewrites the location host/port on (201/301/302/307/308) redirects based on requested host/port. Default: false.
-   *    protocolRewrite: rewrites the location protocol on (301/302/307/308) redirects to 'http' or 'https'. Default: null.
+   *    protocolRewrite: rewrites the location protocol on (201/301/302/307/308) redirects to 'http' or 'https'. Default: null.
    *  }
    *
    *  NOTE: `options.ws` and `options.ssl` are optional.

lib/http-proxy/passes/web-incoming.js

@@ -82,7 +82,7 @@ module.exports = {
         values[header];
     });
 
-    req.headers['x-forwarded-host'] = req.headers['host'] || '';
+    req.headers['x-forwarded-host'] = req.headers['x-forwarded-host'] || req.headers['host'] || '';
   },
 
   /**
@@ -129,7 +129,9 @@ module.exports = {
 
     // Enable developers to modify the proxyReq before headers are sent
     proxyReq.on('socket', function(socket) {
-      if(server) { server.emit('proxyReq', proxyReq, req, res, options); }
+      if(server && !proxyReq.getHeader('expect')) {
+        server.emit('proxyReq', proxyReq, req, res, options);
+      }
     });
 
     // allow outgoing socket to timeout so that we could

package.json

@@ -1,9 +1,9 @@
 {
   "name": "http-proxy",
-  "version": "1.17.0",
+  "version": "1.18.1",
   "repository": {
     "type": "git",
-    "url": "https://github.com/nodejitsu/node-http-proxy.git"
+    "url": "https://github.com/http-party/node-http-proxy.git"
   },
   "description": "HTTP proxying for the masses",
   "author": "Charlie Robbins <charlie.robbins@gmail.com>",
@@ -12,28 +12,30 @@
   ],
   "main": "index.js",
   "dependencies": {
-    "eventemitter3": "^3.0.0",
+    "eventemitter3": "^4.0.0",
     "requires-port": "^1.0.0",
     "follow-redirects": "^1.0.0"
   },
   "devDependencies": {
-    "async": "^2.0.0",
+    "async": "^3.0.0",
-    "concat-stream": "^1.6.2",
+    "auto-changelog": "^1.15.0",
+    "concat-stream": "^2.0.0",
     "expect.js": "~0.3.1",
     "mocha": "^3.5.3",
-    "nyc": "^11.7.1",
+    "nyc": "^14.0.0",
     "semver": "^5.0.3",
     "socket.io": "^2.1.0",
     "socket.io-client": "^2.1.0",
-    "sse": "0.0.6",
+    "sse": "0.0.8",
-    "ws": "^0.8.0"
+    "ws": "^3.0.0"
   },
   "scripts": {
     "mocha": "mocha test/*-test.js",
-    "test": "nyc --reporter=text --reporter=lcov npm run mocha"
+    "test": "nyc --reporter=text --reporter=lcov npm run mocha",
+    "version": "auto-changelog -p && git add CHANGELOG.md"
   },
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=8.0.0"
   },
   "license": "MIT"
 }

renovate.json

@@ -0,0 +1,19 @@
+{
+  "platform": "github",
+  "autodiscover": false,
+  "requireConfig": true,
+  "ignoreNpmrcFile": true,
+  "rangeStrategy": "replace",
+  "packageRules": [
+    {
+      "packagePatterns": [
+        "*"
+      ],
+      "minor": {
+        "groupName": "all non-major dependencies",
+        "groupSlug": "all-minor-patch"
+      }
+    }
+  ],
+  "commitMessagePrefix": "[dist]"
+}

test/fixtures/agent2-cert.pem

@@ -1,13 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIB7DCCAZYCCQC7gs0MDNn6MTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJV
+MIIEIDCCAggCCQChRDh/XiBF+zANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJ1
-UzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYDVQQKEwZKb3llbnQxEDAO
+czETMBEGA1UECAwKV2FzaGluZ3RvbjEQMA4GA1UEBwwHU2VhdHRsZTEeMBwGA1UE
-BgNVBAsTB05vZGUuanMxDzANBgNVBAMTBmFnZW50MjEgMB4GCSqGSIb3DQEJARYR
+AwwVRHVtbXkgSW50ZXJtZWRpYXRlIENBMB4XDTE4MDYyMjIwMzEwNFoXDTMyMDIy
-cnlAdGlueWNsb3Vkcy5vcmcwHhcNMTEwMzE0MTgyOTEyWhcNMzgwNzI5MTgyOTEy
+OTIwMzEwNFowUDELMAkGA1UEBhMCdXMxEzARBgNVBAgMCldhc2hpbmd0b24xEDAO
-WjB9MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExCzAJBgNVBAcTAlNGMQ8wDQYD
+BgNVBAcMB1NlYXR0bGUxGjAYBgNVBAMMEWR1bW15LmV4YW1wbGUuY29tMIIBIjAN
-VQQKEwZKb3llbnQxEDAOBgNVBAsTB05vZGUuanMxDzANBgNVBAMTBmFnZW50MjEg
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvSQq3d8AeZMTvtqZ13jWCckikyXJ
-MB4GCSqGSIb3DQEJARYRcnlAdGlueWNsb3Vkcy5vcmcwXDANBgkqhkiG9w0BAQEF
+SACvkGCQUCJqOceESbg6IHdRzQdoccE4P3sbvNsf9BlbdJKM+neCxabqKaU1PPje
-AANLADBIAkEAyXb8FrRdKbhrKLgLSsn61i1C7w7fVVVd7OQsmV/7p9WB2lWFiDlC
+4P0tHT57t6yJrMuUh9NxEz3Bgh1srNHVS7saKvwHmcKm79jc+wxlioPmEQvQagjn
-WKGU9SiIz/A6wNZDUAuc2E+VwtpCT561AQIDAQABMA0GCSqGSIb3DQEBBQUAA0EA
+y7oTkyLt0sn4LGxBjrcv2JoHOC9f1pxX7l47MaiN0/ctRau7Nr3PFn+pkB4Yf6Z0
-C8HzpuNhFLCI3A5KkBS5zHAQax6TFUOhbpBCR0aTDbJ6F1liDTK1lmU/BjvPoj+9
+VyicVJbaUSz39Qo4HQWl1L2hiBP3CS1oKs2Yk0O1aOCMExWrhZQan+ZgHqL1rhgm
-1LHwrmh29rK8kBPEjmymCQ==
+kPpw2/zwwPt5Vf9CSakvHwg198EXuTTXtkzYduuIJAm8yp969iEIiG2xTwIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4ICAQBnMSIo+kujkeXPh+iErFBmNtu/7EA+i/QnFPbN
+lSLngclYYBJAGQI+DhirJI8ghDi6vmlHB2THewDaOJXEKvC1czE8064wioIcA9HJ
+l3QJ3YYOFRctYdSHBU4TWdJbPgkLWDzYP5smjOfw8nDdr4WO/5jh9qRFcFpTFmQf
+DyU3xgWLsQnNK3qXLdJjWG75pEhHR+7TGo+Ob/RUho/1RX/P89Ux7/oVbzdKqqFu
+SErXAsjEIEFzWOM2uDOt6hrxDF6q+8/zudwQNEo422poEcTT9tDEFxMQ391CzZRi
+nozBm4igRn1f5S3YZzLI6VEUns0s76BNy2CzvFWn40DziTqNBExAMfFFj76wiMsX
+6fTIdcvkaTBa0S9SZB0vN99qahBdcG17rt4RssMHVRH1Wn7NXMwe476L0yXZ6gO7
+Z4uNAPxgaI3BRP75EPfslLutCLZ+BC4Zzu6MY0Salbpfl0Go462EhsKCxvYhE2Dg
+T477pICLfETZfA499Fd1tOaIsoLCrILAia/+Yd76uf94MuXUIqykDng/4H7xCc47
+BZhNFJiPC6XHaXzN7NYSEUNX9VOwY8ncxKwtP6TXga96PdMUy/p98KIM8RZlDoxB
+Xy9dcZBFNn/zrqjW7R0CCWCUriDIFSmEP0wDZ91YYa6BVuJMb5uL/USkTLpjZS4/
+HNGvug==
 -----END CERTIFICATE-----

test/fixtures/agent2-csr.pem

@@ -1,10 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIIBXTCCAQcCAQAwfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQH
-EwJTRjEPMA0GA1UEChMGSm95ZW50MRAwDgYDVQQLEwdOb2RlLmpzMQ8wDQYDVQQD
-EwZhZ2VudDIxIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMFwwDQYJ
-KoZIhvcNAQEBBQADSwAwSAJBAMl2/Ba0XSm4ayi4C0rJ+tYtQu8O31VVXezkLJlf
-+6fVgdpVhYg5QlihlPUoiM/wOsDWQ1ALnNhPlcLaQk+etQECAwEAAaAlMCMGCSqG
-SIb3DQEJBzEWExRBIGNoYWxsZW5nZSBwYXNzd29yZDANBgkqhkiG9w0BAQUFAANB
-AJnll2pt5l0pzskQSpjjLVTlFDFmJr/AZ3UK8v0WxBjYjCe5Jx4YehkChpxIyDUm
-U3J9q9MDUf0+Y2+EGkssFfk=
------END CERTIFICATE REQUEST-----

test/fixtures/agent2-key.pem

@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAMl2/Ba0XSm4ayi4C0rJ+tYtQu8O31VVXezkLJlf+6fVgdpVhYg5
+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
-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
+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
-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
+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
-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
+2JoHOC9f1pxX7l47MaiN0/ctRau7Nr3PFn+pkB4Yf6Z0VyicVJbaUSz39Qo4HQWl
-WRtSB4T2W7ADtJI35ET61jKBty3CqJY3AiAIwju7dVW3A5WeD6Qc1SZGKZvp9yCb
+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
-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
+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
-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
+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
 -----END RSA PRIVATE KEY-----

test/fixtures/agent2.cnf

@@ -1,19 +0,0 @@
-[ req ]
-default_bits           = 1024
-days                   = 999
-distinguished_name     = req_distinguished_name
-attributes             = req_attributes
-prompt                 = no
-
-[ req_distinguished_name ]
-C                      = US
-ST                     = CA
-L                      = SF
-O                      = Joyent
-OU                     = Node.js
-CN                     = agent2
-emailAddress           = ry@tinyclouds.org
-
-[ req_attributes ]
-challengePassword              = A challenge password
-

test/lib-http-proxy-passes-web-incoming-test.js

@@ -126,6 +126,50 @@ describe('#createProxyServer.web() using own http server', function () {
     http.request('http://127.0.0.1:8081', function() {}).end();
   });
 
+  it('should skip proxyReq event when handling a request with header "expect: 100-continue" [https://www.npmjs.com/advisories/1486]', function (done) {
+    var proxy = httpProxy.createProxyServer({
+      target: 'http://127.0.0.1:8080',
+    });
+
+    proxy.on('proxyReq', function(proxyReq, req, res, options) {
+      proxyReq.setHeader('X-Special-Proxy-Header', 'foobar');
+    });
+
+    function requestHandler(req, res) {
+      proxy.web(req, res);
+    }
+
+    var proxyServer = http.createServer(requestHandler);
+
+    var source = http.createServer(function(req, res) {
+      source.close();
+      proxyServer.close();
+      expect(req.headers['x-special-proxy-header']).to.not.eql('foobar');
+      done();
+    });
+
+    proxyServer.listen('8081');
+    source.listen('8080');
+
+    const postData = ''.padStart(1025, 'x');
+
+    const postOptions = {
+      hostname: '127.0.0.1',
+      port: 8081,
+      path: '/',
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'Content-Length': Buffer.byteLength(postData),
+        'expect': '100-continue'
+      }
+    };
+
+    const req = http.request(postOptions, function() {});
+    req.write(postData);
+    req.end();
+  });
+
   it('should proxy the request and handle error via callback', function(done) {
     var proxy = httpProxy.createProxyServer({
       target: 'http://127.0.0.1:8080'

test/lib-http-proxy-test.js

@@ -562,8 +562,8 @@ describe('lib/http-proxy.js', function() {
         });
       });
 
-      destiny.on('connection', function (socket) {
+      destiny.on('connection', function (socket, upgradeReq) {
-        expect(socket.upgradeReq.headers['x-special-proxy-header']).to.eql('foobar');
+        expect(upgradeReq.headers['x-special-proxy-header']).to.eql('foobar');
 
         socket.on('message', function (msg) {
           expect(msg).to.be('hello there');

test/lib-https-proxy-test.js

@@ -168,7 +168,7 @@ describe('lib/http-proxy.js', function() {
         proxy.on('error', function (err, req, res) {
           expect(err).to.be.an(Error);
           if (semver.gt(process.versions.node, '0.12.0')) {
-            expect(err.toString()).to.be('Error: self signed certificate')
+            expect(err.toString()).to.be('Error: unable to verify the first certificate')
           } else {
             expect(err.toString()).to.be('Error: DEPTH_ZERO_SELF_SIGNED_CERT')
           }