From 1b6b6152868284ca1ca32ca110099b54a9326d37 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 10 Mar 2013 18:45:43 -0400
Subject: [PATCH 1/4] 6 workers

---
 Procfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Procfile b/Procfile
index b553b09..54dd622 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: gunicorn httpbin:app
\ No newline at end of file
+web: gunicorn httpbin:app -w 6
\ No newline at end of file

From 227901aa80df32f8934804a13df251e26e7a8587 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 10 Mar 2013 19:00:39 -0400
Subject: [PATCH 2/4] pypy

---
 runtime.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime.txt b/runtime.txt
index d56a3d0..deafac9 100644
--- a/runtime.txt
+++ b/runtime.txt
@@ -1 +1 @@
-python-2.7.3
\ No newline at end of file
+pypy-1.9
\ No newline at end of file

From d992e07e1383627137a2acf1a0f4b895f0cec7f2 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Tue, 23 Apr 2013 20:53:11 -0400
Subject: [PATCH 3/4] no runtime

---
 runtime.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 runtime.txt

diff --git a/runtime.txt b/runtime.txt
deleted file mode 100644
index deafac9..0000000
--- a/runtime.txt
+++ /dev/null
@@ -1 +0,0 @@
-pypy-1.9
\ No newline at end of file

From be6784520100ba516f9f6c1a61a01846393282ed Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Tue, 23 Apr 2013 22:23:40 -0400
Subject: [PATCH 4/4] ip address

---
 httpbin/core.py    | 2 +-
 httpbin/helpers.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/httpbin/core.py b/httpbin/core.py
index 410db2c..fc53e69 100644
--- a/httpbin/core.py
+++ b/httpbin/core.py
@@ -80,7 +80,7 @@ def view_deny_page():
 def view_origin():
     """Returns Origin IP."""
 
-    return jsonify(origin=request.remote_addr)
+    return jsonify(origin=request.headers.get('X-Forwarded-For', request.remote_addr))
 
 
 @app.route('/headers')
diff --git a/httpbin/helpers.py b/httpbin/helpers.py
index ea45924..6fc6281 100644
--- a/httpbin/helpers.py
+++ b/httpbin/helpers.py
@@ -143,7 +143,7 @@ def get_dict(*keys, **extras):
         args=request.args,
         form=form,
         data=json_safe(data),
-        origin=request.remote_addr,
+        origin=request.headers.get('X-Forwarded-For', request.remote_addr),
         headers=get_headers(),
         files=get_files(),
         json=_json