merge in master

2016-06-09 22:56:23 +01:00
parent 027c25f53f 391ab5e604
commit 88e441dba4
2 changed files with 3 additions and 2 deletions
--- a/lib/middleware.js
+++ b/lib/middleware.js
@ -18,7 +18,8 @@ exports.mime = mime
 function proxyRequest (route) {
  const httpProxy = require('http-proxy')
  const proxy = httpProxy.createProxyServer({
-    changeOrigin: true
+    changeOrigin: true,
+    secure: false
  })

  return function proxyMiddleware () {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "local-web-server",
-  "version": "1.2.4",
+  "version": "1.2.6",
  "description": "A simple web-server for productive front-end development",
  "bin": {
    "ws": "./bin/cli.js"