diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-06-05 15:23:43 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-06-05 15:23:43 +0000 |
| commit | bd958c037f6627aeb6cba8b238d3f32cea1322a0 (patch) | |
| tree | a7efb10bfeef7ebf9e6caff2ff82d85d426b91cd /apps | |
| parent | 571445ab9c9f268abfa7cdea1f80d199686c5fac (diff) | |
Ensure that pages and emails are sent using RFC822-compliant date format
When localization was added to app_voicemail, these headers were altered
when they should have remained in en_US format for RFC compliance. This
reverts the changes to those two lines.
(closes issue ASTERISK-19876)
........
Merged revisions 368520 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 368524 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 043d93475..39d284725 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -4839,7 +4839,7 @@ static void make_email_file(FILE *p, } snprintf(dur, sizeof(dur), "%d:%02d", duration / 60, duration % 60); - ast_strftime_locale(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", vmu_tm(vmu, &tm), S_OR(vmu->locale, NULL)); + ast_strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", vmu_tm(vmu, &tm)); fprintf(p, "Date: %s" ENDL, date); /* Set date format for voicemail mail */ @@ -5214,7 +5214,7 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char snprintf(who, sizeof(who), "%s@%s", srcemail, host); } snprintf(dur, sizeof(dur), "%d:%02d", duration / 60, duration % 60); - ast_strftime_locale(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", vmu_tm(vmu, &tm), S_OR(vmu->locale, NULL)); + ast_strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", vmu_tm(vmu, &tm)); fprintf(p, "Date: %s\n", date); /* Reformat for custom pager format */ |