← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/jlib.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/jlib.erl
382
382
                         "result" -> {result, reply};
383
383
                         "error" -> {error, reply};
384
384
                         _ -> {invalid, invalid}
385
 
            end,
 
385
                     end,
386
386
    if
387
387
        Type1 == invalid ->
388
388
            invalid;
404
404
                                              <- FilteredEls, 
405
405
                                          SubName /= "error"],
406
406
                        {case NonErrorEls of
407
 
                             [NonErrorEl] -> xml:get_tag_attr_s("xmlns", NonErrorEl);
408
 
                             _ -> invalid
 
407
                             [NonErrorEl] ->
 
408
                                 xml:get_tag_attr_s("xmlns", NonErrorEl);
 
409
                             _ ->
 
410
                                 ""
409
411
                         end,
410
412
                         FilteredEls};
411
413
                    _ ->
412
 
                        {invalid, invalid}
 
414
                        {"", []}
413
415
                end,
414
416
            if XMLNS == "", Class == request ->
415
417
                    invalid;
416
418
               true ->
417
 
                            #iq{id = ID,
418
 
                                type = Type1,
419
 
                                xmlns = XMLNS,
420
 
                                lang = Lang,
 
419
                    #iq{id = ID,
 
420
                        type = Type1,
 
421
                        xmlns = XMLNS,
 
422
                        lang = Lang,
421
423
                        sub_el = SubEl}
422
 
                    end;
 
424
            end;
423
425
        Class == reply, Filter /= any ->
424
426
            reply
425
427
    end;