diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-02 05:27:53 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-02 05:27:53 +0000 |
| commit | 8190e96fad6481eed053dc724ce5d8fbb89d8ad1 (patch) | |
| tree | ee5cd1ddfc1d54e98a53cdf5a1e70cccc4d53a2e /channels/chan_sip.c | |
| parent | 5eae9f44f74f9869e46e416a2d5d092834043483 (diff) | |
Merged revisions 284610 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r284610 | tilghman | 2010-09-02 00:20:59 -0500 (Thu, 02 Sep 2010) | 10 lines
When optional_api is non-optional, force dependent modules to be loaded.
(closes issue #17707)
Reported by: ira
Patches:
20100819__issue17707__asterisk1.8.diff.txt uploaded by tilghman (license 14)
Tested by: tilghman
Review: https://reviewboard.asterisk.org/r/876/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 09531f2ad..432adedfe 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -162,6 +162,7 @@ */ /*** MODULEINFO + <depend>res_crypto</depend> <depend>chan_local</depend> ***/ @@ -28623,4 +28624,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Session Initiation Pr .unload = unload_module, .reload = reload, .load_pri = AST_MODPRI_CHANNEL_DRIVER, + .nonoptreq = "res_crypto,chan_local", ); |