[Pkg-voip-commits] [asterisk] 01/03: Imported Upstream version 11.8.1~dfsg

Jeremy Lainé sharky at moszumanska.debian.org
Tue Mar 11 06:49:04 UTC 2014


This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch master
in repository asterisk.

commit 6dabecda898690d210875e080d3d976ba6c338fa
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Tue Mar 11 07:42:15 2014 +0100

    Imported Upstream version 11.8.1~dfsg
---
 .version                     |   2 +-
 ChangeLog                    |  29 +++
 asterisk-11.8.0-summary.html | 435 ------------------------------------
 asterisk-11.8.0-summary.txt  | 517 -------------------------------------------
 asterisk-11.8.1-summary.html |  63 ++++++
 asterisk-11.8.1-summary.txt  |  94 ++++++++
 channels/chan_sip.c          | 305 +++++++++++++------------
 main/http.c                  |  51 +++--
 8 files changed, 379 insertions(+), 1117 deletions(-)

diff --git a/.version b/.version
index 897063b..4775ed6 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-11.8.0
+11.8.1
diff --git a/ChangeLog b/ChangeLog
index 61908ad..5427d65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2014-03-10  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 11.8.1 Released.
+
+	* AST-2012-002: chan_sip: Exit early on bad session timers request
+
+	  This change allows chan_sip to avoid creation of the channel and
+	  consumption of associated file descriptors altogether if the inbound
+	  request is going to be rejected anyway.
+
+	  (closes issue ASTERISK-23373)
+	  Reported by: Corey Farrell
+	  Patches:
+	    chan_sip-earlier-st-1.8.patch uploaded by Corey Farrell (license 5909)
+	    chan_sip-earlier-st-11.patch uploaded by Corey Farrell (license 5909)
+
+	* AST-2014-001: Stack overflow in HTTP processing of Cookie headers.
+
+	  Sending a HTTP request that is handled by Asterisk with a large
+	  number of Cookie headers could overflow the stack.
+
+	  Another vulnerability along similar lines is any HTTP request with a
+	  ridiculous number of headers in the request could exhaust system
+	  memory.
+
+	  (closes issue ASTERISK-23340)
+	  Reported by: Lucas Molas, researcher at Programa STIC, Fundacion;
+	               and Dr. Manuel Sadosky, Buenos Aires, Argentina
+
 2014-03-03  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 11.8.0 Released.
