Mercurial > mxe-octave

annotate src/vmime-1-fixes.patch @ 1668:4ee38be1b1cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package vmime: fix and use .pc file
author Mark Brand <mabrand@mabrand.nl>
date Thu, 17 Mar 2011 01:22:52 +0100
parents 2af2bc5dca3f
children d3bf5db5a40f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1506
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Cherry picked fixes from svn
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5 http://sourceforge.net/projects/vmime/develop
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 Produced with this script:
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 #--------------------------------------------------------------------#
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 #!/bin/bash
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11 (
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 echo "This file is part of mingw-cross-env."
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 echo "See doc/index.html for further information."
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 echo
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 echo "Cherry picked fixes from svn"
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 echo "http://sourceforge.net/projects/vmime/develop"
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 echo
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 echo "Produced with this script:"
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 echo "#--------------------------------------------------------------------#"
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 cat "$0"
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 echo "#--------------------------------------------------------------------#"
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 ) > src/vmime-1-fixes.patch
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 # setup git svn clone
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 #cd ~/projects/vmime/git
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 #git svn clone -s https://vmime.svn.sourceforge.net/svnroot/vmime
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 #git reset --hard
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 # get updates
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 #git svn fetch
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 #git svn rebase
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 #git checkout v0.9.1
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 #git checkout -b 0.9.1-fixes
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 #git cherry-pick
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 GITDIR=~/projects/vmime/git/vmime
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 (
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 cd $GITDIR
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 echo
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 git format-patch -p --relative=vmime --stdout v0.9.1..0.9.1-fixes
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 ) >> src/vmime-1-fixes.patch
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 #--------------------------------------------------------------------#
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 From c6f077e695b75d9ff9a32d1621f6a320c8ce70f1 Mon Sep 17 00:00:00 2001
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 Date: Tue, 30 Nov 2010 14:57:03 +0000
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
47 Subject: [PATCH 1/8] Initialize and delete object.
1506
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@577 5301114d-f842-0410-bbdd-996ee0417009
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51 diff --git a/vmime/net/imap/IMAPParser.hpp b/vmime/net/imap/IMAPParser.hpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 index 0f3e9ec..d71c3ca 100644
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53 --- a/vmime/net/imap/IMAPParser.hpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54 +++ b/vmime/net/imap/IMAPParser.hpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 @@ -3823,7 +3823,9 @@ public:
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57 msg_att_item()
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 : m_date_time(NULL), m_number(NULL), m_envelope(NULL),
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 - m_uniqueid(NULL), m_nstring(NULL), m_body(NULL), m_flag_list(NULL)
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 + m_uniqueid(NULL), m_nstring(NULL), m_body(NULL), m_flag_list(NULL),
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61 + m_section(NULL)
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62 +
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
63 {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
64 }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
66 @@ -3836,6 +3838,7 @@ public:
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
67 delete (m_nstring);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
68 delete (m_body);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
69 delete (m_flag_list);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
70 + delete (m_section);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
71 }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
72
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
73 void go(IMAPParser& parser, string& line, string::size_type* currentPos)
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
74 --
1659
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
75 1.7.4.1
1506
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
76
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
77
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
78 From 41203315eacf53230dd7bdb0cf2b0d1078ddee39 Mon Sep 17 00:00:00 2001
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
79 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
80 Date: Wed, 8 Dec 2010 08:52:54 +0000
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
81 Subject: [PATCH 2/8] No extra space between ':' and '<' in MAIL FROM and RCPT TO. Wait for server response after QUIT and before closing connection.
1506
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
82
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
83 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@579 5301114d-f842-0410-bbdd-996ee0417009
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
84
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
85 diff --git a/src/net/smtp/SMTPTransport.cpp b/src/net/smtp/SMTPTransport.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
86 index 204daae..d9fb7b8 100644
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
87 --- a/src/net/smtp/SMTPTransport.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
88 +++ b/src/net/smtp/SMTPTransport.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
89 @@ -516,6 +516,7 @@ void SMTPTransport::internalDisconnect()
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
90 try
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
91 {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
92 sendRequest("QUIT");
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
93 + readResponse();
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
94 }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
95 catch (exception&)
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
96 {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
97 @@ -565,7 +566,7 @@ void SMTPTransport::send(const mailbox& expeditor, const mailboxList& recipients
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
98 // Emit the "MAIL" command
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
99 ref <SMTPResponse> resp;
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
100
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
101 - sendRequest("MAIL FROM: <" + expeditor.getEmail() + ">");
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
102 + sendRequest("MAIL FROM:<" + expeditor.getEmail() + ">");
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
103
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
104 if ((resp = readResponse())->getCode() != 250)
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
105 {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
106 @@ -578,7 +579,7 @@ void SMTPTransport::send(const mailbox& expeditor, const mailboxList& recipients
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
107 {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
108 const mailbox& mbox = *recipients.getMailboxAt(i);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
109
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
110 - sendRequest("RCPT TO: <" + mbox.getEmail() + ">");
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
111 + sendRequest("RCPT TO:<" + mbox.getEmail() + ">");
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
112
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
113 if ((resp = readResponse())->getCode() != 250)
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
114 {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
115 --
1659
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
116 1.7.4.1
1506
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
117
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
118
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
119 From 969b56f4bd61ddb8277c04ac2a1e35e029ec058b Mon Sep 17 00:00:00 2001
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
120 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
121 Date: Fri, 10 Dec 2010 16:24:06 +0000
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
122 Subject: [PATCH 3/8] Fixed unit test after bug fix.
1506
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
123
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
124 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@580 5301114d-f842-0410-bbdd-996ee0417009
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
125
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
126 diff --git a/tests/net/smtp/SMTPTransportTest.cpp b/tests/net/smtp/SMTPTransportTest.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
127 index 5015552..6552f9e 100644
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
128 --- a/tests/net/smtp/SMTPTransportTest.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
129 +++ b/tests/net/smtp/SMTPTransportTest.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
130 @@ -165,7 +165,7 @@ public:
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
131 }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
132 else if (cmd == "MAIL")
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
133 {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
134 - VASSERT_EQ("MAIL", std::string("MAIL FROM: <expeditor@test.vmime.org>"), line);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
135 + VASSERT_EQ("MAIL", std::string("MAIL FROM:<expeditor@test.vmime.org>"), line);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
136
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
137 localSend("250 OK\r\n");
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
138 }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
139 --
1659
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
140 1.7.4.1
1506
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
141
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
142
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
143 From 50743da0712b216533acdc09069f1bfc81f988c6 Mon Sep 17 00:00:00 2001
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
144 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
145 Date: Fri, 10 Dec 2010 16:54:38 +0000
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
146 Subject: [PATCH 4/8] Fixed boundary parsing (thanks to John van der Kamp, Zarafa).
1506
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
147
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
148 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@581 5301114d-f842-0410-bbdd-996ee0417009
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
149
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
150 diff --git a/src/body.cpp b/src/body.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
151 index 13dff6b..738d3e7 100644
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
152 --- a/src/body.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
153 +++ b/src/body.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
154 @@ -127,10 +127,30 @@ void body::parse(const string& buffer, const string::size_type position,
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
155 const string boundarySep("--" + boundary);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
156
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
157 string::size_type partStart = position;
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
158 - string::size_type pos = buffer.find(boundarySep, position);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
159 + string::size_type pos = position;
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
160
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
161 bool lastPart = false;
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
162
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
163 + while (pos != string::npos && pos < end)
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
164 + {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
165 + pos = buffer.find(boundarySep, pos);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
166 +
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
167 + if (pos == string::npos ||
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
168 + ((pos == 0 || buffer[pos - 1] == '\n') &&
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
169 + (buffer[pos + boundarySep.length()] == '\r' ||
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
170 + buffer[pos + boundarySep.length()] == '\n' ||
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
171 + buffer[pos + boundarySep.length()] == '-'
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
172 + )
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
173 + )
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
174 + )
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
175 + {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
176 + break;
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
177 + }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
178 +
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
179 + // boundary not a beginning of line, or just a prefix of another, continue the search.
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
180 + pos++;
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
181 + }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
182 +
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
183 if (pos != string::npos && pos < end)
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
184 {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
185 m_prologText = string(buffer.begin() + position, buffer.begin() + pos);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
186 @@ -181,7 +201,26 @@ void body::parse(const string& buffer, const string::size_type position,
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
187 }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
188
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
189 partStart = pos;
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
190 - pos = buffer.find(boundarySep, partStart);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
191 +
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
192 + while (pos != string::npos && pos < end)
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
193 + {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
194 + pos = buffer.find(boundarySep, pos);
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
195 +
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
196 + if (pos == string::npos ||
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
197 + ((pos == 0 || buffer[pos - 1] == '\n') &&
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
198 + (buffer[pos + boundarySep.length()] == '\r' ||
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
199 + buffer[pos + boundarySep.length()] == '\n' ||
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
200 + buffer[pos + boundarySep.length()] == '-'
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
201 + )
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
202 + )
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
203 + )
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
204 + {
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
205 + break;
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
206 + }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
207 +
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
208 + // boundary not a beginning of line, or just a prefix of another, continue the search.
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
209 + pos++;
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
210 + }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
211 }
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
212
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
213 m_contents = vmime::create <emptyContentHandler>();
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
214 diff --git a/tests/parser/bodyPartTest.cpp b/tests/parser/bodyPartTest.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
215 index 12c4f74..df2bf85 100644
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
216 --- a/tests/parser/bodyPartTest.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
217 +++ b/tests/parser/bodyPartTest.cpp
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
218 @@ -84,7 +84,7 @@ VMIME_TEST_SUITE_BEGIN
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
219 vmime::string str =
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
220 "Content-Type: multipart/mixed; boundary=\"MY-BOUNDARY\""
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
221 "\r\n\r\n"
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
222 - "--MY-BOUNDARY\r\nHEADER1\r\n\r\nBODY1"
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
223 + "--MY-BOUNDARY\r\nHEADER1\r\n\r\nBODY1\r\n"
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
224 "--MY-BOUNDARY\r\nHEADER2\r\n\r\nBODY2";
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
225
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
226 vmime::bodyPart p;
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
227 --
1659
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
228 1.7.4.1
1506
9b092697dd12 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
229
1565
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
230
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
231 From b6d2b4765c9472ff333cace13c57c6af0e866ee0 Mon Sep 17 00:00:00 2001
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
232 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
233 Date: Fri, 21 Jan 2011 15:28:06 +0000
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
234 Subject: [PATCH 5/8] Fixed possible infinite loop (thanks to John van der Kamp, Zarafa).
1565
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
235
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
236 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@582 5301114d-f842-0410-bbdd-996ee0417009
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
237
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
238 diff --git a/src/word.cpp b/src/word.cpp
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
239 index db720dc..1c1c1a6 100644
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
240 --- a/src/word.cpp
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
241 +++ b/src/word.cpp
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
242 @@ -386,7 +386,7 @@ void word::generate(utility::outputStream& os, const string::size_type maxLineLe
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
243
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
244 maxRunLength = std::max(maxRunLength, curRunLength);
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
245
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
246 - if (maxRunLength >= maxLineLength - 3)
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
247 + if (((flags & text::FORCE_NO_ENCODING) == 0) && maxRunLength >= maxLineLength - 3)
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
248 {
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
249 // Generate with encoding forced
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
250 generate(os, maxLineLength, curLinePos, newLinePos, flags | text::FORCE_ENCODING, state);
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
251 diff --git a/tests/parser/textTest.cpp b/tests/parser/textTest.cpp
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
252 index b84f376..746ac94 100644
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
253 --- a/tests/parser/textTest.cpp
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
254 +++ b/tests/parser/textTest.cpp
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
255 @@ -52,6 +52,7 @@ VMIME_TEST_SUITE_BEGIN
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
256 VMIME_TEST(testWhitespaceMBox)
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
257
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
258 VMIME_TEST(testFoldingAscii)
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
259 + VMIME_TEST(testForcedNonEncoding)
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
260 VMIME_TEST_LIST_END
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
261
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
262
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
263 @@ -442,5 +443,15 @@ VMIME_TEST_SUITE_BEGIN
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
264 " =?us-ascii?Q?9012345678901234567890123456789?=", w.generate(50));
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
265 }
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
266
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
267 + void testForcedNonEncoding()
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
268 + {
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
269 + // Testing long unbreakable and unencodable header
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
270 + vmime::relay r;
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
271 + r.parse(" from User (Ee9GMqZQ8t7IQwftfAFHd2KyScCYRrFSJ50tKEoXv2bVCG4HcPU80GGWiFabAvG77FekpGgF1h@[127.0.0.1]) by servername.hostname.com\n\t"
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
272 + "with esmtp id 1NGTS9-2C0sqG0; Fri, 4 Dec 2009 09:23:49 +0100");
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
273 +
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
274 + VASSERT_EQ("received.long", "from User\r\n (Ee9GMqZQ8t7IQwftfAFHd2KyScCYRrFSJ50tKEoXv2bVCG4HcPU80GGWiFabAvG77FekpGgF1h@[127.0.0.1])\r\n by servername.hostname.com with esmtp id 1NGTS9-2C0sqG0; Fri, 4 Dec 2009\r\n 09:23:49 +0100", r.generate(78));
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
275 + }
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
276 +
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
277 VMIME_TEST_SUITE_END
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
278
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
279 --
1659
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
280 1.7.4.1
1565
249814876c3a cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1506
diff changeset
281
1567
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
282
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
283 From 022339ab63430d792d0314f51dd7854eabd5736e Mon Sep 17 00:00:00 2001
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
284 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
285 Date: Fri, 28 Jan 2011 12:11:08 +0000
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
286 Subject: [PATCH 6/8] Fixed possible read to invalid memory location (thanks to Alexander Konovalov).
1567
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
287
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
288 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@583 5301114d-f842-0410-bbdd-996ee0417009
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
289
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
290 diff --git a/src/word.cpp b/src/word.cpp
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
291 index 1c1c1a6..fa08d33 100644
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
292 --- a/src/word.cpp
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
293 +++ b/src/word.cpp
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
294 @@ -460,7 +460,7 @@ void word::generate(utility::outputStream& os, const string::size_type maxLineLe
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
295
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
296 os << string(curLineStart, p);
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
297
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
298 - if (parserHelpers::isSpace(*(p - 1)))
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
299 + if (p != m_buffer.begin() && parserHelpers::isSpace(*(p - 1)))
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
300 state->lastCharIsSpace = true;
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
301 else
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
302 state->lastCharIsSpace = false;
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
303 --
1659
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
304 1.7.4.1
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
305
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
306
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
307 From 7f1024917b3df6be013e18a2e0f0f1b13f4d112b Mon Sep 17 00:00:00 2001
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
308 From: vincent-richard <vincent-richard@5301114d-f842-0410-bbdd-996ee0417009>
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
309 Date: Wed, 9 Mar 2011 18:03:31 +0000
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
310 Subject: [PATCH 7/8] Fixed bug #3174903. Fixed word parsing when buffer does not end with NL. Fixed 'no encoding' when forced.
1659
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
311
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
312 git-svn-id: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk@584 5301114d-f842-0410-bbdd-996ee0417009
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
313 (cherry picked from commit 07ebf241115eba44675223e307d212c772e1cc08)
1567
10fb4e947a6e cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1565
diff changeset
314
1659
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
315 diff --git a/src/body.cpp b/src/body.cpp
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
316 index 738d3e7..8596833 100644
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
317 --- a/src/body.cpp
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
318 +++ b/src/body.cpp
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
319 @@ -153,7 +153,10 @@ void body::parse(const string& buffer, const string::size_type position,
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
320
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
321 if (pos != string::npos && pos < end)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
322 {
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
323 - m_prologText = string(buffer.begin() + position, buffer.begin() + pos);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
324 + vmime::text text;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
325 + text.parse(buffer, position, pos);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
326 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
327 + m_prologText = text.getWholeBuffer();
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
328 }
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
329
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
330 for (int index = 0 ; !lastPart && (pos != string::npos) && (pos < end) ; ++index)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
331 @@ -246,7 +249,10 @@ void body::parse(const string& buffer, const string::size_type position,
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
332 // Treat remaining text as epilog
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
333 else if (partStart < end)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
334 {
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
335 - m_epilogText = string(buffer.begin() + partStart, buffer.begin() + end);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
336 + vmime::text text;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
337 + text.parse(buffer, partStart, end);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
338 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
339 + m_epilogText = text.getWholeBuffer();
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
340 }
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
341 }
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
342 // Treat the contents as 'simple' data
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
343 @@ -333,7 +339,7 @@ void body::generate(utility::outputStream& os, const string::size_type maxLineLe
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
344
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
345 if (!prologText.empty())
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
346 {
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
347 - text prolog(word(prologText, getCharset()));
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
348 + text prolog(prologText, vmime::charset("us-ascii"));
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
349
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
350 prolog.encodeAndFold(os, maxLineLength, 0,
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
351 NULL, text::FORCE_NO_ENCODING | text::NO_NEW_LINE_SEQUENCE);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
352 @@ -356,7 +362,7 @@ void body::generate(utility::outputStream& os, const string::size_type maxLineLe
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
353
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
354 if (!epilogText.empty())
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
355 {
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
356 - text epilog(word(epilogText, getCharset()));
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
357 + text epilog(epilogText, vmime::charset("us-ascii"));
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
358
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
359 epilog.encodeAndFold(os, maxLineLength, 0,
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
360 NULL, text::FORCE_NO_ENCODING | text::NO_NEW_LINE_SEQUENCE);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
361 diff --git a/src/word.cpp b/src/word.cpp
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
362 index fa08d33..aeaa737 100644
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
363 --- a/src/word.cpp
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
364 +++ b/src/word.cpp
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
365 @@ -102,7 +102,9 @@ ref <word> word::parseNext(const string& buffer, const string::size_type positio
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
366 ++pos;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
367
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
368 unencoded += buffer.substr(startPos, endPos - startPos);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
369 - unencoded += ' ';
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
370 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
371 + if (pos != end) // ignore white-spaces at end
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
372 + unencoded += ' ';
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
373
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
374 startPos = pos;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
375 continue;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
376 @@ -191,14 +193,15 @@ ref <word> word::parseNext(const string& buffer, const string::size_type positio
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
377 ++pos;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
378 }
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
379
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
380 - // Treat unencoded text at the end of the buffer
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
381 - if (end != startPos)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
382 - {
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
383 - if (startPos != pos && !isFirst && prevIsEncoded)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
384 - unencoded += whiteSpaces;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
385 + if (startPos != end && !isFirst && prevIsEncoded)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
386 + unencoded += whiteSpaces;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
387
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
388 + if (startPos != end)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
389 unencoded += buffer.substr(startPos, end - startPos);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
390
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
391 + // Treat unencoded text at the end of the buffer
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
392 + if (!unencoded.empty())
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
393 + {
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
394 ref <word> w = vmime::create <word>(unencoded, charset(charsets::US_ASCII));
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
395 w->setParsedBounds(position, end);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
396
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
397 @@ -337,12 +340,14 @@ void word::generate(utility::outputStream& os, const string::size_type maxLineLe
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
398 state = &defaultGeneratorState;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
399
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
400 // Find out if encoding is forced or required by contents + charset
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
401 - bool encodingNeeded = (flags & text::FORCE_ENCODING) != 0;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
402 + bool encodingNeeded = false;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
403
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
404 - if (encodingNeeded == false)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
405 - encodingNeeded = wordEncoder::isEncodingNeeded(m_buffer, m_charset);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
406 - else if ((flags & text::FORCE_NO_ENCODING) != 0)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
407 + if ((flags & text::FORCE_NO_ENCODING) != 0)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
408 encodingNeeded = false;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
409 + else if ((flags & text::FORCE_ENCODING) != 0)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
410 + encodingNeeded = true;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
411 + else // auto-detect
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
412 + encodingNeeded = wordEncoder::isEncodingNeeded(m_buffer, m_charset);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
413
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
414 // If possible and requested (with flag), quote the buffer (no folding is performed).
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
415 // Quoting is possible if and only if:
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
416 diff --git a/tests/parser/bodyPartTest.cpp b/tests/parser/bodyPartTest.cpp
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
417 index df2bf85..b129913 100644
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
418 --- a/tests/parser/bodyPartTest.cpp
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
419 +++ b/tests/parser/bodyPartTest.cpp
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
420 @@ -34,6 +34,8 @@ VMIME_TEST_SUITE_BEGIN
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
421 VMIME_TEST(testParse)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
422 VMIME_TEST(testGenerate)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
423 VMIME_TEST(testParseMissingLastBoundary)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
424 + VMIME_TEST(testPrologEpilog)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
425 + VMIME_TEST(testPrologEncoding)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
426 VMIME_TEST_LIST_END
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
427
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
428
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
429 @@ -105,5 +107,79 @@ VMIME_TEST_SUITE_BEGIN
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
430 VASSERT_EQ("1", "Foo: bar\r\n\r\nBaz", p1.generate());
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
431 }
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
432
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
433 + void testPrologEpilog()
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
434 + {
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
435 + const char testMail[] =
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
436 + "To: test@vmime.org\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
437 + "From: test@vmime.org\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
438 + "Subject: Prolog and epilog test\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
439 + "Content-Type: multipart/mixed; \r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
440 + " boundary=\"=_boundary\"\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
441 + "\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
442 + "Prolog text\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
443 + "--=_boundary\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
444 + "Content-Type: text/plain\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
445 + "\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
446 + "Part1\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
447 + "--=_boundary--\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
448 + "Epilog text";
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
449 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
450 + vmime::bodyPart part;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
451 + part.parse(testMail);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
452 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
453 + VASSERT_EQ("prolog", "Prolog text", part.getBody()->getPrologText());
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
454 + VASSERT_EQ("epilog", "Epilog text", part.getBody()->getEpilogText());
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
455 + }
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
456 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
457 + // Test for bug fix: prolog should not be encoded
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
458 + // http://sourceforge.net/tracker/?func=detail&atid=525568&aid=3174903&group_id=69724
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
459 + void testPrologEncoding()
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
460 + {
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
461 + const char testmail[] =
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
462 + "To: test@vmime.org\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
463 + "From: test@vmime.org\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
464 + "Subject: Prolog encoding test\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
465 + "Content-Type: multipart/mixed; \r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
466 + " boundary=\"=_+ZWjySayKqSf2CyrfnNpaAcO6-G1HpoXdHZ4YyswAWqEY39Q\"\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
467 + "\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
468 + "This is a multi-part message in MIME format. Your mail reader does not\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
469 + "understand MIME message format.\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
470 + "--=_+ZWjySayKqSf2CyrfnNpaAcO6-G1HpoXdHZ4YyswAWqEY39Q\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
471 + "Content-Type: text/html; charset=windows-1251\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
472 + "Content-Transfer-Encoding: quoted-printable\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
473 + "\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
474 + "=DD=F2=EE =F2=E5=EA=F1=F2=EE=E2=E0=FF =F7=E0=F1=F2=FC =F1=EB=EE=E6=ED=EE=E3=\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
475 + "=EE =F1=EE=EE=E1=F9=E5=ED=E8=FF\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
476 + "--=_+ZWjySayKqSf2CyrfnNpaAcO6-G1HpoXdHZ4YyswAWqEY39Q\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
477 + "Content-Type: application/octet-stream; charset=windows-1251\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
478 + "Content-Disposition: attachment; filename=FNS.zip\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
479 + "Content-Transfer-Encoding: base64\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
480 + "\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
481 + "UEsDBB...snap...EEAAAAAA==\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
482 + "--=_+ZWjySayKqSf2CyrfnNpaAcO6-G1HpoXdHZ4YyswAWqEY39Q--\r\n"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
483 + "Epilog text";
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
484 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
485 + vmime::ref<vmime::message> msg = vmime::create<vmime::message>();
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
486 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
487 + std::string istr(testmail);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
488 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
489 + std::string ostr;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
490 + vmime::utility::outputStreamStringAdapter out(ostr);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
491 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
492 + for (int i = 0 ; i < 10 ; ++i)
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
493 + {
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
494 + ostr.clear();
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
495 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
496 + msg->parse(istr);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
497 + msg->generate(out);
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
498 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
499 + istr = ostr;
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
500 + }
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
501 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
502 + VASSERT_EQ("prolog", "This is a multi-part message in MIME format. Your mail reader"
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
503 + " does not understand MIME message format.", msg->getBody()->getPrologText());
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
504 + VASSERT_EQ("epilog", "Epilog text", msg->getBody()->getEpilogText());
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
505 + }
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
506 +
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
507 VMIME_TEST_SUITE_END
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
508
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
509 --
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
510 1.7.4.1
60b6921403e5 cherry-picked fixes for package vmime
Mark Brand <mabrand@mabrand.nl>
parents: 1567
diff changeset
511
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
512
1668
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
513 From 720396d3bf9803f2cd5651ed9ee27b8b39d60145 Mon Sep 17 00:00:00 2001
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
514 From: Mark Brand <mabrand@mabrand.nl>
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
515 Date: Tue, 15 Mar 2011 15:59:05 +0100
1668
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
516 Subject: [PATCH 8/8] add dependencies to .pc file
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
517
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
518
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
519 diff --git a/SConstruct b/SConstruct
1668
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
520 index fb01edf..6e8aba2 100644
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
521 --- a/SConstruct
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
522 +++ b/SConstruct
1668
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
523 @@ -1089,7 +1089,7 @@ def generateAutotools(target, source, env):
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
524 vmime_pc_in.write("Description: " + packageDescription + "\n")
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
525 vmime_pc_in.write("Version: @VERSION@\n")
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
526 vmime_pc_in.write("Requires: @GSASL_REQUIRED@\n")
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
527 - vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n")
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
528 + vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n")
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
529 #vmime_pc_in.write("Cflags: -I${includedir}/@GENERIC_VERSIONED_LIBRARY_NAME@\n")
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
530 vmime_pc_in.write("Cflags: -I${includedir}/ @LIBGNUTLS_CFLAGS@\n")
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
531 vmime_pc_in.close()
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
532 @@ -1709,7 +1709,7 @@ fi
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
533
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
534 # -- Link with Winsock (Windows)
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
535 if test "x$VMIME_DETECT_PLATFORM" = "xwindows"; then
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
536 - VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lwsock32"
1668
4ee38be1b1cd package vmime: fix and use .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1660
diff changeset
537 + VMIME_ADDITIONAL_PC_LIBS="$VMIME_ADDITIONAL_PC_LIBS -lws2_32"
1660
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
538 fi
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
539
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
540 # -- getaddrinfo (POSIX)
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
541 --
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
542 1.7.4.1
2af2bc5dca3f package vmime: fix .pc file
Mark Brand <mabrand@mabrand.nl>
parents: 1659
diff changeset
543