Skip to content
Snippets Groups Projects
  1. Jan 16, 2013
  2. Jan 15, 2013
  3. Jan 14, 2013
  4. Jan 13, 2013
  5. Jan 12, 2013
    • Automerge script's avatar
      Merged revisions 378935 via svnmerge from · f7f7850f
      Automerge script authored
      file:///srv/subversion/repos/asterisk/trunk
      
      ................
        r378935 | dlee | 2013-01-12 00:43:37 -0600 (Sat, 12 Jan 2013) | 41 lines
        
        Fix XML encoding of 'identity display' in NOTIFY messages.
        
        XML encoding in chan_sip is accomplished by naively building the XML
        directly from strings. While this usually works, it fails to take into
        account escaping the reserved characters in XML.
        
        This patch adds an 'ast_xml_escape' function, which works similarly to
        'ast_uri_encode'. This is used to properly escape the local_display
        attribute in XML formatted NOTIFY messages.
        
        Several things to note:
         * The Right Thing(TM) to do would probably be to replace the
           ast_build_string stuff with building an ast_xml_doc. That's a much
           bigger change, and out of scope for the original ticket, so I
           refrained myself.
         * It is with great sadness that I wrote my own ast_xml_escape
           function. There's one in libxml2, but it's knee-deep in
           libxml2-ness, and not easily used to one-off escape a
           string.
         * I only escaped the string we know is causing problems
           (local_display). At least some of the other strings are
           URI-encoded, which should be XML safe. Rather than figuring out
           what's safe and escaping what's not, it would be much cleaner to
           simply build an ast_xml_doc for the messages and let the XML
           library do the XML escaping. Like I said, that's out of scope.
        
        (closes issue ABE-2902)
        Reported by: Guenther Kelleter
        Tested by: Guenther Kelleter
        Review: http://reviewboard.digium.internal/r/365/
        
        ........
        
        Merged revision 378919 from https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier
        ........
        
        Merged revisions 378933 from http://svn.asterisk.org/svn/asterisk/branches/1.8
        ........
        
        Merged revisions 378934 from http://svn.asterisk.org/svn/asterisk/branches/11
      ................
      
      
      git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
      f7f7850f
  6. Jan 11, 2013
    • Automerge script's avatar
      Merged revisions 378915,378918 via svnmerge from · 2c1720b4
      Automerge script authored
      file:///srv/subversion/repos/asterisk/trunk
      
      ................
        r378915 | dlee | 2013-01-11 16:31:42 -0600 (Fri, 11 Jan 2013) | 21 lines
        
        Add JSON API for Asterisk.
        
        This provides a JSON API by pulling in and wrapping the Jansson JSON
        library[1]. The Asterisk API basically mirrors the Jansson
        functionality, with a few minor tweaks.
        
         * Some names have been asteriskified to protect the innocent.
         * Jansson provides both reference-stealing and reference-borrowing
           versions of several API's. The Asterisk API is exclusively
           reference-stealing for operations that put elements into arrays and
           objects.
         * No support for doubles, since we usually don't need that.
         * Coming along for the ride is the ast_test_validate macro, which made
           the unit tests much easier to write.
        
         [1]: http://www.digip.org/jansson/
        
        (issue ASTERISK-20887)
        (closes issue ASTERISK-20888)
        Review: https://reviewboard.asterisk.org/r/2264/
      ................
        r378918 | file | 2013-01-11 17:05:38 -0600 (Fri, 11 Jan 2013) | 11 lines
        
        Retain XMPP filters across reconnections so external modules continue to function as expected.
        
        Previously if an XMPP client reconnected any filters added by an external module were lost.
        This issue exhibited itself with chan_motif not receiving and reacting to Jingle signaling.
        
        (closes issue ASTERISK-20916)
        Reported by: kuj
        ........
        
        Merged revisions 378917 from http://svn.asterisk.org/svn/asterisk/branches/11
      ................
      
      
      git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
      2c1720b4
  7. Jan 10, 2013
  8. Jan 09, 2013
  9. Jan 07, 2013
  10. Jan 06, 2013
  11. Jan 04, 2013
  12. Jan 03, 2013
  13. Jan 02, 2013
    • Automerge script's avatar
      Merged revisions 378374,378377,378384 via svnmerge from · b375abae
      Automerge script authored
      file:///srv/subversion/repos/asterisk/trunk
      
      ................
        r378374 | rmudgett | 2013-01-02 15:23:16 -0600 (Wed, 02 Jan 2013) | 33 lines
        
        Fix AMI redirect action with two channels failing to redirect both channels.
        
        The AMI redirect action can fail to redirect two channels that are bridged
        together.  There is a race between the AMI thread redirecting the two
        channels and the bridge thread noticing that a channel is hungup from the
        redirects.
        
        * Made the bridge wait for both channels to be redirected before exiting.
        
        * Made the AMI redirect check that all required headers are present before
        proceeding with the redirection.
        
        * Made the AMI redirect require that any supplied ExtraChannel exist
        before proceeding.  Previously the code fell back to a single channel
        redirect operation.
        
        (closes issue ASTERISK-18975)
        Reported by: Ben Klang
        
        (closes issue ASTERISK-19948)
        Reported by: Brent Dalgleish
        Patches:
              jira_asterisk_19948_v11.patch (license #5621) patch uploaded by rmudgett
        Tested by: rmudgett, Thomas Sevestre, Deepak Lohani, Kayode
        
        Review: https://reviewboard.asterisk.org/r/2243/
        ........
        
        Merged revisions 378356 from http://svn.asterisk.org/svn/asterisk/branches/1.8
        ........
        
        Merged revisions 378358 from http://svn.asterisk.org/svn/asterisk/branches/11
      ................
        r378377 | mjordan | 2013-01-02 16:10:32 -0600 (Wed, 02 Jan 2013) | 24 lines
        
        Prevent crashes from occurring when reading from data sources with large values
        
        When reading configuration data from an Asterisk .conf file or when pulling
        data from an Asterisk RealTime backend, Asterisk was copying the data on the
        stack for manipulation. Unfortunately, it is possible to read configuration
        data or realtime data from some data source that provides a large blob of
        characters. This could potentially cause a crash via a stack overflow.
        
        This patch prevents large sets of data from being read from an ARA backend or
        from an Asterisk conf file.
        
        (issue ASTERISK-20658)
        Reported by: wdoekes
        Tested by: wdoekes, mmichelson
        patches:
         * issueA20658_dont_process_overlong_config_lines.patch uploaded by wdoekes (license 5674)
         * issueA20658_func_realtime_limit.patch uploaded by wdoekes (license 5674)
        ........
        
        Merged revisions 378375 from http://svn.asterisk.org/svn/asterisk/branches/1.8
        ........
        
        Merged revisions 378376 from http://svn.asterisk.org/svn/asterisk/branches/11
      ................
        r378384 | mjordan | 2013-01-02 16:19:32 -0600 (Wed, 02 Jan 2013) | 11 lines
        
        Clean up app_mysql's application entry points to properly parse arguments
        
        When parsing arguments, application entry points should not attempt to
        directly modify the parameters to the function. This patch properly duplicates
        the passed in parameters before attempting to parse them.
        
        (issue ASTERISK-20658)
        Reported by: wdoekes
        patches:
          issueA20658_sanitize_app_mysql.patch uploaded by wdoekes (license 5674)
      ................
      
      
      git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378385 65c4cc65-6c06-0410-ace0-fbb531ad65f3
      b375abae
Loading