[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Please unblock ejabberd 2.1.5-3



ejabberd 2.1.5-3 contains a backport for the upstream fix
for the bug reported in Debian as [1] (and upstream as [2]).

This bug completely prevents the usage of one of the available
communication methods for the server, http-poll, which is typically used
to connect through restrictive proxy servers not allowing the HTTP
CONNECT method to be used, hence I consider it important enough
to ask for unblocking.

The bug was reported by a user of the 2.1.5-2 backported
to Lenny, but this means the bug also affects Squeeze.

The fix is rather minimal, touches exactly one module (debdiff
attached).

1. http://bugs.debian.org/601094
2. https://support.process-one.net/browse/EJAB-1325

diff -u ejabberd-2.1.5/debian/changelog ejabberd-2.1.5/debian/changelog
--- ejabberd-2.1.5/debian/changelog
+++ ejabberd-2.1.5/debian/changelog
@@ -1,15 +1,23 @@
+ejabberd (2.1.5-3) unstable; urgency=low
+
+  [ Konstantin Khomoutov ]
+  * Add patch http-poll-binary-parse.patch fixing EJAB-1325 (closes: #601094).
+
+ -- Konstantin Khomoutov <flatworm@users.sourceforge.net>  Sat, 23 Oct 2010 17:05:48 +0400
+
 ejabberd (2.1.5-2) unstable; urgency=low
 
   [ Gerfried Fuchs ]
   * New debconf translation:
     - Danish by Joe Hansen (closes: #592271)
+  * Run debconf-updatepo on all other translations.
 
   [ Konstantin Khomoutov ]
   * Remove /var/run/ejabberd on package purge (LP: #615473).
   * Add mod-vcard-ldap-photo.patch fixing EJAB-1258 (LP: #613854).
   * Bump standards version to 3.9.1.
 
- -- Gerfried Fuchs <rhonda@debian.at>  Fri, 13 Aug 2010 23:45:09 +0200
+ -- Gerfried Fuchs <rhonda@debian.at>  Wed, 15 Sep 2010 21:03:06 +0200
 
 ejabberd (2.1.5-1) unstable; urgency=low
 
diff -u ejabberd-2.1.5/debian/patches/series ejabberd-2.1.5/debian/patches/series
--- ejabberd-2.1.5/debian/patches/series
+++ ejabberd-2.1.5/debian/patches/series
@@ -8,0 +9 @@
+http-poll-binary-parse.patch
only in patch2:
unchanged:
--- ejabberd-2.1.5.orig/debian/patches/http-poll-binary-parse.patch
+++ ejabberd-2.1.5/debian/patches/http-poll-binary-parse.patch
@@ -0,0 +1,23 @@
+From: Badlop <badlop@process-one.net>
+Subject: Fix parsing of binary values in http-poll module (EJAB-1325)
+Origin: upstream, https://git.process-one.net/ejabberd/mainline/commit/d87fff1a4c500d9abe3945cbfea792b4eddfa3f2
+Bug: https://support.process-one.net/browse/EJAB-1325
+Bug-Debian: http://bugs.debian.org/601094
+
+--- a/src/web/ejabberd_http_poll.erl
++++ b/src/web/ejabberd_http_poll.erl
+@@ -272,7 +272,13 @@ handle_event(_Event, StateName, StateData) ->
+ %%          {stop, Reason, Reply, NewStateData}                    
+ %%----------------------------------------------------------------------
+ handle_sync_event({send, Packet}, _From, StateName, StateData) ->
+-    Output = StateData#state.output ++ [lists:flatten(Packet)],
++    Packet2 = if
++		  is_binary(Packet) ->
++		      binary_to_list(Packet);
++		  true ->
++		      Packet
++	      end,
++    Output = StateData#state.output ++ [lists:flatten(Packet2)],
+     Reply = ok,
+     {reply, Reply, StateName, StateData#state{output = Output}};
+ 

Reply to: