diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-05-12 19:14:21 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-05-12 19:14:21 +0000 |
| commit | ee006cd5b6272177ebfbb88c49900b823a1f742b (patch) | |
| tree | ea907313f7d56e30e80fd3baa70533c9c0b63454 | |
| parent | da22ad14498b62a2ad274b6d0c2478fafa66f038 (diff) | |
Fix typo, remove timing by default, and check for release vs. disconnect
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1005 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | Makefile | 2 | ||||
| -rwxr-xr-x | channels/chan_zap.c | 5 | ||||
| -rwxr-xr-x | contrib/scripts/vmail.cgi | 2 | ||||
| -rwxr-xr-x | vmail.cgi | 2 |
4 files changed, 6 insertions, 5 deletions
@@ -79,7 +79,7 @@ ifeq (${OSARCH},OpenBSD) CFLAGS+=-pthread 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 diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 3f7b42ab7..25c345c3b 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -1600,8 +1600,9 @@ static int zt_hangup(struct ast_channel *ast) if (p->sig == SIG_PRI) { if (p->call) { 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); p->call = NULL; p->alreadyhungup = 0; diff --git a/contrib/scripts/vmail.cgi b/contrib/scripts/vmail.cgi index 99eed585b..e6333bffb 100755 --- a/contrib/scripts/vmail.cgi +++ b/contrib/scripts/vmail.cgi @@ -52,7 +52,7 @@ $stdcontainerstart <input type=hidden name="action" value="login"> <table align=center> <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>Mailbox:</td><td><input type=text name="mailbox"></td></tr> <tr><td>Password:</td><td><input type=password name="password"></td></tr> @@ -52,7 +52,7 @@ $stdcontainerstart <input type=hidden name="action" value="login"> <table align=center> <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>Mailbox:</td><td><input type=text name="mailbox"></td></tr> <tr><td>Password:</td><td><input type=password name="password"></td></tr> |