Support all-with-x in x-match binding arg for headers exchange

Similar to any-with-x.

For example, this allows routing messages to different target queues
based on their x-first-death-reason AND x-first-death-queue
header.

Author: ansd

deps/rabbit/src/rabbit_exchange_type_headers.erl

@@ -45,11 +45,12 @@ validate_binding(_X, #binding{args = Args}) ->
     case rabbit_misc:table_lookup(Args, <<"x-match">>) of
         {longstr, <<"all">>} -> ok;
         {longstr, <<"any">>} -> ok;
+        {longstr, <<"all-with-x">>} -> ok;
         {longstr, <<"any-with-x">>} -> ok;
         {longstr, Other}     -> {error,
                                  {binding_invalid,
                                   "Invalid x-match field value ~p; "
-                                  "expected all, any, or any-with-x", [Other]}};
+                                  "expected all, any, all-with-x, or any-with-x", [Other]}};
         {Type,    Other}     -> {error,
                                  {binding_invalid,
                                   "Invalid x-match field type ~p (value ~p); "
@@ -61,6 +62,7 @@ validate_binding(_X, #binding{args = Args}) ->
 
 parse_x_match({longstr, <<"all">>}) -> all;
 parse_x_match({longstr, <<"any">>}) -> any;
+parse_x_match({longstr, <<"all-with-x">>}) -> all_with_x;
 parse_x_match({longstr, <<"any-with-x">>}) -> any_with_x;
 parse_x_match(_) -> all. %% legacy; we didn't validate
 
@@ -84,18 +86,25 @@ headers_match(Args, Data) ->
 
 % A bit less horrendous algorithm :)
 headers_match(_, _, false, _, all) -> false;
+headers_match(_, _, false, _, all_with_x) -> false;
 headers_match(_, _, _, true, any) -> true;
 headers_match(_, _, _, true, any_with_x) -> true;
 
 % No more bindings, return current state
 headers_match([], _Data, AllMatch, _AnyMatch, all) -> AllMatch;
+headers_match([], _Data, AllMatch, _AnyMatch, all_with_x) -> AllMatch;
 headers_match([], _Data, _AllMatch, AnyMatch, any) -> AnyMatch;
 headers_match([], _Data, _AllMatch, AnyMatch, any_with_x) -> AnyMatch;
 
-% Delete bindings starting with x-
+%% Always delete binding x-match
+headers_match([{<<"x-match">>, _PT, _PV} | PRest], Data,
+              AllMatch, AnyMatch, MatchKind) ->
+    headers_match(PRest, Data, AllMatch, AnyMatch, MatchKind);
+% Delete all other bindings starting with x-
+% unless x-match is set to all-with-x or any-with-x
 headers_match([{<<"x-", _/binary>>, _PT, _PV} | PRest], Data,
               AllMatch, AnyMatch, MatchKind)
-  when MatchKind =/= any_with_x ->
+  when MatchKind =/= all_with_x, MatchKind =/= any_with_x ->
     headers_match(PRest, Data, AllMatch, AnyMatch, MatchKind);
 
 % No more data, but still bindings, false with all