Merged revisions 374695 via svnmerge from

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

................
  r374695 | rmudgett | 2012-10-08 16:11:41 -0500 (Mon, 08 Oct 2012) | 34 lines

  Fix deletion of unopenable spool files.

  If scan_service() cannot open the spool file, it logs a message saying
  that it will delete the file and calls remove_from_queue() to do it.
  However, remove_from_queue() fails to delete the spool file because struct
  outgoing has not yet been fully initialized.

  * Merged allocating a new struct outgoing and init_outgoing() into
  new_outgoing().  Allocation is initialization.

  * Made apply_outgoing() not initialize the spool filename in struct
  outgoing.

  * Made apply_outgoing() call ast_trim_blanks() and ast_skip_blanks()
  rather than manually inlining them.

  * Reduced indentation levels in apply_outgoing().

  * Fixed a garbled comment in remove_from_queue().

  * Reworked scan_service() to simplify it.

  (closes issue ASTERISK-17231)
  Reported by: David Chappell
  Patches:
        spool_open_failure.diff (license #4997) patch uploaded by David Chappell
        Started with this patch.
  ........

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

  * Fixed some memory leaks on of nominal paths in init_outgoing() when
  merging into the new_outgoing() function dealing with o->capabilities.
................

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