diff --git a/asterisk-11.8.0-summary.html b/asterisk-11.8.0-summary.html
deleted file mode 100644
index 9533322..0000000
--- a/asterisk-11.8.0-summary.html
+++ /dev/null
@@ -1,435 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-11.8.0</title></head>
-<body>
-<h1 align="center"><a name="top">Release Summary</a></h1>
-<h3 align="center">asterisk-11.8.0</h3>
-<h3 align="center">Date: 2014-03-03</h3>
-<h3 align="center"><asteriskteam at digium.com></h3>
-<hr/>
-<h2 align="center">Table of Contents</h2>
-<ol>
-   <li><a href="#summary">Summary</a></li>
-   <li><a href="#contributors">Contributors</a></li>
-   <li><a href="#issues">Closed Issues</a></li>
-   <li><a href="#commits">Other Changes</a></li>
-   <li><a href="#diffstat">Diffstat</a></li>
-</ol>
-<hr/>
-<a name="summary"><h2 align="center">Summary</h2></a>
-<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes.  The changes included were made only to address problems that have been identified in this release series.  Users should be able to safely upgrade to this version if this release series is already in use.  Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this r [...]
-<p>The data in this summary reflects changes that have been made since the previous release, asterisk-11.7.0.</p>
-<hr/>
-<a name="contributors"><h2 align="center">Contributors</h2></a>
-<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release.  For coders, the number is how many of their patches (of any size) were committed into this release.  For testers, the number is the number of times their name was listed as assisting with testing a patch.  Finally, for reporters, the number is the number [...]
-<table width="100%" border="0">
-<tr>
-<td width="33%"><h3>Coders</h3></td>
-<td width="33%"><h3>Testers</h3></td>
-<td width="33%"><h3>Reporters</h3></td>
-</tr>
-<tr valign="top">
-<td>
-6 sgriepentrog<br/>
-5 kmoore<br/>
-5 mjordan<br/>
-3 newtonr<br/>
-3 rmudgett<br/>
-2 Gareth Palmer<br/>
-2 kharwell<br/>
-2 may<br/>
-2 outtolunc<br/>
-1 awinters<br/>
-1 coreyfarrell<br/>
-1 dlee<br/>
-1 elguero<br/>
-1 file<br/>
-1 hexanol<br/>
-1 Jeremy Lainé<br/>
-1 Michael Walton<br/>
-1 mmichelson<br/>
-1 qwell<br/>
-1 russell<br/>
-1 tsearle<br/>
-1 tzafrir<br/>
-1 veilen<br/>
-1 wdoekes<br/>
-1 xytis<br/>
-</td>
-<td>
-2 rsw686<br/>
-2 Tommy Thomspon<br/>
-1 Dmitry Melekhov<br/>
-1 elguero<br/>
-1 Jan Juergens<br/>
-1 Rusty Newton<br/>
-1 Torrey Searle<br/>
-</td>
-<td>
-2 gareth<br/>
-2 outtolunc<br/>
-2 rnewton<br/>
-1 adomjan<br/>
-1 awinters<br/>
-1 coreyfarrell<br/>
-1 eisvogel<br/>
-1 elguero<br/>
-1 gtj<br/>
-1 hexanol<br/>
-1 intelafone<br/>
-1 j_juergens<br/>
-1 jimcredland<br/>
-1 mike at farsouthnet.com<br/>
-1 mjordan<br/>
-1 mpiazzatnetbug<br/>
-1 nicolastanski<br/>
-1 rsw686<br/>
-1 rudolf<br/>
-1 schmoozecom<br/>
-1 sharky<br/>
-1 shaunc869<br/>
-1 slesru<br/>
-1 tthompson<br/>
-1 tzafrir<br/>
-1 urtho<br/>
-1 veilen<br/>
-1 wimpy<br/>
-1 xytis<br/>
-</td>
-</tr>
-</table>
-<hr/>
-<a name="issues"><h2 align="center">Closed Issues</h2></a>
-<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p>
-<h3>Category: Addons/chan_ooh323</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21960">ASTERISK-21960</a>: ooh323 channels stuck<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404318">404318</a><br/>
-Reporter: slesru<br/>
-Testers: Dmitry Melekhov<br/>
-Coders: may<br/>
-<br/>
-<h3>Category: Applications/app_confbridge</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22478">ASTERISK-22478</a>: [patch]Can't use pound(hash) symbol for custom DTMF menus in ConfBridge (processed as directive)<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402407">402407</a><br/>
-Reporter: nicolastanski<br/>
-Coders: rmudgett<br/>
-<br/>
-<h3>Category: Applications/app_queue</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-20862">ASTERISK-20862</a>: Asterisk min and max member penalties not honored when set with 0<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402646">402646</a><br/>
-Reporter: schmoozecom<br/>
-Coders: kmoore<br/>
-<br/>
-<h3>Category: Applications/app_sayunixtime</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22856">ASTERISK-22856</a>: [patch]SayUnixTime in polish reads minutes instead of seconds<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404457">404457</a><br/>
-Reporter: veilen<br/>
-Coders: veilen<br/>
-<br/>
-<h3>Category: Applications/app_sms</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22590">ASTERISK-22590</a>: BufferOverflow in unpacksms16() when receiving 16 bit multipart SMS with app_sms<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403855">403855</a><br/>
-Reporter: j_juergens<br/>
-Testers: Jan Juergens<br/>
-Coders: sgriepentrog<br/>
-<br/>
-<h3>Category: CEL/cel_pgsql</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22854">ASTERISK-22854</a>: [patch] - Deadlock between cel_pgsql unload and core_event_dispatcher taskprocessor thread<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404604">404604</a><br/>
-Reporter: hexanol<br/>
-Coders: hexanol<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22871">ASTERISK-22871</a>: cel_pgsql module not loading after "reload" or "reload cel_pgsql.so" command<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404858">404858</a><br/>
-Reporter: mpiazzatnetbug<br/>
-Coders: kharwell<br/>
-<br/>
-<h3>Category: Channels/chan_dahdi</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22746">ASTERISK-22746</a>: [patch]Crash in chan_dahdi during caller id read<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402709">402709</a><br/>
-Reporter: mike at farsouthnet.com<br/>
-Coders: Michael Walton<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22918">ASTERISK-22918</a>: dahdi show channels slices PRI channel dnid on output<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404785">404785</a><br/>
-Reporter: outtolunc<br/>
-Coders: outtolunc<br/>
-<br/>
-<h3>Category: Channels/chan_sip/General</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22728">ASTERISK-22728</a>: [patch] Improve Understanding Of 'Forcerport' When Running "sip show peers"<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402111">402111</a><br/>
-Reporter: elguero<br/>
-Testers: elguero<br/>
-Coders: elguero<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-23010">ASTERISK-23010</a>: No BYE message sent when sip INVITE is received<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405487">405487</a><br/>
-Reporter: intelafone<br/>
-Coders: sgriepentrog<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-23047">ASTERISK-23047</a>: Orphaned (stuck) channel occurs during a failed SIP transfer to parking space<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405380">405380</a><br/>
-Reporter: tthompson<br/>
-Testers: rsw686, Tommy Thomspon<br/>
-Coders: mjordan<br/>
-<br/>
-<h3>Category: Channels/chan_sip/Registration</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-12117">ASTERISK-12117</a>: chan_sip creates a new local tag (from-tag) for every register message<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402605">402605</a><br/>
-Reporter: urtho<br/>
-Coders: sgriepentrog<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-17138">ASTERISK-17138</a>: [patch] Asterisk not re-registering after it receives "Forbidden - wrong password on authentication"<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405081">405081</a><br/>
-Reporter: rudolf<br/>
-Coders: kmoore<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22946">ASTERISK-22946</a>: Local From tag regression with sipgate.de<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405434">405434</a><br/>
-Reporter: eisvogel<br/>
-Coders: sgriepentrog<br/>
-<br/>
-<h3>Category: Core/AstDB</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22350">ASTERISK-22350</a>: DUNDI - core dump on shutdown - segfault in sqlite3_reset from /usr/lib/libsqlite3.so.0<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404344">404344</a><br/>
-Reporter: wimpy<br/>
-Coders: sgriepentrog<br/>
-<br/>
-<h3>Category: Core/Channels</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22919">ASTERISK-22919</a>: core show channeltypes slicing <br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404579">404579</a><br/>
-Reporter: outtolunc<br/>
-Coders: outtolunc<br/>
-<br/>
-<h3>Category: Core/General</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22788">ASTERISK-22788</a>: [patch] main/translate.c: access to variable f after free in ast_translate()<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403015">403015</a><br/>
-Reporter: coreyfarrell<br/>
-Coders: coreyfarrell<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22905">ASTERISK-22905</a>: Prevent Asterisk functions that are 'dangerous' from being executed from external interfaces<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403917">403917</a><br/>
-Reporter: mjordan<br/>
-Coders: dlee<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-23084">ASTERISK-23084</a>: [patch]rasterisk needlessly prints the AST-2013-007 warning<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404888">404888</a><br/>
-Reporter: tzafrir<br/>
-Coders: tzafrir<br/>
-<br/>
-<h3>Category: Core/ManagerInterface</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22905">ASTERISK-22905</a>: Prevent Asterisk functions that are 'dangerous' from being executed from external interfaces<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403917">403917</a><br/>
-Reporter: mjordan<br/>
-Coders: dlee<br/>
-<br/>
-<h3>Category: Documentation</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22970">ASTERISK-22970</a>: [patch]Documentation fix for QUOTE()<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404087">404087</a><br/>
-Reporter: gareth<br/>
-Coders: Gareth Palmer<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-23021">ASTERISK-23021</a>: Typos in code : "avaliable" instead of "available"<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404045">404045</a><br/>
-Reporter: sharky<br/>
-Testers: Rusty Newton<br/>
-Coders: Jeremy Lainé<br/>
-<br/>
-<h3>Category: Features/Parking</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22834">ASTERISK-22834</a>: Parking by blind transfer when lot full orphans channels<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405380">405380</a><br/>
-Reporter: rsw686<br/>
-Testers: rsw686, Tommy Thomspon<br/>
-Coders: mjordan<br/>
-<br/>
-<h3>Category: Functions/General</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22905">ASTERISK-22905</a>: Prevent Asterisk functions that are 'dangerous' from being executed from external interfaces<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403917">403917</a><br/>
-Reporter: mjordan<br/>
-Coders: dlee<br/>
-<br/>
-<h3>Category: Functions/func_strings</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22910">ASTERISK-22910</a>: [patch] - REPLACE() calls strcpy on overlapping memory when <replace-char> is empty<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404675">404675</a><br/>
-Reporter: gareth<br/>
-Coders: Gareth Palmer<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22970">ASTERISK-22970</a>: [patch]Documentation fix for QUOTE()<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404087">404087</a><br/>
-Reporter: gareth<br/>
-Coders: Gareth Palmer<br/>
-<br/>
-<h3>Category: General</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-23021">ASTERISK-23021</a>: Typos in code : "avaliable" instead of "available"<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404045">404045</a><br/>
-Reporter: sharky<br/>
-Testers: Rusty Newton<br/>
-Coders: Jeremy Lainé<br/>
-<br/>
-<h3>Category: PBX/pbx_dundi</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22350">ASTERISK-22350</a>: DUNDI - core dump on shutdown - segfault in sqlite3_reset from /usr/lib/libsqlite3.so.0<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404344">404344</a><br/>
-Reporter: wimpy<br/>
-Coders: sgriepentrog<br/>
-<br/>
-<h3>Category: PBX/pbx_lua</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-23011">ASTERISK-23011</a>: [patch]configure.ac and pbx_lua don't support lua 5.2<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405091">405091</a><br/>
-Reporter: gtj<br/>
-Coders: kmoore<br/>
-<br/>
-<h3>Category: Resources/res_agi</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22905">ASTERISK-22905</a>: Prevent Asterisk functions that are 'dangerous' from being executed from external interfaces<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403917">403917</a><br/>
-Reporter: mjordan<br/>
-Coders: dlee<br/>
-<br/>
-<h3>Category: Resources/res_ari</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22905">ASTERISK-22905</a>: Prevent Asterisk functions that are 'dangerous' from being executed from external interfaces<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403917">403917</a><br/>
-Reporter: mjordan<br/>
-Coders: dlee<br/>
-<br/>
-<h3>Category: Resources/res_fax</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21242">ASTERISK-21242</a>: Segfault when T.38 re-invite retransmission receives 200 OK<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403450">403450</a><br/>
-Reporter: awinters<br/>
-Testers: Torrey Searle<br/>
-Coders: awinters, tsearle<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22942">ASTERISK-22942</a>: [patch] - Asterisk crashed after Set(FAXOPT(faxdetect)=t38)<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404351">404351</a><br/>
-Reporter: adomjan<br/>
-Coders: sgriepentrog<br/>
-<br/>
-<h3>Category: Resources/res_fax_spandsp</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21242">ASTERISK-21242</a>: Segfault when T.38 re-invite retransmission receives 200 OK<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403450">403450</a><br/>
-Reporter: awinters<br/>
-Testers: Torrey Searle<br/>
-Coders: awinters, tsearle<br/>
-<br/>
-<h3>Category: Resources/res_http_websocket</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-21383">ASTERISK-21383</a>: STUN Binding Requests Not Being Sent Back from Asterisk to Chrome<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402345">402345</a><br/>
-Reporter: shaunc869<br/>
-Coders: kmoore<br/>
-<br/>
-<h3>Category: Resources/res_pjsip</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22911">ASTERISK-22911</a>: [patch]Asterisk fails to resume WebRTC call from hold<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405234">405234</a><br/>
-Reporter: xytis<br/>
-Coders: xytis<br/>
-<br/>
-<h3>Category: Resources/res_rtp_asterisk</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22911">ASTERISK-22911</a>: [patch]Asterisk fails to resume WebRTC call from hold<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405234">405234</a><br/>
-Reporter: xytis<br/>
-Coders: xytis<br/>
-<br/>
-<h3>Category: Sounds</h3><br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22411">ASTERISK-22411</a>: British English Sound Packs<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402225">402225</a><br/>
-Reporter: jimcredland<br/>
-Coders: newtonr<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22544">ASTERISK-22544</a>: Italian prompt vm-options has advertisement in it<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402225">402225</a><br/>
-Reporter: rnewton<br/>
-Coders: newtonr<br/>
-<br/>
-<a href="https://issues.asterisk.org/jira/browse/ASTERISK-22659">ASTERISK-22659</a>: Make a new core and extra sounds release<br/>
-Revision: <a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402225">402225</a><br/>
-Reporter: rnewton<br/>
-Coders: newtonr<br/>
-<br/>
-<hr/>
-<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a>
-<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker.  The commits may have been marked as being related to an issue.  If that is the case, the issue numbers are listed here, as well.</p>
-<table width="100%" border="1">
-<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402151">402151</a></td><td>mjordan</td><td>Remove some spammy debug messages; improve clarity of others</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402288">402288</a></td><td>mjordan</td><td>core/loader: Don't call dlclose in a while loop</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=402686">402686</a></td><td>mmichelson</td><td>Get rid of some inaccurate comments.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403288">403288</a></td><td>may</td><td>Check and reject non-digits e164 values on peers and general sections in ooh323.conf</td>
-<td><a href="https://issues.asterisk.org/jira/browse/ASTERISK-22901">ASTERISK-22901</a></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=403635">403635</a></td><td>russell</td><td>Reset peer outboundproxy on sip.conf reload</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404136">404136</a></td><td>file</td><td>res_calendar: Protect channel when adding datastore.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404219">404219</a></td><td>rmudgett</td><td>ooh323c: Fix gcc 4.6.3 compiler warnings.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404275">404275</a></td><td>qwell</td><td>Add AMI event for presence state.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=404773">404773</a></td><td>kharwell</td><td>app_meetme: compiler warning</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405089">405089</a></td><td>kmoore</td><td>UPGRADE: Add a note about non-functionality</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405161">405161</a></td><td>wdoekes</td><td>"Minimun" typo.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405281">405281</a></td><td>rmudgett</td><td>Logging callid: Fix some sizeof() references per coding guidelines.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=405362">405362</a></td><td>mjordan</td><td>res/Makefile: alias dist-clean to distclean</td>
-<td><a href="https://issues.asterisk.org/jira/browse/ASTERISK-22480">ASTERISK-22480</a></td></tr></table>
-<hr/>
-<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
-<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
-<pre>
-README-SERIOUSLY.bestpractices.txt         |   24 +
-UPGRADE.txt                                |   45 +++
-addons/chan_ooh323.c                       |  112 +++++++--
-addons/ooh323c/src/ooGkClient.c            |    4
-addons/ooh323c/src/ooGkClient.h            |    3
-addons/ooh323c/src/ooTimer.c               |    6
-addons/ooh323c/src/oochannels.c            |    6
-apps/app_chanspy.c                         |    2
-apps/app_confbridge.c                      |  125 +++++++---
-apps/app_dumpchan.c                        |   22 -
-apps/app_meetme.c                          |   11
-apps/app_mixmonitor.c                      |    2
-apps/app_queue.c                           |   79 ++++--
-apps/app_sms.c                             |    3
-apps/app_verbose.c                         |    4
-apps/confbridge/conf_state.c               |    3
-apps/confbridge/conf_state_inactive.c      |    2
-apps/confbridge/conf_state_multi.c         |    2
-apps/confbridge/conf_state_multi_marked.c  |   47 ++-
-apps/confbridge/conf_state_single.c        |    2
-apps/confbridge/conf_state_single_marked.c |    2
-apps/confbridge/include/confbridge.h       |   12
-cel/cel_pgsql.c                            |   10
-channels/chan_dahdi.c                      |   11
-channels/chan_iax2.c                       |    2
-channels/chan_sip.c                        |  133 +++++++---
-channels/sip/include/sip.h                 |    1
-configs/asterisk.conf.sample               |    6
-configs/confbridge.conf.sample             |    9
-configs/logger.conf.sample                 |   19 -
-configure.ac                               |   11
-funcs/func_db.c                            |   20 +
-funcs/func_env.c                           |   28 +-
-funcs/func_lock.c                          |   21 +
-funcs/func_realtime.c                      |   60 +++-
-funcs/func_shell.c                         |   18 -
-funcs/func_strings.c                       |   77 +++++-
-funcs/func_timeout.c                       |   16 -
-include/asterisk/logger.h                  |  101 ++++++--
-include/asterisk/pbx.h                     |   54 ++++
-include/asterisk/rtp_engine.h              |    8
-include/asterisk/test.h                    |    2
-main/asterisk.c                            |  197 ++++++++++-----
-main/channel.c                             |   13 -
-main/cli.c                                 |  359 ++++++++++++++++++-----------
-main/config.c                              |   21 +
-main/db.c                                  |   24 +
-main/loader.c                              |   28 +-
-main/logger.c                              |  226 +++++++++++++++---
-main/manager.c                             |   59 +++-
-main/pbx.c                                 |  296 +++++++++++++++++++++--
-main/rtp_engine.c                          |    2
-main/say.c                                 |    2
-main/tcptls.c                              |   11
-main/translate.c                           |   61 ++--
-main/xmldoc.c                              |    1
-pbx/pbx_lua.c                              |   11
-res/Makefile                               |    6
-res/res_calendar.c                         |    3
-res/res_fax.c                              |    2
-res/res_fax_spandsp.c                      |    4
-res/res_rtp_asterisk.c                     |   41 +--
-sounds/Makefile                            |    9
-63 files changed, 1892 insertions(+), 609 deletions(-)
-</pre><br/>
-<hr/>
-</body>
-</html>
diff --git a/asterisk-11.8.0-summary.txt b/asterisk-11.8.0-summary.txt
deleted file mode 100644
index a10d67a..0000000
--- a/asterisk-11.8.0-summary.txt
+++ /dev/null
@@ -1,517 +0,0 @@
-                                Release Summary
-
-                                asterisk-11.8.0
-
-                                Date: 2014-03-03
-
-                           <asteriskteam at digium.com>
-
-     ----------------------------------------------------------------------
-
-                               Table of Contents
-
-    1. Summary
-    2. Contributors
-    3. Closed Issues
-    4. Other Changes
-    5. Diffstat
-
-     ----------------------------------------------------------------------
-
-                                    Summary
-
-                                 [Back to Top]
-
-   This release includes only bug fixes. The changes included were made only
-   to address problems that have been identified in this release series.
-   Users should be able to safely upgrade to this version if this release
-   series is already in use. Users considering upgrading from a previous
-   release series are strongly encouraged to review the UPGRADE.txt document
-   as well as the CHANGES document for information about upgrading to this
-   release series.
-
-   The data in this summary reflects changes that have been made since the
-   previous release, asterisk-11.7.0.
-
-     ----------------------------------------------------------------------
-
-                                  Contributors
-
-                                 [Back to Top]
-
-   This table lists the people who have submitted code, those that have
-   tested patches, as well as those that reported issues on the issue tracker
-   that were resolved in this release. For coders, the number is how many of
-   their patches (of any size) were committed into this release. For testers,
-   the number is the number of times their name was listed as assisting with
-   testing a patch. Finally, for reporters, the number is the number of
-   issues that they reported that were closed by commits that went into this
-   release.
-
-     Coders                   Testers                  Reporters              
-   6 sgriepentrog           2 rsw686                 2 gareth                 
-   5 kmoore                 2 Tommy Thomspon         2 outtolunc              
-   5 mjordan                1 Dmitry Melekhov        2 rnewton                
-   3 newtonr                1 elguero                1 adomjan                
-   3 rmudgett               1 Jan Juergens           1 awinters               
-   2 Gareth Palmer          1 Rusty Newton           1 coreyfarrell           
-   2 kharwell               1 Torrey Searle          1 eisvogel               
-   2 may                                             1 elguero                
-   2 outtolunc                                       1 gtj                    
-   1 awinters                                        1 hexanol                
-   1 coreyfarrell                                    1 intelafone             
-   1 dlee                                            1 j_juergens             
-   1 elguero                                         1 jimcredland            
-   1 file                                            1 mike at farsouthnet.com   
-   1 hexanol                                         1 mjordan                
-   1 Jeremy LainA(c)                                 1 mpiazzatnetbug         
-   1 Michael Walton                                  1 nicolastanski          
-   1 mmichelson                                      1 rsw686                 
-   1 qwell                                           1 rudolf                 
-   1 russell                                         1 schmoozecom            
-   1 tsearle                                         1 sharky                 
-   1 tzafrir                                         1 shaunc869              
-   1 veilen                                          1 slesru                 
-   1 wdoekes                                         1 tthompson              
-   1 xytis                                           1 tzafrir                
-                                                     1 urtho                  
-                                                     1 veilen                 
-                                                     1 wimpy                  
-                                                     1 xytis                  
-
-     ----------------------------------------------------------------------
-
-                                 Closed Issues
-
-                                 [Back to Top]
-
-   This is a list of all issues from the issue tracker that were closed by
-   changes that went into this release.
-
-  Category: Addons/chan_ooh323
-
-   ASTERISK-21960: ooh323 channels stuck
-   Revision: 404318
-   Reporter: slesru
-   Testers: Dmitry Melekhov
-   Coders: may
-
-  Category: Applications/app_confbridge
-
-   ASTERISK-22478: [patch]Can't use pound(hash) symbol for custom DTMF menus
-   in ConfBridge (processed as directive)
-   Revision: 402407
-   Reporter: nicolastanski
-   Coders: rmudgett
-
-  Category: Applications/app_queue
-
-   ASTERISK-20862: Asterisk min and max member penalties not honored when set
-   with 0
-   Revision: 402646
-   Reporter: schmoozecom
-   Coders: kmoore
-
-  Category: Applications/app_sayunixtime
-
-   ASTERISK-22856: [patch]SayUnixTime in polish reads minutes instead of
-   seconds
-   Revision: 404457
-   Reporter: veilen
-   Coders: veilen
-
-  Category: Applications/app_sms
-
-   ASTERISK-22590: BufferOverflow in unpacksms16() when receiving 16 bit
-   multipart SMS with app_sms
-   Revision: 403855
-   Reporter: j_juergens
-   Testers: Jan Juergens
-   Coders: sgriepentrog
-
-  Category: CEL/cel_pgsql
-
-   ASTERISK-22854: [patch] - Deadlock between cel_pgsql unload and
-   core_event_dispatcher taskprocessor thread
-   Revision: 404604
-   Reporter: hexanol
-   Coders: hexanol
-
-   ASTERISK-22871: cel_pgsql module not loading after "reload" or "reload
-   cel_pgsql.so" command
-   Revision: 404858
-   Reporter: mpiazzatnetbug
-   Coders: kharwell
-
-  Category: Channels/chan_dahdi
-
-   ASTERISK-22746: [patch]Crash in chan_dahdi during caller id read
-   Revision: 402709
-   Reporter: mike at farsouthnet.com
-   Coders: Michael Walton
-
-   ASTERISK-22918: dahdi show channels slices PRI channel dnid on output
-   Revision: 404785
-   Reporter: outtolunc
-   Coders: outtolunc
-
-  Category: Channels/chan_sip/General
-
-   ASTERISK-22728: [patch] Improve Understanding Of 'Forcerport' When Running
-   "sip show peers"
-   Revision: 402111
-   Reporter: elguero
-   Testers: elguero
-   Coders: elguero
-
-   ASTERISK-23010: No BYE message sent when sip INVITE is received
-   Revision: 405487
-   Reporter: intelafone
-   Coders: sgriepentrog
-
-   ASTERISK-23047: Orphaned (stuck) channel occurs during a failed SIP
-   transfer to parking space
-   Revision: 405380
-   Reporter: tthompson
-   Testers: rsw686, Tommy Thomspon
-   Coders: mjordan
-
-  Category: Channels/chan_sip/Registration
-
-   ASTERISK-12117: chan_sip creates a new local tag (from-tag) for every
-   register message
-   Revision: 402605
-   Reporter: urtho
-   Coders: sgriepentrog
-
-   ASTERISK-17138: [patch] Asterisk not re-registering after it receives
-   "Forbidden - wrong password on authentication"
-   Revision: 405081
-   Reporter: rudolf
-   Coders: kmoore
-
-   ASTERISK-22946: Local From tag regression with sipgate.de
-   Revision: 405434
-   Reporter: eisvogel
-   Coders: sgriepentrog
-
-  Category: Core/AstDB
-
-   ASTERISK-22350: DUNDI - core dump on shutdown - segfault in sqlite3_reset
-   from /usr/lib/libsqlite3.so.0
-   Revision: 404344
-   Reporter: wimpy
-   Coders: sgriepentrog
-
-  Category: Core/Channels
-
-   ASTERISK-22919: core show channeltypes slicing
-   Revision: 404579
-   Reporter: outtolunc
-   Coders: outtolunc
-
-  Category: Core/General
-
-   ASTERISK-22788: [patch] main/translate.c: access to variable f after free
-   in ast_translate()
-   Revision: 403015
-   Reporter: coreyfarrell
-   Coders: coreyfarrell
-
-   ASTERISK-22905: Prevent Asterisk functions that are 'dangerous' from being
-   executed from external interfaces
-   Revision: 403917
-   Reporter: mjordan
-   Coders: dlee
-
-   ASTERISK-23084: [patch]rasterisk needlessly prints the AST-2013-007
-   warning
-   Revision: 404888
-   Reporter: tzafrir
-   Coders: tzafrir
-
-  Category: Core/ManagerInterface
-
-   ASTERISK-22905: Prevent Asterisk functions that are 'dangerous' from being
-   executed from external interfaces
-   Revision: 403917
-   Reporter: mjordan
-   Coders: dlee
-
-  Category: Documentation
-
-   ASTERISK-22970: [patch]Documentation fix for QUOTE()
-   Revision: 404087
-   Reporter: gareth
-   Coders: Gareth Palmer
-
-   ASTERISK-23021: Typos in code : "avaliable" instead of "available"
-   Revision: 404045
-   Reporter: sharky
-   Testers: Rusty Newton
-   Coders: Jeremy LainA(c)
-
-  Category: Features/Parking
-
-   ASTERISK-22834: Parking by blind transfer when lot full orphans channels
-   Revision: 405380
-   Reporter: rsw686
-   Testers: rsw686, Tommy Thomspon
-   Coders: mjordan
-
-  Category: Functions/General
-
-   ASTERISK-22905: Prevent Asterisk functions that are 'dangerous' from being
-   executed from external interfaces
-   Revision: 403917
-   Reporter: mjordan
-   Coders: dlee
-
-  Category: Functions/func_strings
-
-   ASTERISK-22910: [patch] - REPLACE() calls strcpy on overlapping memory
-   when is empty
-   Revision: 404675
-   Reporter: gareth
-   Coders: Gareth Palmer
-
-   ASTERISK-22970: [patch]Documentation fix for QUOTE()
-   Revision: 404087
-   Reporter: gareth
-   Coders: Gareth Palmer
-
-  Category: General
-
-   ASTERISK-23021: Typos in code : "avaliable" instead of "available"
-   Revision: 404045
-   Reporter: sharky
-   Testers: Rusty Newton
-   Coders: Jeremy LainA(c)
-
-  Category: PBX/pbx_dundi
-
-   ASTERISK-22350: DUNDI - core dump on shutdown - segfault in sqlite3_reset
-   from /usr/lib/libsqlite3.so.0
-   Revision: 404344
-   Reporter: wimpy
-   Coders: sgriepentrog
-
-  Category: PBX/pbx_lua
-
-   ASTERISK-23011: [patch]configure.ac and pbx_lua don't support lua 5.2
-   Revision: 405091
-   Reporter: gtj
-   Coders: kmoore
-
-  Category: Resources/res_agi
-
-   ASTERISK-22905: Prevent Asterisk functions that are 'dangerous' from being
-   executed from external interfaces
-   Revision: 403917
-   Reporter: mjordan
-   Coders: dlee
-
-  Category: Resources/res_ari
-
-   ASTERISK-22905: Prevent Asterisk functions that are 'dangerous' from being
-   executed from external interfaces
-   Revision: 403917
-   Reporter: mjordan
-   Coders: dlee
-
-  Category: Resources/res_fax
-
-   ASTERISK-21242: Segfault when T.38 re-invite retransmission receives 200
-   OK
-   Revision: 403450
-   Reporter: awinters
-   Testers: Torrey Searle
-   Coders: awinters, tsearle
-
-   ASTERISK-22942: [patch] - Asterisk crashed after
-   Set(FAXOPT(faxdetect)=t38)
-   Revision: 404351
-   Reporter: adomjan
-   Coders: sgriepentrog
-
-  Category: Resources/res_fax_spandsp
-
-   ASTERISK-21242: Segfault when T.38 re-invite retransmission receives 200
-   OK
-   Revision: 403450
-   Reporter: awinters
-   Testers: Torrey Searle
-   Coders: awinters, tsearle
-
-  Category: Resources/res_http_websocket
-
-   ASTERISK-21383: STUN Binding Requests Not Being Sent Back from Asterisk to
-   Chrome
-   Revision: 402345
-   Reporter: shaunc869
-   Coders: kmoore
-
-  Category: Resources/res_pjsip
-
-   ASTERISK-22911: [patch]Asterisk fails to resume WebRTC call from hold
-   Revision: 405234
-   Reporter: xytis
-   Coders: xytis
-
-  Category: Resources/res_rtp_asterisk
-
-   ASTERISK-22911: [patch]Asterisk fails to resume WebRTC call from hold
-   Revision: 405234
-   Reporter: xytis
-   Coders: xytis
-
-  Category: Sounds
-
-   ASTERISK-22411: British English Sound Packs
-   Revision: 402225
-   Reporter: jimcredland
-   Coders: newtonr
-
-   ASTERISK-22544: Italian prompt vm-options has advertisement in it
-   Revision: 402225
-   Reporter: rnewton
-   Coders: newtonr
-
-   ASTERISK-22659: Make a new core and extra sounds release
-   Revision: 402225
-   Reporter: rnewton
-   Coders: newtonr
-
-     ----------------------------------------------------------------------
-
-                      Commits Not Associated with an Issue
-
-                                 [Back to Top]
-
-   This is a list of all changes that went into this release that did not
-   directly close an issue from the issue tracker. The commits may have been
-   marked as being related to an issue. If that is the case, the issue
-   numbers are listed here, as well.
-
-   +------------------------------------------------------------------------+
-   | Revision | Author     | Summary                    | Issues Referenced |
-   |----------+------------+----------------------------+-------------------|
-   |          |            | Remove some spammy debug   |                   |
-   | 402151   | mjordan    | messages; improve clarity  |                   |
-   |          |            | of others                  |                   |
-   |----------+------------+----------------------------+-------------------|
-   | 402288   | mjordan    | core/loader: Don't call    |                   |
-   |          |            | dlclose in a while loop    |                   |
-   |----------+------------+----------------------------+-------------------|
-   | 402686   | mmichelson | Get rid of some inaccurate |                   |
-   |          |            | comments.                  |                   |
-   |----------+------------+----------------------------+-------------------|
-   |          |            | Check and reject           |                   |
-   | 403288   | may        | non-digits e164 values on  | ASTERISK-22901    |
-   |          |            | peers and general sections |                   |
-   |          |            | in ooh323.conf             |                   |
-   |----------+------------+----------------------------+-------------------|
-   | 403635   | russell    | Reset peer outboundproxy   |                   |
-   |          |            | on sip.conf reload         |                   |
-   |----------+------------+----------------------------+-------------------|
-   |          |            | res_calendar: Protect      |                   |
-   | 404136   | file       | channel when adding        |                   |
-   |          |            | datastore.                 |                   |
-   |----------+------------+----------------------------+-------------------|
-   | 404219   | rmudgett   | ooh323c: Fix gcc 4.6.3     |                   |
-   |          |            | compiler warnings.         |                   |
-   |----------+------------+----------------------------+-------------------|
-   | 404275   | qwell      | Add AMI event for presence |                   |
-   |          |            | state.                     |                   |
-   |----------+------------+----------------------------+-------------------|
-   | 404773   | kharwell   | app_meetme: compiler       |                   |
-   |          |            | warning                    |                   |
-   |----------+------------+----------------------------+-------------------|
-   | 405089   | kmoore     | UPGRADE: Add a note about  |                   |
-   |          |            | non-functionality          |                   |
-   |----------+------------+----------------------------+-------------------|
-   | 405161   | wdoekes    | "Minimun" typo.            |                   |
-   |----------+------------+----------------------------+-------------------|
-   |          |            | Logging callid: Fix some   |                   |
-   | 405281   | rmudgett   | sizeof() references per    |                   |
-   |          |            | coding guidelines.         |                   |
-   |----------+------------+----------------------------+-------------------|
-   | 405362   | mjordan    | res/Makefile: alias        | ASTERISK-22480    |
-   |          |            | dist-clean to distclean    |                   |
-   +------------------------------------------------------------------------+
-
-     ----------------------------------------------------------------------
-
-                                Diffstat Results
-
-                                 [Back to Top]
-
-   This is a summary of the changes to the source code that went into this
-   release that was generated using the diffstat utility.
-
- README-SERIOUSLY.bestpractices.txt         |   24 +
- UPGRADE.txt                                |   45 +++
- addons/chan_ooh323.c                       |  112 +++++++--
- addons/ooh323c/src/ooGkClient.c            |    4
- addons/ooh323c/src/ooGkClient.h            |    3
- addons/ooh323c/src/ooTimer.c               |    6
- addons/ooh323c/src/oochannels.c            |    6
- apps/app_chanspy.c                         |    2
- apps/app_confbridge.c                      |  125 +++++++---
- apps/app_dumpchan.c                        |   22 -
- apps/app_meetme.c                          |   11
- apps/app_mixmonitor.c                      |    2
- apps/app_queue.c                           |   79 ++++--
- apps/app_sms.c                             |    3
- apps/app_verbose.c                         |    4
- apps/confbridge/conf_state.c               |    3
- apps/confbridge/conf_state_inactive.c      |    2
- apps/confbridge/conf_state_multi.c         |    2
- apps/confbridge/conf_state_multi_marked.c  |   47 ++-
- apps/confbridge/conf_state_single.c        |    2
- apps/confbridge/conf_state_single_marked.c |    2
- apps/confbridge/include/confbridge.h       |   12
- cel/cel_pgsql.c                            |   10
- channels/chan_dahdi.c                      |   11
- channels/chan_iax2.c                       |    2
- channels/chan_sip.c                        |  133 +++++++---
- channels/sip/include/sip.h                 |    1
- configs/asterisk.conf.sample               |    6
- configs/confbridge.conf.sample             |    9
- configs/logger.conf.sample                 |   19 -
- configure.ac                               |   11
- funcs/func_db.c                            |   20 +
- funcs/func_env.c                           |   28 +-
- funcs/func_lock.c                          |   21 +
- funcs/func_realtime.c                      |   60 +++-
- funcs/func_shell.c                         |   18 -
- funcs/func_strings.c                       |   77 +++++-
- funcs/func_timeout.c                       |   16 -
- include/asterisk/logger.h                  |  101 ++++++--
- include/asterisk/pbx.h                     |   54 ++++
- include/asterisk/rtp_engine.h              |    8
- include/asterisk/test.h                    |    2
- main/asterisk.c                            |  197 ++++++++++-----
- main/channel.c                             |   13 -
- main/cli.c                                 |  359 ++++++++++++++++++-----------
- main/config.c                              |   21 +
- main/db.c                                  |   24 +
- main/loader.c                              |   28 +-
- main/logger.c                              |  226 +++++++++++++++---
- main/manager.c                             |   59 +++-
- main/pbx.c                                 |  296 +++++++++++++++++++++--
- main/rtp_engine.c                          |    2
- main/say.c                                 |    2
- main/tcptls.c                              |   11
- main/translate.c                           |   61 ++--
- main/xmldoc.c                              |    1
- pbx/pbx_lua.c                              |   11
- res/Makefile                               |    6
- res/res_calendar.c                         |    3
- res/res_fax.c                              |    2
- res/res_fax_spandsp.c                      |    4
- res/res_rtp_asterisk.c                     |   41 +--
- sounds/Makefile                            |    9
- 63 files changed, 1892 insertions(+), 609 deletions(-)
-
-     ----------------------------------------------------------------------
diff --git a/asterisk-11.8.1-summary.html b/asterisk-11.8.1-summary.html
new file mode 100644
index 0000000..fe6db5f
--- /dev/null
+++ b/asterisk-11.8.1-summary.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-11.8.1</title></head>
+<body>
+<h1 align="center"><a name="top">Release Summary</a></h1>
+<h3 align="center">asterisk-11.8.1</h3>
+<h3 align="center">Date: 2014-03-10</h3>
+<h3 align="center"><asteriskteam at digium.com></h3>
+<hr/>
+<h2 align="center">Table of Contents</h2>
+<ol>
+   <li><a href="#summary">Summary</a></li>
+   <li><a href="#contributors">Contributors</a></li>
+   <li><a href="#commits">Other Changes</a></li>
+   <li><a href="#diffstat">Diffstat</a></li>
+</ol>
+<hr/>
+<a name="summary"><h2 align="center">Summary</h2></a>
+<center><a href="#top">[Back to Top]</a></center><br/><p>This release has been made to address one or more security vulnerabilities that have been identified.  A security advisory document has been published for each vulnerability that includes additional information.  Users of versions of Asterisk that are affected are strongly encouraged to review the advisories and determine what action they should take to protect their systems from these issues.</p>
+<p>Security Advisories: <a href="http://downloads.asterisk.org/pub/security/AST-2014-001.html">AST-2014-001</a>, <a href="http://downloads.asterisk.org/pub/security/AST-2014-002.html">AST-2014-002</a></p>
+<p>The data in this summary reflects changes that have been made since the previous release, asterisk-11.8.0.</p>
+<hr/>
+<a name="contributors"><h2 align="center">Contributors</h2></a>
+<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release.  For coders, the number is how many of their patches (of any size) were committed into this release.  For testers, the number is the number of times their name was listed as assisting with testing a patch.  Finally, for reporters, the number is the number [...]
+<table width="100%" border="0">
+<tr>
+<td width="33%"><h3>Coders</h3></td>
+<td width="33%"><h3>Testers</h3></td>
+<td width="33%"><h3>Reporters</h3></td>
+</tr>
+<tr valign="top">
+<td>
+3 bebuild<br/>
+</td>
+<td>
+</td>
+<td>
+</td>
+</tr>
+</table>
+<hr/>
+<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a>
+<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker.  The commits may have been marked as being related to an issue.  If that is the case, the issue numbers are listed here, as well.</p>
+<table width="100%" border="1">
+<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/11.8.1?view=revision&revision=410373">410373</a></td><td>bebuild</td><td>Create 11.8.1</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/11.8.1?view=revision&revision=410378">410378</a></td><td>bebuild</td><td>Update version, remove old summaries</td>
+<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/tags/11.8.1?view=revision&revision=410431">410431</a></td><td>bebuild</td><td>AST-2014-001: AST-2014-002: Merge into 11.8.1</td>
+<td></td></tr></table>
+<hr/>
+<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
+<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
+<pre>
+.version                     |    2
+ChangeLog                    |   29 ++
+asterisk-11.8.0-summary.html |  435 ------------------------------------
+asterisk-11.8.0-summary.txt  |  517 -------------------------------------------
+channels/chan_sip.c          |  303 +++++++++++++------------
+main/http.c                  |   49 ++--
+6 files changed, 220 insertions(+), 1115 deletions(-)
+</pre><br/>
+<hr/>
+</body>
+</html>
diff --git a/asterisk-11.8.1-summary.txt b/asterisk-11.8.1-summary.txt
new file mode 100644
index 0000000..71d4d40
--- /dev/null
+++ b/asterisk-11.8.1-summary.txt
@@ -0,0 +1,94 @@
+                                Release Summary
+
+                                asterisk-11.8.1
+
+                                Date: 2014-03-10
+
+                           <asteriskteam at digium.com>
+
+     ----------------------------------------------------------------------
+
+                               Table of Contents
+
+    1. Summary
+    2. Contributors
+    3. Other Changes
+    4. Diffstat
+
+     ----------------------------------------------------------------------
+
+                                    Summary
+
+                                 [Back to Top]
+
+   This release has been made to address one or more security vulnerabilities
+   that have been identified. A security advisory document has been published
+   for each vulnerability that includes additional information. Users of
+   versions of Asterisk that are affected are strongly encouraged to review
+   the advisories and determine what action they should take to protect their
+   systems from these issues.
+
+   Security Advisories: AST-2014-001, AST-2014-002
+
+   The data in this summary reflects changes that have been made since the
+   previous release, asterisk-11.8.0.
+
+     ----------------------------------------------------------------------
+
+                                  Contributors
+
+                                 [Back to Top]
+
+   This table lists the people who have submitted code, those that have
+   tested patches, as well as those that reported issues on the issue tracker
+   that were resolved in this release. For coders, the number is how many of
+   their patches (of any size) were committed into this release. For testers,
+   the number is the number of times their name was listed as assisting with
+   testing a patch. Finally, for reporters, the number is the number of
+   issues that they reported that were closed by commits that went into this
+   release.
+
+     Coders                   Testers                  Reporters              
+   3 bebuild                
+
+     ----------------------------------------------------------------------
+
+                      Commits Not Associated with an Issue
+
+                                 [Back to Top]
+
+   This is a list of all changes that went into this release that did not
+   directly close an issue from the issue tracker. The commits may have been
+   marked as being related to an issue. If that is the case, the issue
+   numbers are listed here, as well.
+
+   +------------------------------------------------------------------------+
+   | Revision | Author  | Summary                       | Issues Referenced |
+   |----------+---------+-------------------------------+-------------------|
+   | 410373   | bebuild | Create 11.8.1                 |                   |
+   |----------+---------+-------------------------------+-------------------|
+   | 410378   | bebuild | Update version, remove old    |                   |
+   |          |         | summaries                     |                   |
+   |----------+---------+-------------------------------+-------------------|
+   | 410431   | bebuild | AST-2014-001: AST-2014-002:   |                   |
+   |          |         | Merge into 11.8.1             |                   |
+   +------------------------------------------------------------------------+
+
+     ----------------------------------------------------------------------
+
+                                Diffstat Results
+
+                                 [Back to Top]
+
+   This is a summary of the changes to the source code that went into this
+   release that was generated using the diffstat utility.
+
+ .version                     |    2
+ ChangeLog                    |   29 ++
+ asterisk-11.8.0-summary.html |  435 ------------------------------------
+ asterisk-11.8.0-summary.txt  |  517 -------------------------------------------
+ channels/chan_sip.c          |  303 +++++++++++++------------
+ main/http.c                  |   49 ++--
+ 6 files changed, 220 insertions(+), 1115 deletions(-)
+
+     ----------------------------------------------------------------------
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 00a6540..a07c999 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -210,7 +210,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 409303 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 410431 $")
 
 #include <signal.h>
 #include <sys/signal.h>
