diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
| commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
| tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /src/src/mime.h | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'src/src/mime.h')
| -rw-r--r-- | src/src/mime.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/src/mime.h b/src/src/mime.h index 5c030ebca..5fd4392d5 100644 --- a/src/src/mime.h +++ b/src/src/mime.h @@ -2,8 +2,10 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004, 2015 */ -/* License: GPL */ +/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004, 2015 + * License: GPL + * Copyright (c) The Exim Maintainers 2016 + */ #ifdef WITH_CONTENT_SCAN @@ -27,16 +29,6 @@ typedef struct mime_header { uschar ** value; } mime_header; -static mime_header mime_header_list[] = { - { US"content-type:", 13, &mime_content_type }, - { US"content-disposition:", 20, &mime_content_disposition }, - { US"content-transfer-encoding:", 26, &mime_content_transfer_encoding }, - { US"content-id:", 11, &mime_content_id }, - { US"content-description:", 20, &mime_content_description } -}; - - - typedef struct mime_parameter { uschar * name; |