mirror of
https://github.com/asterisk/asterisk.git
synced 2025-08-29 01:13:40 +00:00
Compare commits
22 Commits
1.8.30.0-r
...
1.8.5.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
5eee01cd9a | ||
|
|
afdadaffae | ||
|
|
ca48aea12f | ||
|
|
5378a90107 | ||
|
|
3315dcb99d | ||
|
|
48c4644740 | ||
|
|
0fb60b6d39 | ||
|
|
4f39656906 | ||
|
|
9a6cbaecbd | ||
|
|
68f4bf2501 | ||
|
|
bbc8a6f28e | ||
|
|
e9308dbcf9 | ||
|
|
666e715c5d | ||
|
|
833ca9b155 | ||
|
|
c64775ab7e | ||
|
|
9588337ffe | ||
|
|
52436c6ea7 | ||
|
|
7e351892c4 | ||
|
|
1c9237c82a | ||
|
|
49ab0d92d3 | ||
|
|
d0d055574a | ||
|
|
3276fbd7c8 |
3
.lastclean
Normal file
3
.lastclean
Normal file
@@ -0,0 +1,3 @@
|
||||
39
|
||||
|
||||
|
||||
60
asterisk-1.8.5.1-summary.html
Normal file
60
asterisk-1.8.5.1-summary.html
Normal file
@@ -0,0 +1,60 @@
|
||||
<!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-1.8.5.1</title></head>
|
||||
<body>
|
||||
<h1 align="center"><a name="top">Release Summary</a></h1>
|
||||
<h3 align="center">asterisk-1.8.5.1</h3>
|
||||
<h3 align="center">Date: 2011-07-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-1.8.5.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 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>
|
||||
2 lmadsen<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/1.8?view=revision&revision=328420">328420</a></td><td>lmadsen</td><td>Create Asterisk 1.8.5.1 from 1.8.5.0.</td>
|
||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.8?view=revision&revision=328421">328421</a></td><td>lmadsen</td><td>Merge 328302 to resolve regression in chan_sip.</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 | 10
|
||||
asterisk-1.8.5.0-summary.html | 1688 ----------------------------------
|
||||
asterisk-1.8.5.0-summary.txt | 2046 ------------------------------------------
|
||||
channels/chan_sip.c | 4
|
||||
5 files changed, 14 insertions(+), 3736 deletions(-)
|
||||
</pre><br/>
|
||||
<hr/>
|
||||
</body>
|
||||
</html>
|
||||
90
asterisk-1.8.5.1-summary.txt
Normal file
90
asterisk-1.8.5.1-summary.txt
Normal file
@@ -0,0 +1,90 @@
|
||||
Release Summary
|
||||
|
||||
asterisk-1.8.5.1
|
||||
|
||||
Date: 2011-07-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-1.8.5.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
|
||||
2 lmadsen
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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 |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 328420 | lmadsen | Create Asterisk 1.8.5.1 from | |
|
||||
| | | 1.8.5.0. | |
|
||||
|----------+---------+-------------------------------+-------------------|
|
||||
| 328421 | lmadsen | Merge 328302 to resolve | |
|
||||
| | | regression in chan_sip. | |
|
||||
+------------------------------------------------------------------------+
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
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 | 10
|
||||
asterisk-1.8.5.0-summary.html | 1688 ----------------------------------
|
||||
asterisk-1.8.5.0-summary.txt | 2046 ------------------------------------------
|
||||
channels/chan_sip.c | 4
|
||||
5 files changed, 14 insertions(+), 3736 deletions(-)
|
||||
|
||||
----------------------------------------------------------------------
|
||||
@@ -28250,7 +28250,9 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *i
|
||||
if ((instance || vinstance || tinstance) &&
|
||||
!ast_bridged_channel(chan) &&
|
||||
!sip_cfg.directrtpsetup) {
|
||||
return 0;
|
||||
sip_pvt_unlock(p);
|
||||
ast_channel_unlock(chan);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -162,35 +162,7 @@ static void timerfd_timer_ack(int handle, unsigned int quantity)
|
||||
uint64_t expirations;
|
||||
int read_result = 0;
|
||||
|
||||
struct timerfd_timer *our_timer, find_helper = {
|
||||
.handle = handle,
|
||||
};
|
||||
|
||||
if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) {
|
||||
ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle);
|
||||
return;
|
||||
}
|
||||
|
||||
if (our_timer->saved_timer.it_value.tv_nsec == 0L) {
|
||||
ast_log(LOG_DEBUG, "Reading attempt on idle timerfd.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
do {
|
||||
struct itimerspec timer_status;
|
||||
|
||||
if (timerfd_gettime(handle, &timer_status)) {
|
||||
ast_log(LOG_ERROR, "Call to timerfd_gettime() error: %s\n", strerror(errno));
|
||||
expirations = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
if ((timer_status.it_value.tv_sec == 0) && (timer_status.it_value.tv_nsec == 0)) {
|
||||
ast_log(LOG_DEBUG, "Call to timerfd_timer_ack() with disarmed timer - break now.\n");
|
||||
expirations = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
read_result = read(handle, &expirations, sizeof(expirations));
|
||||
if (read_result == -1) {
|
||||
if (errno == EINTR || errno == EAGAIN) {
|
||||
|
||||
Reference in New Issue
Block a user