diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-07-19 12:17:43 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-07-19 12:17:43 -0300 |
| commit | e5b50a129f6cb276fd20d9969cb7d300265f40e1 (patch) | |
| tree | c6ab9a42b8363317251e4258fa371ed3d4dcdc4b /src/leap/util | |
| parent | 7ec29145b064afab312cb57e74dc33c38da1e3ea (diff) | |
| parent | 0e92595da3844516d9a67bbbbd88c2957f0a29bc (diff) | |
Merge remote-tracking branch 'chiiph/bug/signal_emit_segfault' into develop
Diffstat (limited to 'src/leap/util')
| -rw-r--r-- | src/leap/util/request_helpers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/util/request_helpers.py b/src/leap/util/request_helpers.py index 350abfbd..74aaa06b 100644 --- a/src/leap/util/request_helpers.py +++ b/src/leap/util/request_helpers.py @@ -41,7 +41,7 @@ def get_content(request): contents = "" mtime = None - if request.content and request.json: + if request and request.content and request.json: if callable(request.json): contents = json.dumps(request.json()) else: |