Merge pull request #58 from mnunberg/master

Some fixes
This commit is contained in:
Kenneth Reitz
2012-08-12 21:03:32 -07:00
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -11,6 +11,7 @@ import base64
import json
import os
import time
import gevent
import newrelic.agent
@@ -307,7 +308,7 @@ def delay_response(delay):
"""Returns a delayed response"""
delay = min(delay, 10)
time.sleep(delay)
gevent.sleep(delay)
return jsonify(get_dict(
'url', 'args', 'form', 'data', 'origin', 'headers', 'files'))
+2 -2
View File
@@ -11,7 +11,7 @@ gunicorn.
import sys
from gevent.wsgi import WSGIServer
from gevent.pywsgi import WSGIServer
from httpbin import app
@@ -26,4 +26,4 @@ def main():
http_server.serve_forever()
if __name__ == '__main__':
main()
main()