projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e3d2a3
)
* Fixed bug #467, possibly at the cost of poorer performance.
author
Art Cancro
<ajc@citadel.org>
Mon, 1 Jun 2009 16:44:38 +0000
(16:44 +0000)
committer
Art Cancro
<ajc@citadel.org>
Mon, 1 Jun 2009 16:44:38 +0000
(16:44 +0000)
citadel/modules/imap/imap_fetch.c
patch
|
blob
|
history
diff --git
a/citadel/modules/imap/imap_fetch.c
b/citadel/modules/imap/imap_fetch.c
index b784be778f26012adb7cedf2a63a21d4d03ed8df..a311aa1ece44444f2c2b3845a50abce601150237 100644
(file)
--- a/
citadel/modules/imap/imap_fetch.c
+++ b/
citadel/modules/imap/imap_fetch.c
@@
-593,19
+593,6
@@
void imap_fetch_body(long msgnum, char *item, int is_peek) {
section,
IsEmptyStr(section) ? "(empty)" : "");
section,
IsEmptyStr(section) ? "(empty)" : "");
- /*
- * We used to have this great optimization in place that would avoid
- * fetching the entire RFC822 message from disk if the client was only
- * asking for the headers. Unfortunately, fetching only the Citadel
- * headers omits "Content-type:" and this behavior breaks the iPhone
- * email client. So we have to fetch the whole message from disk.
- *
- * if (!strncasecmp(section, "HEADER", 6)) {
- * need_body = 0;
- * }
- *
- */
-
/* Burn the cache if we don't have the same section of the
* same message again.
*/
/* Burn the cache if we don't have the same section of the
* same message again.
*/
@@
-665,7
+652,11
@@
void imap_fetch_body(long msgnum, char *item, int is_peek) {
* fields, strip it down.
*/
else if (!strncasecmp(section, "HEADER", 6)) {
* fields, strip it down.
*/
else if (!strncasecmp(section, "HEADER", 6)) {
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_FAST, 0, 1, 0);
+ /* This used to work with HEADERS_FAST, but then Apple got stupid with their
+ * IMAP library and this broke Mail.App and iPhone Mail, so we had to change it
+ * to HEADERS_ONLY so the trendy hipsters with their iPhones can read mail.
+ */
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ONLY, 0, 1, 0);
imap_strip_headers(section);
}
imap_strip_headers(section);
}