[svn-commits] mmichelson: branch 1.6.1 r164425 - in /branches/1.6.1: ./ include/asterisk/pbx.h

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Dec 15 13:54:18 2008
New Revision: 164425

URL: http://svn.digium.com/view/asterisk?view=rev&rev=164425
Log:
Merged revisions 164423 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r164423 | mmichelson | 2008-12-15 13:53:29 -0600 (Mon, 15 Dec 2008) | 11 lines

Merged revisions 164422 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r164422 | mmichelson | 2008-12-15 13:53:08 -0600 (Mon, 15 Dec 2008) | 3 lines

Add the deadlock note to ast_spawn_extension as well


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/pbx.h

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/include/asterisk/pbx.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk/pbx.h?view=diff&rev=164425&r1=164424&r2=164425
==============================================================================
--- branches/1.6.1/include/asterisk/pbx.h (original)
+++ branches/1.6.1/include/asterisk/pbx.h Mon Dec 15 13:54:18 2008
@@ -495,6 +495,10 @@
  *
  * This adds a new extension to the asterisk extension list.
  *
+ * \note It is possible for autoservice to be started and stopped on c during this
+ * function call, it is important that c is not locked prior to calling this. Otherwise
+ * a deadlock may occur
+ *
  * \retval 0 on success 
  * \retval -1 on failure.
  */