]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge pull request #1682 in FS/freeswitch from ~LAZEDO/freeswitch:proxy-token-acl...
authorMike Jerris <mike@jerris.com>
Tue, 26 Mar 2019 22:21:02 +0000 (17:21 -0500)
committerMike Jerris <mike@jerris.com>
Tue, 26 Mar 2019 22:21:02 +0000 (17:21 -0500)
* commit '6ceb9885d4bd10763b982255af732e3e6a8936ee':
  FS-9956 [mod_sofia] retain user lookup in blind & acl auth
  FS-11025 [mod_sofia] use ports for acl check
  FS-11025 [core] allow/check ports in network lists
  FS-10746 [mod_sofia] allow authoritative proxy to provide token

1  2 
src/mod/endpoints/mod_sofia/mod_sofia.h
src/mod/endpoints/mod_sofia/sofia.c

Simple merge