Merged revisions 373025 via svnmerge from

Merged revisions 373025 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r373025 | dlee | 2012-09-13 13:44:30 -0500 (Thu, 13 Sep 2012) | 18 lines

  Fix timeouts for ast_waitfordigit[_full].

  ast_waitfordigit_full would simply pass its timeout to ast_waitfor_nandfds,
  expecting it to decrement the timeout by however many milliseconds were
  waited. This is a problem if it consistently waits less than 1ms. The timeout
  will never be decremented, and we wait... FOREVER!

  This patch makes ast_waitfordigit_full manage the timeout itself. It maintains
  the previously undocumented behavior that negative timeouts wait forever.

  (closes issue ASTERISK-20375)
  Reported by: Mark Michelson
  Tested by: Mark Michelson
  Review: https://reviewboard.asterisk.org/r/2109/
  ........

  Merged revisions 373024 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

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