projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'github/pr/34'
[exim.git]
/
src
/
src
/
mime.c
diff --git
a/src/src/mime.c
b/src/src/mime.c
index 6bffa789776d499e7006c5590b4c558483d3af92..618364a3ecbbde1bcc0de6e4e63518c08fdf86b1 100644
(file)
--- a/
src/src/mime.c
+++ b/
src/src/mime.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 */
+/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
, 2015
*/
/* License: GPL */
#include "exim.h"
/* License: GPL */
#include "exim.h"
@@
-640,8
+640,6
@@
while(1)
mh < mime_header_list + mime_header_list_size;
mh++) if (strncmpic(mh->name, header, mh->namelen) == 0)
{
mh < mime_header_list + mime_header_list_size;
mh++) if (strncmpic(mh->name, header, mh->namelen) == 0)
{
- uschar * header_value = NULL;
- int header_value_len = 0;
uschar * p = header + mh->namelen;
uschar * q;
uschar * p = header + mh->namelen;
uschar * q;
@@
-671,8
+669,8
@@
while(1)
DEBUG(D_acl) debug_printf(" considering paramlist '%s'\n", p);
if ( !mime_filename
DEBUG(D_acl) debug_printf(" considering paramlist '%s'\n", p);
if ( !mime_filename
- && strncmpic("content-disposition:", header, 20) == 0
- && strncmpic("filename*", p, 9) == 0
+ && strncmpic(
CUS
"content-disposition:", header, 20) == 0
+ && strncmpic(
CUS
"filename*", p, 9) == 0
)
{ /* RFC 2231 filename */
uschar * q;
)
{ /* RFC 2231 filename */
uschar * q;
@@
-765,7
+763,7
@@
while(1)
if (*p) p++;
} /* param scan on line */
if (*p) p++;
} /* param scan on line */
- if (strncmpic("content-disposition:", header, 20) == 0)
+ if (strncmpic(
CUS
"content-disposition:", header, 20) == 0)
{
if (decoding_failed) mime_filename = mime_fname_rfc2231;
{
if (decoding_failed) mime_filename = mime_fname_rfc2231;