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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1005 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 0d225a07de62c1137d3039b7d099aec877fd0906..f0d10108300ddca2be2859041d38f42f0f6297f0 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -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 3f7b42ab7adc1b57a24733f52681bf014a5ef4f5..25c345c3b2cec08d6e75464104264bdab436adb6 100755 (executable)
--- 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 99eed585b3e0d61a45bbd3af84cbebc892294db7..e6333bffbbddc908ff853dd3fdc3c9dd30150096 100755 (executable)
--- 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>

diff --git a/vmail.cgi b/vmail.cgi
index 99eed585b3e0d61a45bbd3af84cbebc892294db7..e6333bffbbddc908ff853dd3fdc3c9dd30150096 100755 (executable)
--- a/vmail.cgi
+++ b/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>