@@ -25004,6 +25004,145 @@ static int handle_request_update(struct sip_pvt *p, struct sip_request *req)
 	return 0;
 }
 
+/*
+ * \internal \brief Check Session Timers for an INVITE request
+ *
+ * \retval 0 ok
+ * \retval -1 failure
+ */
+static int handle_request_invite_st(struct sip_pvt *p, struct sip_request *req,
+		const char *required, int reinvite)
+{
+	const char *p_uac_se_hdr;       /* UAC's Session-Expires header string                      */
+	const char *p_uac_min_se;       /* UAC's requested Min-SE interval (char string)            */
+	int uac_max_se = -1;            /* UAC's Session-Expires in integer format                  */
+	int uac_min_se = -1;            /* UAC's Min-SE in integer format                           */
+	int st_active = FALSE;          /* Session-Timer on/off boolean                             */
+	int st_interval = 0;            /* Session-Timer negotiated refresh interval                */
+	enum st_refresher tmp_st_ref = SESSION_TIMER_REFRESHER_AUTO; /* Session-Timer refresher     */
+	int dlg_min_se = -1;
+	int dlg_max_se = global_max_se;
+	int rtn;
+
+	/* Session-Timers */
+	if ((p->sipoptions & SIP_OPT_TIMER)) {
+		enum st_refresher_param st_ref_param = SESSION_TIMER_REFRESHER_PARAM_UNKNOWN;
+
+		/* The UAC has requested session-timers for this session. Negotiate
+		the session refresh interval and who will be the refresher */
+		ast_debug(2, "Incoming INVITE with 'timer' option supported\n");
+
+		/* Allocate Session-Timers struct w/in the dialog */
+		if (!p->stimer) {
+			sip_st_alloc(p);
+		}
+
+		/* Parse the Session-Expires header */
+		p_uac_se_hdr = sip_get_header(req, "Session-Expires");
+		if (!ast_strlen_zero(p_uac_se_hdr)) {
+			ast_debug(2, "INVITE also has \"Session-Expires\" header.\n");
+			rtn = parse_session_expires(p_uac_se_hdr, &uac_max_se, &st_ref_param);
+			tmp_st_ref = (st_ref_param == SESSION_TIMER_REFRESHER_PARAM_UAC) ? SESSION_TIMER_REFRESHER_THEM : SESSION_TIMER_REFRESHER_US;
+			if (rtn != 0) {
+				transmit_response_reliable(p, "400 Session-Expires Invalid Syntax", req);
+				return -1;
+			}
+		}
+
+		/* Parse the Min-SE header */
+		p_uac_min_se = sip_get_header(req, "Min-SE");
+		if (!ast_strlen_zero(p_uac_min_se)) {
+			ast_debug(2, "INVITE also has \"Min-SE\" header.\n");
+			rtn = parse_minse(p_uac_min_se, &uac_min_se);
+			if (rtn != 0) {
+				transmit_response_reliable(p, "400 Min-SE Invalid Syntax", req);
+				return -1;
+			}
+		}
+
+		dlg_min_se = st_get_se(p, FALSE);
+		switch (st_get_mode(p, 1)) {
+		case SESSION_TIMER_MODE_ACCEPT:
+		case SESSION_TIMER_MODE_ORIGINATE:
+			if (uac_max_se > 0 && uac_max_se < dlg_min_se) {
+				transmit_response_with_minse(p, "422 Session Interval Too Small", req, dlg_min_se);
+				return -1;
+			}
+
+			p->stimer->st_active_peer_ua = TRUE;
+			st_active = TRUE;
+			if (st_ref_param == SESSION_TIMER_REFRESHER_PARAM_UNKNOWN) {
+				tmp_st_ref = st_get_refresher(p);
+			}
+
+			dlg_max_se = st_get_se(p, TRUE);
+			if (uac_max_se > 0) {
+				if (dlg_max_se >= uac_min_se) {
+					st_interval = (uac_max_se < dlg_max_se) ? uac_max_se : dlg_max_se;
+				} else {
+					st_interval = uac_max_se;
+				}
+			} else if (uac_min_se > 0) {
+				st_interval = MAX(dlg_max_se, uac_min_se);
+			} else {
+				st_interval = dlg_max_se;
+			}
+			break;
+
+		case SESSION_TIMER_MODE_REFUSE:
+			if (p->reqsipoptions & SIP_OPT_TIMER) {
+				transmit_response_with_unsupported(p, "420 Option Disabled", req, required);
+				ast_log(LOG_WARNING, "Received SIP INVITE with supported but disabled option: %s\n", required);
+				return -1;
+			}
+			break;
+
+		default:
+			ast_log(LOG_ERROR, "Internal Error %d at %s:%d\n", st_get_mode(p, 1), __FILE__, __LINE__);
+			break;
+		}
+	} else {
+		/* The UAC did not request session-timers.  Asterisk (UAS), will now decide
+		(based on session-timer-mode in sip.conf) whether to run session-timers for
+		this session or not. */
+		switch (st_get_mode(p, 1)) {
+		case SESSION_TIMER_MODE_ORIGINATE:
+			st_active = TRUE;
+			st_interval = st_get_se(p, TRUE);
+			tmp_st_ref = SESSION_TIMER_REFRESHER_US;
+			p->stimer->st_active_peer_ua = (p->sipoptions & SIP_OPT_TIMER) ? TRUE : FALSE;
+			break;
+
+		default:
+			break;
+		}
+	}
+
+	if (reinvite == 0) {
+		/* Session-Timers: Start session refresh timer based on negotiation/config */
+		if (st_active == TRUE) {
+			p->stimer->st_active = TRUE;
+			p->stimer->st_interval = st_interval;
+			p->stimer->st_ref = tmp_st_ref;
+		}
+	} else {
+		if (p->stimer->st_active == TRUE) {
+			/* Session-Timers:  A re-invite request sent within a dialog will serve as
+			a refresh request, no matter whether the re-invite was sent for refreshing
+			the session or modifying it.*/
+			ast_debug (2, "Restarting session-timers on a refresh - %s\n", p->callid);
+
+			/* The UAC may be adjusting the session-timers mid-session */
+			if (st_interval > 0) {
+				p->stimer->st_interval = st_interval;
+				p->stimer->st_ref      = tmp_st_ref;
+			}
+		}
+	}
+
+	return 0;
+}
+
 /*!
  * \brief Handle incoming INVITE request
  * \note If the INVITE has a Replaces header, it is part of an
@@ -25023,19 +25162,9 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, str
 	struct ast_channel *c = NULL;		/* New channel */
 	struct sip_peer *authpeer = NULL;	/* Matching Peer */
 	int reinvite = 0;
