Merge remote-tracking branch 'upstream/master' into options

4 files changed, 29 insertions, 3 deletions

diff --git a/.travis.yml b/.travis.yml
index 4c85c46d..3542a592 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,9 @@ git:
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - language: node_js
+      node_js: "node"
   include:
     - python: 3.5
       env: TOXENV=lint
@@ -47,6 +50,15 @@ matrix:
       env: TOXENV=individual_coverage
     - python: 3.5
       env: TOXENV=docs
+    - language: node_js
+      node_js: "node"
+      before_install: npm install -g yarn
+      install: cd web && yarn
+      script: npm test
+      cache:
+          yarn: true
+          directories:
+              - web/node_modules
 
 install:
   - |
diff --git a/docs/install.rst b/docs/install.rst
index cf93cc58..b37d9c91 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -110,6 +110,20 @@ libraries. This was tested on a fully patched installation of Fedora 24.
 Make sure to have an up-to-date version of pip by running ``pip3 install -U pip``.
 
 
+.. _install-source-opensuse:
+
+Installation from Source on openSUSE
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This was tested on a fully patched installation of openSUSE Tumbleweed.
+Please note that openSUSE Leap 42.2 only comes with Python 3.4.x, whereas mitmproxy requires Python 3.5 or above.
+You can check you Python version by running ``python3 --version``.
+
+.. code:: bash
+
+   sudo zypper install python3-pip python3-devel libffi-devel openssl-devel gcc-c++
+   sudo pip3 install mitmproxy
+   
 
 .. _install-source-windows:
 
diff --git a/docs/pathod/language.rst b/docs/pathod/language.rst
index 672e21b6..fe4ef6ca 100644
--- a/docs/pathod/language.rst
+++ b/docs/pathod/language.rst
@@ -23,7 +23,7 @@ HTTP Request
         mode if the server responds correctly. Apart from that, websocket
         requests are just like any other, and all aspects of the request
         can be over-ridden.
-    * - h\:\ :ref:`VALUE`\ =\ :ref:`VALUE`\
+    * - h\ :ref:`VALUE`\ =\ :ref:`VALUE`\
       - Set a header.
     * - r
       - Set the **raw** flag on this response. Pathod will not calculate a
@@ -73,7 +73,7 @@ HTTP Response
     * - m\ :ref:`VALUE`
       - HTTP Reason message. Automatically chosen according to the response
         code if not specified. (HTTP/1 only)
-    * - h\:\ :ref:`VALUE`\ =\ :ref:`VALUE`\
+    * - h\ :ref:`VALUE`\ =\ :ref:`VALUE`\
       - Set a header.
     * - r
       - Set the **raw** flag on this response. Pathod will not calculate a
diff --git a/examples/complex/har_dump.py b/examples/complex/har_dump.py
index 51983b54..86a33684 100644
--- a/examples/complex/har_dump.py
+++ b/examples/complex/har_dump.py
@@ -147,7 +147,7 @@ def response(flow):
         }
 
     if flow.server_conn.connected():
-        entry["serverIPAddress"] = str(flow.server_conn.ip_address.address[0])
+        entry["serverIPAddress"] = str(flow.server_conn.ip_address[0])
 
     HAR["log"]["entries"].append(entry)