automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@19435 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index c323480b2634a65ff1b420611070a53baf1de79f..a7597aa55214dab526ae4f2c47610cd76673c0f6 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -304,6 +304,8 @@ static void hanguptree(struct localuser *outgoing, struct ast_channel *exception
                        ast_cdr_failed(chan->cdr); \
                numnochan++; \
                break; \
+       case AST_CAUSE_NORMAL_CLEARING: \
+               break; \
        default: \
                numnochan++; \
                break; \

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 582595ad8fe0f74921772f30e2e02fa4240cfa41..b925a9746edb55dbe9c3f78c67363559123f109f 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1281,7 +1281,7 @@ static int store_file(char *dir, char *mailboxuser, char *mailboxcontext, int ms
                len = fdlen; /* SQL_LEN_DATA_AT_EXEC(fdlen); */
                SQLBindParameter(stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(dir), 0, (void *)dir, 0, NULL);
                SQLBindParameter(stmt, 2, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(msgnums), 0, (void *)msgnums, 0, NULL);
-               SQLBindParameter(stmt, 3, SQL_PARAM_INPUT, SQL_C_BINARY, SQL_BINARY, fdlen, 0, (void *)fdm, fdlen, &len);
+               SQLBindParameter(stmt, 3, SQL_PARAM_INPUT, SQL_C_BINARY, SQL_LONGVARBINARY, fdlen, 0, (void *)fdm, fdlen, &len);
                SQLBindParameter(stmt, 4, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(context), 0, (void *)context, 0, NULL);
                SQLBindParameter(stmt, 5, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(macrocontext), 0, (void *)macrocontext, 0, NULL);
                SQLBindParameter(stmt, 6, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(callerid), 0, (void *)callerid, 0, NULL);