Merged revisions 371250-371251 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

........
  r371250 | elguero | 2012-08-14 20:35:57 -0500 (Tue, 14 Aug 2012) | 17 lines

  Fix Segfault When Registering SIP Over WebSockets

  The helper function, get_address_family_filter, in chan_sip for dns resolution
  by address family was not recognizing the websockets transport and resulting in
  a null pointer being sent to functions in netsock2, in an attempt to determine
  if we are bound to ANY address ([::]) or not.

  This patch fixes this issue by handling the transport types SIP_TRANSPORT_WS and
  SIP_TRANSPORT_WSS which results in a sock address being set properly for use in
  determining the address family.

  (closes issue ASTERISK-20221)
  Reported by: Sven Beisiegel
  Tested by: Sven Beisiegel, James Mortensen
  Patches:
  asterisk-20221-ws-family-filter.diff uploaded by Michael L. Young (license 5026)
........
  r371251 | elguero | 2012-08-14 20:43:23 -0500 (Tue, 14 Aug 2012) | 4 lines

  Reverting this change that was meant for branch 11.

  (issue ASTERISK-20221)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@371254 65c4cc65-6c06-0410-ace0-fbb531ad65f3