[2/3] chttpd commit: updated refs/heads/windsor-merge to fe2a94e

[da...@apache.org]

Be more restrictive when including a JSON stack


Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/99b4bc71
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/99b4bc71
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/99b4bc71

Branch: refs/heads/windsor-merge
Commit: 99b4bc71c6dc6e1f99aa4705e4eb9bc657b8b68a
Parents: 4dc2fce
Author: Paul J. Davis <pa...@gmail.com>
Authored: Sat Aug 16 21:24:51 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sat Aug 16 21:24:51 2014 -0500

----------------------------------------------------------------------
 src/chttpd.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/99b4bc71/src/chttpd.erl
----------------------------------------------------------------------
diff --git a/src/chttpd.erl b/src/chttpd.erl
index c4a4fd0..c9b50ec 100644
--- a/src/chttpd.erl
+++ b/src/chttpd.erl
@@ -878,7 +878,7 @@ reqid() ->
 
 json_stack({bad_request, _, _}) ->
     [];
-json_stack({_Error, _Reason, Stack}) ->
+json_stack({_Error, _Reason, Stack}) when is_list(Stack) ->
     lists:map(fun json_stack_item/1, Stack);
 json_stack(_) ->
     [].