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 adc08df2d1 Merged revisions 370772 via svnmerge from ... file:///srv/subversion/repos/asterisk/branches/10 ................ r370772 | mmichelson | 2012-08-03 16:50:29 -0500 (Fri, 03 Aug 2012) | 41 lines Multiple revisions 370769-370771 ........ r370769 | mmichelson | 2012-08-03 16:35:00 -0500 (Fri, 03 Aug 2012) | 24 lines Fix error in the "IPorHost" section of a SIP dialstring. This is based on the review request posted by Walter Doekes (referenced lower in the commit message) The main fix here is to treat the IPorHost portion of the dial string as a temporary outbound proxy. This ensures requests get sent to the proper location. Due to the age of the request, some parts were no longer relevant. For instance, the request moved outbound proxy parsing code into a single method. This is done in a previous commit, so it was not necessary to do again. Also, the review request fixed some errors with regards to request routing for CANCEL and ACK requests. This has also been fixed in more recent commits. (closes issue ASTERISK-19677) reported by Walter Doekes Review https://reviewboard.asterisk.org/r/1859 ........ r370770 | mmichelson | 2012-08-03 16:39:35 -0500 (Fri, 03 Aug 2012) | 3 lines Remove unused variable. ........ r370771 | mmichelson | 2012-08-03 16:43:52 -0500 (Fri, 03 Aug 2012) | 5 lines Seriously? Another compilation error fixed. Somebody beat me. ........ Merged revisions 370769-370771 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@370793 65c4cc65-6c06-0410-ace0-fbb531ad65f3		14 years ago
..
include	Merged revisions 370772 via svnmerge from	14 years ago
config_parser.c	Merged revisions 370772 via svnmerge from	14 years ago
dialplan_functions.c	Merged revisions 369005 via svnmerge from	14 years ago
reqresp_parser.c	Merged revisions 369005 via svnmerge from	14 years ago
sdp_crypto.c	Merged revisions 369005 via svnmerge from	14 years ago
security_events.c	Merged revisions 369005 via svnmerge from	14 years ago
srtp.c	Merged revisions 369005 via svnmerge from	14 years ago