kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 376551 via svnmerge from

Browse Source 
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
This commit is contained in:
Automerge script
2012-11-20 19:19:31 +00:00
parent ec170b1b9d
commit 898f9f853c
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
channels/sip/include/sip.h
View File

@@ -827,6 +827,7 @@ struct sip_request {
/* XXX Do we need to unref socket.ser when the request goes away? */
struct sip_socket socket; /*!< The socket used for this request */
AST_LIST_ENTRY(sip_request) next;
unsigned int reqsipoptions; /*!< Items needed for Required header in responses */
};
/* \brief given a sip_request and an offset, return the char * that resides there