-	int rtn;
 	struct ast_party_redirecting redirecting;
 	struct ast_set_party_redirecting update_redirecting;
 
-	const char *p_uac_se_hdr;       /* UAC's Session-Expires header string                      */
-	const char *p_uac_min_se;       /* UAC's requested Min-SE interval (char string)            */
-	int uac_max_se = -1;            /* UAC's Session-Expires in integer format                  */
-	int uac_min_se = -1;            /* UAC's Min-SE in integer format                           */
-	int st_active = FALSE;          /* Session-Timer on/off boolean                             */
-	int st_interval = 0;            /* Session-Timer negotiated refresh interval                */
-	enum st_refresher tmp_st_ref = SESSION_TIMER_REFRESHER_AUTO; /* Session-Timer refresher     */
-	int dlg_min_se = -1;
-	int dlg_max_se = global_max_se;
 	struct {
 		char exten[AST_MAX_EXTENSION];
 		char context[AST_MAX_CONTEXT];
@@ -25523,6 +25652,14 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, str
 			/* Initialize our tag */
 
 			make_our_tag(p);
+
+			if (handle_request_invite_st(p, req, required, reinvite)) {
+				p->invitestate = INV_COMPLETED;
+				sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
+				res = INV_REQ_ERROR;
+				goto request_invite_cleanup;
+			}
+
 			/* First invitation - create the channel.  Allocation
 			 * failures are handled below. */
 
@@ -25557,6 +25694,16 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, str
 		}
 		if (!req->ignore)
 			reinvite = 1;
