mirror of
https://github.com/asterisk/asterisk.git
synced 2025-08-25 15:08:27 +00:00
Compare commits
17 Commits
10.4.0-rc1
...
10.0.0-rc2
| Author | SHA1 | Date | |
|---|---|---|---|
|
e6a8fb20ac | ||
|
|
630fa7a94b | ||
|
|
8ae283533e | ||
|
59a9542a66 | ||
|
|
26bbbc62a9 | ||
|
|
c7f2d271fb | ||
|
|
7a25aaf5ae | ||
|
|
089a1d4eda | ||
|
|
ff91e82776 | ||
|
|
4401c5206d | ||
|
|
ae10bd24a5 | ||
|
|
0fdf14a260 | ||
|
|
2a57c8681e | ||
|
|
572748e5bc | ||
|
|
54e7a014e8 | ||
|
|
e357c7af5c | ||
|
|
fa47558077 |
3
.lastclean
Normal file
3
.lastclean
Normal file
@@ -0,0 +1,3 @@
|
||||
39
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
/*** MODULEINFO
|
||||
<support_level>core</support_level>
|
||||
<replacement>app_stack (GoSub)</replacement>
|
||||
*/
|
||||
***/
|
||||
|
||||
#include "asterisk.h"
|
||||
|
||||
|
||||
68
asterisk-10.0.0-rc2-summary.html
Normal file
68
asterisk-10.0.0-rc2-summary.html
Normal file
@@ -0,0 +1,68 @@
|
||||
<!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-10.0.0-rc2</title></head>
|
||||
<body>
|
||||
<h1 align="center"><a name="top">Release Summary</a></h1>
|
||||
<h3 align="center">asterisk-10.0.0-rc2</h3>
|
||||
<h3 align="center">Date: 2011-11-15</h3>
|
||||
<h3 align="center"><asteriskteam@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 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.</p>
|
||||
<p>The data in this summary reflects changes that have been made since the previous release, asterisk-10.0.0-rc1.</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 of issues that they reported that were closed by commits that went into this release.</p>
|
||||
<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 mjordan<br/>
|
||||
2 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/branches/10?view=revision&revision=345363">345363</a></td><td>mjordan</td><td>Created 10.0.0-rc2</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/10?view=revision&revision=345368">345368</a></td><td>mjordan</td><td>Merge of blockers from 10 to rc2</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/10?view=revision&revision=345376">345376</a></td><td>mjordan</td><td>Updated .version and ChangeLog for rc2</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/10?view=revision&revision=345416">345416</a></td><td>bebuild</td><td>Remove summary files for release</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/10?view=revision&revision=345418">345418</a></td><td>bebuild</td><td>Importing release summary for 10.0.0-rc2 release.</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 | 34 ++
|
||||
apps/app_macro.c | 2
|
||||
asterisk-10.0.0-rc1-summary.html | 315 -------------------
|
||||
asterisk-10.0.0-rc1-summary.txt | 617 ---------------------------------------
|
||||
asterisk-10.0.0-rc2-summary.html | 65 ++++
|
||||
asterisk-10.0.0-rc2-summary.txt | 98 ++++++
|
||||
channels/chan_sip.c | 6
|
||||
main/bridging.c | 20 +
|
||||
9 files changed, 219 insertions(+), 940 deletions(-)
|
||||
</pre><br/>
|
||||
<hr/>
|
||||
</body>
|
||||
</html>
|
||||
103
asterisk-10.0.0-rc2-summary.txt
Normal file
103
asterisk-10.0.0-rc2-summary.txt
Normal file
@@ -0,0 +1,103 @@
|
||||
Release Summary
|
||||
|
||||
asterisk-10.0.0-rc2
|
||||
|
||||
Date: 2011-11-15
|
||||
|
||||
<asteriskteam@digium.com>
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
Table of Contents
|
||||
|
||||
1. Summary
|
||||
2. Contributors
|
||||
3. Other Changes
|
||||
4. 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-10.0.0-rc1.
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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 mjordan
|
||||
2 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 |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 345363 | mjordan | Created 10.0.0-rc2 | |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 345368 | mjordan | Merge of blockers from 10 to | |
|
||||
| | | rc2 | |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 345376 | mjordan | Updated .version and | |
|
||||
| | | ChangeLog for rc2 | |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 345416 | bebuild | Remove summary files for | |
|
||||
| | | release | |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 345418 | bebuild | Importing release summary for | |
|
||||
| | | 10.0.0-rc2 release. | |
|
||||
+------------------------------------------------------------------------+
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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 | 34 ++
|
||||
apps/app_macro.c | 2
|
||||
asterisk-10.0.0-rc1-summary.html | 315 -------------------
|
||||
asterisk-10.0.0-rc1-summary.txt | 617 ---------------------------------------
|
||||
asterisk-10.0.0-rc2-summary.html | 65 ++++
|
||||
asterisk-10.0.0-rc2-summary.txt | 98 ++++++
|
||||
channels/chan_sip.c | 6
|
||||
main/bridging.c | 20 +
|
||||
9 files changed, 219 insertions(+), 940 deletions(-)
|
||||
|
||||
----------------------------------------------------------------------
|
||||
@@ -25865,11 +25865,13 @@ static int sip_send_mwi_to_peer(struct sip_peer *peer, int cache_only)
|
||||
/* Called with peerl lock, but releases it */
|
||||
struct sip_pvt *p;
|
||||
int newmsgs = 0, oldmsgs = 0;
|
||||
const char *vmexten;
|
||||
const char *vmexten = NULL;
|
||||
|
||||
ao2_lock(peer);
|
||||
|
||||
vmexten = ast_strdupa(peer->vmexten);
|
||||
if (peer->vmexten) {
|
||||
vmexten = ast_strdupa(peer->vmexten);
|
||||
}
|
||||
|
||||
if (ast_test_flag((&peer->flags[1]), SIP_PAGE2_SUBSCRIBEMWIONLY) && !peer->mwipvt) {
|
||||
ao2_unlock(peer);
|
||||
|
||||
@@ -739,12 +739,13 @@ static enum ast_bridge_channel_state bridge_channel_join_multithreaded(struct as
|
||||
|
||||
ao2_unlock(bridge_channel->bridge);
|
||||
|
||||
ao2_lock(bridge_channel);
|
||||
/* Wait for data to either come from the channel or us to be signalled */
|
||||
if (!bridge_channel->suspended) {
|
||||
ao2_unlock(bridge_channel);
|
||||
ast_debug(10, "Going into a multithreaded waitfor for bridge channel %p of bridge %p\n", bridge_channel, bridge_channel->bridge);
|
||||
chan = ast_waitfor_nandfds(&bridge_channel->chan, 1, fds, nfds, NULL, &outfd, &ms);
|
||||
} else {
|
||||
ao2_lock(bridge_channel);
|
||||
ast_debug(10, "Going into a multithreaded signal wait for bridge channel %p of bridge %p\n", bridge_channel, bridge_channel->bridge);
|
||||
ast_cond_wait(&bridge_channel->cond, ao2_object_get_lockaddr(bridge_channel));
|
||||
ao2_unlock(bridge_channel);
|
||||
@@ -777,9 +778,10 @@ static enum ast_bridge_channel_state bridge_channel_join_singlethreaded(struct a
|
||||
/*! \brief Internal function that suspends a channel from a bridge */
|
||||
static void bridge_channel_suspend(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
|
||||
{
|
||||
ao2_lock(bridge_channel);
|
||||
bridge_channel->suspended = 1;
|
||||
|
||||
bridge_array_remove(bridge, bridge_channel->chan);
|
||||
ao2_unlock(bridge_channel);
|
||||
|
||||
if (bridge->technology->suspend) {
|
||||
bridge->technology->suspend(bridge, bridge_channel);
|
||||
@@ -791,14 +793,18 @@ static void bridge_channel_suspend(struct ast_bridge *bridge, struct ast_bridge_
|
||||
/*! \brief Internal function that unsuspends a channel from a bridge */
|
||||
static void bridge_channel_unsuspend(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
|
||||
{
|
||||
bridge_channel->suspended =0;
|
||||
|
||||
ao2_lock(bridge_channel);
|
||||
bridge_channel->suspended = 0;
|
||||
bridge_array_add(bridge, bridge_channel->chan);
|
||||
ast_cond_signal(&bridge_channel->cond);
|
||||
ao2_unlock(bridge_channel);
|
||||
|
||||
if (bridge->technology->unsuspend) {
|
||||
bridge->technology->unsuspend(bridge, bridge_channel);
|
||||
}
|
||||
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -865,6 +871,12 @@ static void bridge_channel_feature(struct ast_bridge *bridge, struct ast_bridge_
|
||||
/* If a hook was actually matched execute it on this channel, otherwise stream up the DTMF to the other channels */
|
||||
if (hook) {
|
||||
hook->callback(bridge, bridge_channel, hook->hook_pvt);
|
||||
/* If we are handing the channel off to an external hook for ownership,
|
||||
* we are not guaranteed what kind of state it will come back in. If
|
||||
* the channel hungup, we need to detect that here. */
|
||||
if (bridge_channel->chan && ast_check_hangup_locked(bridge_channel->chan)) {
|
||||
ast_bridge_change_state(bridge_channel, AST_BRIDGE_CHANNEL_STATE_END);
|
||||
}
|
||||
} else {
|
||||
ast_bridge_dtmf_stream(bridge, dtmf, bridge_channel->chan);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user