← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ejabberd/trusty-proposed

« back to all changes in this revision

Viewing changes to src/xml.erl

  • Committer: Bazaar Package Importer
  • Author(s): Konstantin Khomoutov, Konstantin Khomoutov, Gerfried Fuchs
  • Date: 2010-04-06 13:00:03 UTC
  • mfrom: (1.1.14 upstream) (13.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100406130003-ub626hx26kgazp79
Tags: 2.1.3-1
http://bugs.debian.org/578722
[ Konstantin Khomoutov ]
* New upstream release.
* Remove obsolete c2s-p1-fsm.patch
* Remove obsolete ejabberdctl-help-dashes.patch
* Update mod_admin_extra to revision 1078
* Refresh shared_roster_recent.patch
* Refresh shared_roster_online.patch
* Clarify how to do mixed IPv4/IPv6 setup of ejabberd listeners
  as suggested by Marc Dequènes in the discussion of #573801.

[ Gerfried Fuchs ]
* Remove Torsten Werner from maintainer field on his own wish - thanks for
  your work so far! (closes: #578722)
* Promote Konstantin to Maintainer to best fit reality. Enjoy. :)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xml.erl
99
99
        cdata ->
100
100
            CDATA1 = <<"<![CDATA[">>,
101
101
            CDATA2 = <<"]]>">>,
102
 
            concat_binary([CDATA1, CData, CDATA2]);
 
102
            list_to_binary([CDATA1, CData, CDATA2]);
103
103
        none ->
104
104
            CData;
105
105
        {cdata, EndTokens} ->
106
106
            EscapedCData = escape_cdata(CData, EndTokens),
107
 
            concat_binary(EscapedCData)
 
107
            list_to_binary(EscapedCData)
108
108
    end.
109
109
 
110
110
%% Returns escape type needed for the text node