+
+		if (handle_request_invite_st(p, req, required, reinvite)) {
+			p->invitestate = INV_COMPLETED;
+			if (!p->lastinvite) {
+				sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
+			}
+			res = INV_REQ_ERROR;
+			goto request_invite_cleanup;
+		}
+
 		c = p->owner;
 		change_redirecting_information(p, req, &redirecting, &update_redirecting, FALSE); /*Will return immediately if no Diversion header is present */
 		if (c) {
@@ -25568,140 +25715,10 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, str
 	/* Check if OLI/ANI-II is present in From: */
 	parse_oli(req, p->owner);
 
-	/* Session-Timers */
-	if ((p->sipoptions & SIP_OPT_TIMER)) {
-		enum st_refresher_param st_ref_param = SESSION_TIMER_REFRESHER_PARAM_UNKNOWN;
-
-		/* The UAC has requested session-timers for this session. Negotiate
-		the session refresh interval and who will be the refresher */
-		ast_debug(2, "Incoming INVITE with 'timer' option supported\n");
-
-		/* Allocate Session-Timers struct w/in the dialog */
-		if (!p->stimer)
-			sip_st_alloc(p);
-
-		/* Parse the Session-Expires header */
-		p_uac_se_hdr = sip_get_header(req, "Session-Expires");
-		if (!ast_strlen_zero(p_uac_se_hdr)) {
-			ast_debug(2, "INVITE also has \"Session-Expires\" header.\n");
-			rtn = parse_session_expires(p_uac_se_hdr, &uac_max_se, &st_ref_param);
-			tmp_st_ref = (st_ref_param == SESSION_TIMER_REFRESHER_PARAM_UAC) ? SESSION_TIMER_REFRESHER_THEM : SESSION_TIMER_REFRESHER_US;
-			if (rtn != 0) {
-				transmit_response_reliable(p, "400 Session-Expires Invalid Syntax", req);
-				p->invitestate = INV_COMPLETED;
-				if (!p->lastinvite) {
-					sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
-				}
-				res = INV_REQ_ERROR;
-				goto request_invite_cleanup;
-			}
-		}
-
-		/* Parse the Min-SE header */
-		p_uac_min_se = sip_get_header(req, "Min-SE");
-		if (!ast_strlen_zero(p_uac_min_se)) {
-			ast_debug(2, "INVITE also has \"Min-SE\" header.\n");
-			rtn = parse_minse(p_uac_min_se, &uac_min_se);
-			if (rtn != 0) {
-				transmit_response_reliable(p, "400 Min-SE Invalid Syntax", req);
-				p->invitestate = INV_COMPLETED;
-				if (!p->lastinvite) {
-					sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
-				}
-				res = INV_REQ_ERROR;
-				goto request_invite_cleanup;
-			}
-		}
-
-		dlg_min_se = st_get_se(p, FALSE);
-		switch (st_get_mode(p, 1)) {
-		case SESSION_TIMER_MODE_ACCEPT:
-		case SESSION_TIMER_MODE_ORIGINATE:
-			if (uac_max_se > 0 && uac_max_se < dlg_min_se) {
-				transmit_response_with_minse(p, "422 Session Interval Too Small", req, dlg_min_se);
-				p->invitestate = INV_COMPLETED;
-				if (!p->lastinvite) {
-					sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
-				}
-				res = INV_REQ_ERROR;
-				goto request_invite_cleanup;
-			}
-
-			p->stimer->st_active_peer_ua = TRUE;
-			st_active = TRUE;
-			if (st_ref_param == SESSION_TIMER_REFRESHER_PARAM_UNKNOWN) {
-				tmp_st_ref = st_get_refresher(p);
-			}
-
-			dlg_max_se = st_get_se(p, TRUE);
-			if (uac_max_se > 0) {
-				if (dlg_max_se >= uac_min_se) {
-					st_interval = (uac_max_se < dlg_max_se) ? uac_max_se : dlg_max_se;
-				} else {
-					st_interval = uac_max_se;
-				}
-			} else if (uac_min_se > 0) {
-				st_interval = MAX(dlg_max_se, uac_min_se);
-			} else {
-				st_interval = dlg_max_se;
-			}
-			break;
-
-		case SESSION_TIMER_MODE_REFUSE:
-			if (p->reqsipoptions & SIP_OPT_TIMER) {
-				transmit_response_with_unsupported(p, "420 Option Disabled", req, required);
-				ast_log(LOG_WARNING, "Received SIP INVITE with supported but disabled option: %s\n", required);
-				p->invitestate = INV_COMPLETED;
-				if (!p->lastinvite) {
-					sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
-				}
-				res = INV_REQ_ERROR;
-				goto request_invite_cleanup;
-			}
-			break;
-
-		default:
-			ast_log(LOG_ERROR, "Internal Error %d at %s:%d\n", st_get_mode(p, 1), __FILE__, __LINE__);
-			break;
-		}
-	} else {
-		/* The UAC did not request session-timers.  Asterisk (UAS), will now decide
-		(based on session-timer-mode in sip.conf) whether to run session-timers for
-		this session or not. */
-		switch (st_get_mode(p, 1)) {
-		case SESSION_TIMER_MODE_ORIGINATE:
-			st_active = TRUE;
-			st_interval = st_get_se(p, TRUE);
-			tmp_st_ref = SESSION_TIMER_REFRESHER_US;
-			p->stimer->st_active_peer_ua = (p->sipoptions & SIP_OPT_TIMER) ? TRUE : FALSE;
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	if (reinvite == 0) {
-		/* Session-Timers: Start session refresh timer based on negotiation/config */
-		if (st_active == TRUE) {
-			p->stimer->st_active = TRUE;
-			p->stimer->st_interval = st_interval;
-			p->stimer->st_ref = tmp_st_ref;
+	if (p->stimer->st_active == TRUE) {
+		if (reinvite == 0) {
 			start_session_timer(p);
-		}
-	} else {
-		if (p->stimer->st_active == TRUE) {
-			/* Session-Timers:  A re-invite request sent within a dialog will serve as
-			a refresh request, no matter whether the re-invite was sent for refreshing
-			the session or modifying it.*/
-			ast_debug (2, "Restarting session-timers on a refresh - %s\n", p->callid);
-
-			/* The UAC may be adjusting the session-timers mid-session */
-			if (st_interval > 0) {
-				p->stimer->st_interval = st_interval;
-				p->stimer->st_ref      = tmp_st_ref;
-			}
-
+		} else {
 			restart_session_timer(p);
 		}
 	}
diff --git a/main/http.c b/main/http.c
index a34a833..8a40029 100644
--- a/main/http.c
+++ b/main/http.c
@@ -36,7 +36,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 397309 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 410431 $")
 
 #include <time.h>
 #include <sys/time.h>
@@ -186,9 +186,7 @@ uint32_t ast_http_manid_from_vars(struct ast_variable *headers)
 			break;
 		}
 	}
-	if (cookies) {
-		ast_variables_destroy(cookies);
-	}
+	ast_variables_destroy(cookies);
 	return mngid;
 }
 
@@ -805,12 +803,13 @@ static int ssl_close(void *cookie)
 }*/
 #endif	/* DO_SSL */
 
-static struct ast_variable *parse_cookies(char *cookies)
+static struct ast_variable *parse_cookies(const char *cookies)
 {
+	char *parse = ast_strdupa(cookies);
 	char *cur;
 	struct ast_variable *vars = NULL, *var;
 
-	while ((cur = strsep(&cookies, ";"))) {
+	while ((cur = strsep(&parse, ";"))) {
 		char *name, *val;
 
 		name = val = cur;
@@ -840,21 +839,19 @@ static struct ast_variable *parse_cookies(char *cookies)
 /* get cookie from Request headers */
 struct ast_variable *ast_http_get_cookies(struct ast_variable *headers)
 {
-	struct ast_variable *v, *cookies=NULL;
+	struct ast_variable *v, *cookies = NULL;
 
 	for (v = headers; v; v = v->next) {
 		if (!strcasecmp(v->name, "Cookie")) {
-			char *tmp = ast_strdupa(v->value);
-			if (cookies) {
-				ast_variables_destroy(cookies);
-			}
-
-			cookies = parse_cookies(tmp);
+			ast_variables_destroy(cookies);
+			cookies = parse_cookies(v->value);
 		}
 	}
 	return cookies;
 }
 
+/*! Limit the number of request headers in case the sender is being ridiculous. */
+#define MAX_HTTP_REQUEST_HEADERS	100
 
 static void *httpd_helper_thread(void *data)
 {
@@ -865,6 +862,7 @@ static void *httpd_helper_thread(void *data)
 	struct ast_variable *tail = headers;
 	char *uri, *method;
 	enum ast_http_method http_method = AST_HTTP_UNKNOWN;
+	int remaining_headers;
 
 	if (ast_atomic_fetchadd_int(&session_count, +1) >= session_limit) {
 		goto done;
@@ -899,9 +897,13 @@ static void *httpd_helper_thread(void *data)
 		if (*c) {
 			*c = '\0';
 		}
+	} else {
+		ast_http_error(ser, 400, "Bad Request", "Invalid Request");
+		goto done;
 	}
 
 	/* process "Request Headers" lines */
+	remaining_headers = MAX_HTTP_REQUEST_HEADERS;
 	while (fgets(header_line, sizeof(header_line), ser->f)) {
 		char *name, *value;
 
@@ -924,6 +926,11 @@ static void *httpd_helper_thread(void *data)
 
 		ast_trim_blanks(name);
 
+		if (!remaining_headers--) {
+			/* Too many headers. */
+			ast_http_error(ser, 413, "Request Entity Too Large", "Too many headers");
+			goto done;
+		}
 		if (!headers) {
 			headers = ast_variable_new(name, value, __FILE__);
 			tail = headers;
@@ -931,11 +938,17 @@ static void *httpd_helper_thread(void *data)
 			tail->next = ast_variable_new(name, value, __FILE__);
 			tail = tail->next;
 		}
-	}
+		if (!tail) {
+			/*
+			 * Variable allocation failure.
+			 * Try to make some room.
+			 */
+			ast_variables_destroy(headers);
+			headers = NULL;
 
-	if (!*uri) {
-		ast_http_error(ser, 400, "Bad Request", "Invalid Request");
-		goto done;
+			ast_http_error(ser, 500, "Server Error", "Out of memory");
+			goto done;
+		}
 	}
 
 	handle_uri(ser, uri, http_method, headers);
@@ -944,9 +957,7 @@ done:
 	ast_atomic_fetchadd_int(&session_count, -1);
 
 	/* clean up all the header information */
-	if (headers) {
-		ast_variables_destroy(headers);
-	}
+	ast_variables_destroy(headers);
 
 	if (ser->f) {
 		fclose(ser->f);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git



More information about the Pkg-voip-commits mailing list