kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo, remove timing by default, and check for release vs. disconnect

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1005 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-05-12 19:14:21 +00:00
parent 5e8102a304
commit 412cf715a7
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -79,7 +79,7 @@ ifeq (${OSARCH},OpenBSD)
CFLAGS+=-pthread CFLAGS+=-pthread
endif endif
CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) #CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
LIBEDIT=editline/libedit.a LIBEDIT=editline/libedit.a

5
channels/chan_zap.c
View File

@@ -1600,8 +1600,9 @@ static int zt_hangup(struct ast_channel *ast)
if (p->sig == SIG_PRI) { if (p->sig == SIG_PRI) {
if (p->call) { if (p->call) {
if (!pri_grab(p, p->pri)) { if (!pri_grab(p, p->pri)) {
res = pri_disconnect(p->pri->pri, p->call, PRI_CAUSE_NORMAL_CLEARING); if (!p->alreadyhungup) {
if (p->alreadyhungup) { res = pri_disconnect(p->pri->pri, p->call, PRI_CAUSE_NORMAL_CLEARING);
} else {
pri_release(p->pri->pri, p->call, -1); pri_release(p->pri->pri, p->call, -1);
p->call = NULL; p->call = NULL;
p->alreadyhungup = 0; p->alreadyhungup = 0;

2
contrib/scripts/vmail.cgi
View File

@@ -52,7 +52,7 @@ $stdcontainerstart
<input type=hidden name="action" value="login"> <input type=hidden name="action" value="login">
<table align=center> <table align=center>
<tr><td valign=top align=center rowspan=6><img align=center src="$astpath/animlogo.gif"></td></tr> <tr><td valign=top align=center rowspan=6><img align=center src="$astpath/animlogo.gif"></td></tr>
<tr><td align=center colspan=2><font size=+2>Commedian Mail Login</font></td></tr> <tr><td align=center colspan=2><font size=+2>Comedian Mail Login</font></td></tr>
<tr><td align=center colspan=2><font size=+1>$message</font></td></tr> <tr><td align=center colspan=2><font size=+1>$message</font></td></tr>
<tr><td>Mailbox:</td><td><input type=text name="mailbox"></td></tr> <tr><td>Mailbox:</td><td><input type=text name="mailbox"></td></tr>
<tr><td>Password:</td><td><input type=password name="password"></td></tr> <tr><td>Password:</td><td><input type=password name="password"></td></tr>

2
vmail.cgi
View File

@@ -52,7 +52,7 @@ $stdcontainerstart
<input type=hidden name="action" value="login"> <input type=hidden name="action" value="login">
<table align=center> <table align=center>
<tr><td valign=top align=center rowspan=6><img align=center src="$astpath/animlogo.gif"></td></tr> <tr><td valign=top align=center rowspan=6><img align=center src="$astpath/animlogo.gif"></td></tr>
<tr><td align=center colspan=2><font size=+2>Commedian Mail Login</font></td></tr> <tr><td align=center colspan=2><font size=+2>Comedian Mail Login</font></td></tr>
<tr><td align=center colspan=2><font size=+1>$message</font></td></tr> <tr><td align=center colspan=2><font size=+1>$message</font></td></tr>
<tr><td>Mailbox:</td><td><input type=text name="mailbox"></td></tr> <tr><td>Mailbox:</td><td><input type=text name="mailbox"></td></tr>
<tr><td>Password:</td><td><input type=password name="password"></td></tr> <tr><td>Password:</td><td><input type=password name="password"></td></tr>