Kolab Groupware OBS

Difference Between Revision 37 and Kolab:16 / guam

use_iolist_to_binary.patch Added

@@ -0,0 +1,26 @@
+Instead of converting the values from zlib:deflate to binary by hand we can use 
+the iolist_to_binary() function from erlang; this allows us to convert
+also nested iolists.
+diff -rupN guam-0.9.5.ori/apps/kolab_guam/src/kolab_guam_session.erl guam-0.9.5/apps/kolab_guam/src/kolab_guam_session.erl
+--- guam-0.9.5.ori/apps/kolab_guam/src/kolab_guam_session.erl	2019-11-18 11:03:06.000000000 +0100
++++ guam-0.9.5/apps/kolab_guam/src/kolab_guam_session.erl	2020-03-21 23:22:32.236604867 +0100
+@@ -238,17 +238,14 @@ process_client_data(Socket, Data, #state
+ preprocess_client_data(undefined, Data, #state{ buffered_client_data = Buffered }) ->
+     <<Buffered/binary, Data/binary>>;
+ preprocess_client_data(Z, Data, #state{ buffered_client_data = Buffered }) ->
+-    Inflated = joined(zlib:inflate(Z, Data), <<>>),
++    Inflated = iolist_to_binary(zlib:inflate(Z, Data)),
+     <<Buffered/binary, Inflated/binary>>.
+ 
+ postprocess_server_data(undefined, Data) ->
+     %% we aren't compressing so there is nothing to do
+     Data;
+ postprocess_server_data(Z, Data) ->
+-    joined(zlib:deflate(Z, Data, sync), <<>>).
+-
+-joined([], Binary) -> Binary;
+-joined([H|Rest], Binary) -> joined(Rest, <<Binary/binary, H/binary>>).
++    iolist_to_binary(zlib:deflate(Z, Data, sync)).
+ 
+ init_rules(RuleConfig) -> init_rule(RuleConfig, []).
+ init_rule([], Acc) -> Acc;