Merge branch 'master' into refactor_read_http_body

.travis.yml

@@ -0,0 +1,14 @@
+language: python
+python:
+  - "2.7"
+# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+install: 
+  - "pip install coveralls --use-mirrors"
+  - "pip install nose-cov --use-mirrors"
+  - "pip install -r requirements.txt --use-mirrors"
+  - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git"
+# command to run tests, e.g. python setup.py test
+script: 
+  - "nosetests --with-cov --cov-report term-missing"
+after_success: 
+  - coveralls

CHANGELOG

@@ -1,3 +1,8 @@
+25 August 2013: pathod 0.9.2:
+
+    * Adapt to interface changes in netlib
+    
+
 15 May 2013: pathod 0.9 (version synced with mitmproxy):
 
     * Pathod proxy mode. You can now configure clients to use pathod as an

libpathod/templates/index.html

@@ -56,7 +56,7 @@
             <h2>source</h2>
 
             <ul>
-                <li>Current release: <a href="http://mitmproxy.org/download/pathod-0.9.1.tar.gz">pathod 0.9.1</a></li>
+                <li>Current release: <a href="http://mitmproxy.org/download/pathod-0.9.2.tar.gz">pathod 0.9.2</a></li>
 
                 <li>GitHub: <a href="http://github.com/mitmproxy/pathod">github.com/cortesi/pathod</a></li>
             </li>

libpathod/version.py

@@ -1,4 +1,4 @@
-IVERSION = (0, 9, 1)
+IVERSION = (0, 9, 2)
 VERSION = ".".join(str(i) for i in IVERSION)
 NAME = "pathod"
 NAMEVERSION = NAME + " " + VERSION

requirements.txt

@@ -0,0 +1,10 @@
+Flask>=0.10.1
+Jinja2>=2.7.1
+MarkupSafe>=0.18
+Werkzeug>=0.9.4
+itsdangerous>=0.23
+nose>=1.3.0
+pyOpenSSL>=0.13.1
+pyasn1>=0.1.7
+requests>=2.1.0
+netlib>=0.9.2