resolved conflicts

1 files changed, 0 insertions, 27 deletions

diff --git a/remote_host_test.py b/remote_host_test.py
deleted file mode 100644
index d535db7..0000000
--- a/remote_host_test.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from flask import request
-from flask import jsonify
-from flask import Flask
-import re
-app = Flask(__name__)
-
-@app.route("/")
-def hello():
-    return "Hello World!"
-
-@app.route("/testme", methods=["GET"])
-def get_my_ip():
-    host = request.headers.getlist("X-Forwarded-For")[0]
-    regex = re.compile(r'[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+')
-    forwarded_ip = regex.search(host).group()
-    return jsonify(
-      {
-        'ip1': request.remote_addr,
-        'ip2': request.environ['REMOTE_ADDR'],
-        'ip3': request.environ.get('HTTP_HOST', "nothing yet"),
-        'ip4': forwarded_ip,
-        'ip5': request.environ.get('HTTP_X_REAL_IP', request.remote_addr)
-      }
-    ), 200
-if __name__ == "__main__":
-    app.run(port=9994)
-