Merged revisions 378410,378412,378414 via svnmerge from

Merged revisions 378410,378412,378414 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r378410 | mjordan | 2013-01-03 09:37:31 -0600 (Thu, 03 Jan 2013) | 13 lines

  Prevent crashes in res_xmpp when receiving large messages

  Similar to r378287, res_xmpp was marshaling data read from an external source
  onto the stack. For a sufficiently large message, this could cause a stack
  overflow. This patch modifies res_xmpp in a similar fashion to res_jabber by
  removing the stack allocation, as it was unnecessary.

  (issue ASTERISK-20658)
  Reported by: wdoekes
  ........

  Merged revisions 378409 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r378412 | file | 2013-01-03 09:40:21 -0600 (Thu, 03 Jan 2013) | 11 lines

  Prevent exhaustion of system resources through exploitation of event cache

  This patch changes res_xmpp to no longer cache events under certain circumstances.

  (issue ASTERISK-20175)
  Reported by: Russell Bryant, Leif Madsen, Joshua Colp
  Tested by: kmoore
  ........

  Merged revisions 378411 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r378414 | tilghman | 2013-01-03 10:04:11 -0600 (Thu, 03 Jan 2013) | 11 lines

  Add aliases to the Directory.

  This is an interesting feature that allows additional strings to be used to
  search the Directory, primarily intended to be used with nicknames, but could
  be used with affiliations and the like.  Because the name field is used in
  more than one place (such as email notifications), it is important that these
  additional strings not be placed in the name field, but be specified
  separately.

  Review: https://reviewboard.asterisk.org/r/2244/
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378422 65c4cc65-6c06-0410-ace0-fbb531ad65f3