You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Automerge script f7f7850f7a Merged revisions 378935 via svnmerge from ... 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		13 years ago
..
h323	…
misdn	Merged revisions 376953 via svnmerge from	13 years ago
sip	Merged revisions 378288 via svnmerge from	13 years ago
Makefile	Doxygen Updates - Title update	13 years ago
chan_agent.c	Merged revisions 378488 via svnmerge from	13 years ago
chan_alsa.c	Doxygen Updates - Title update	13 years ago
chan_bridge.c	Finalize ast_channel opaquification	14 years ago
chan_console.c	Doxygen Updates - Title update	13 years ago
chan_dahdi.c	Merged revisions 378322 via svnmerge from	13 years ago
chan_gtalk.c	Doxygen Updates - Title update	13 years ago
chan_h323.c	Doxygen Updates - Title update	13 years ago
chan_iax2.c	Merged revisions 378322 via svnmerge from	13 years ago
chan_jingle.c	Doxygen Updates - Title update	13 years ago
chan_local.c	Merged revisions 378322 via svnmerge from	13 years ago
chan_mgcp.c	Make evaluation of channel variables consistently case-sensitive.	13 years ago
chan_misdn.c	Things don't need to be that const.	13 years ago
chan_motif.c	Merged revisions 377463 via svnmerge from	13 years ago
chan_multicast_rtp.c	Opaquification for ast_format structs in struct ast_channel	14 years ago
chan_nbs.c	Opaquification for ast_format structs in struct ast_channel	14 years ago
chan_oss.c	Doxygen Updates - Title update	13 years ago
chan_phone.c	Doxygen Updates - Title update	13 years ago
chan_phone.h	…
chan_sip.c	Merged revisions 378935 via svnmerge from	13 years ago
chan_skinny.c	Merged revisions 378634 via svnmerge from	13 years ago
chan_unistim.c	Merged revisions 377594-377595 via svnmerge from	13 years ago
chan_vpb.cc	Doxygen Updates - Title update	13 years ago
console_board.c	Multiple revisions 369001-369002	14 years ago
console_gui.c	Multiple revisions 369001-369002	14 years ago
console_video.c	Multiple revisions 369001-369002	14 years ago
console_video.h	…
iax2-parser.c	Multiple revisions 369001-369002	14 years ago
iax2-parser.h	Doxygen Updates - Title update	13 years ago
iax2-provision.c	iax2-provision: Fix improper return on failed cache retrieval	14 years ago
iax2-provision.h	…
iax2.h	Doxygen Updates - Title update	13 years ago
misdn_config.c	Add named callgroups/pickupgroups	14 years ago
sig_analog.c	Multiple revisions 375993-375994	13 years ago
sig_analog.h	Convert sig_analog to use a global callback table.	14 years ago
sig_pri.c	Multiple revisions 375993-375994	13 years ago
sig_pri.h	Clean up doxygen warnings	14 years ago
sig_ss7.c	Merged revisions 376061 via svnmerge from	13 years ago
sig_ss7.h	Convert sig_ss7 to use a global callback table.	14 years ago
vcodecs.c	Multiple revisions 369001-369002	14 years ago
vgrabbers.c	Multiple revisions 369001-369002	14 years ago