Merged revisions 376551 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Tue, 20 Nov 2012 19:19:31 +0000 (19:19 +0000)
committerAutomerge script <automerge@asterisk.org>
Tue, 20 Nov 2012 19:19:31 +0000 (19:19 +0000)
commit898f9f853caa24271eb7bd61f9147eddce443adb
tree29c0b61d948f7a94c2025822d232aba5fa457e2c
parentec170b1b9d540a3d188ffa49fa5bee832a39fa51
Merged revisions 376551 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r376551 | mmichelson | 2012-11-20 13:09:37 -0600 (Tue, 20 Nov 2012) | 20 lines

  Add "Require: timer" to 200 OK responses when appropriate.

  The method by which the Require header is added to 200 responses is
  inspired by the method that Olle Johansson uses in his darjeeling-prack
  branch.

  (closes issue ASTERISK-20570)
  Reported by Matt Jordan, at the behest of Olle Johansson

  Review: https://reviewboard.asterisk.org/r/2172
  ........

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

  Merged revisions 376522 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........

  Merged revisions 376550 from http://svn.asterisk.org/svn/asterisk/branches/11
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c
channels/sip/include/sip.h