Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket

Conflicts:
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx
	web/src/js/connection.js

1 files changed, 15 insertions, 3 deletions

diff --git a/web/src/js/utils.js b/web/src/js/utils.js
index 2e5c3005..2e25016e 100644
--- a/web/src/js/utils.js
+++ b/web/src/js/utils.js
@@ -109,7 +109,19 @@ export function fetchApi(url, options) {
         url += "&" + xsrf;
     }
     return fetch(url, {
-        ...options,
-        credentials: 'same-origin'
+        credentials: 'same-origin',
+        ...options
     });
-}
\ No newline at end of file
+}
+
+fetchApi.put = (url, json, options) => fetchApi(
+    url,
+    {
+        method: "PUT",
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(json),
+        ...options
+    }
+)