Changeset 5112:4411620e877b for imap/imap.c

Timestamp:

2007-04-10 16:07:53 (21 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Do not hold hcache open while mailbox is open - it can lead to lockups

Files:

• imap/imap.c (modified) (6 diffs)

imap/imap.c

@@ -249 +249 @@
   int i, cacheno;
 
+#ifdef USE_HCACHE
+  imap_hcache_open (idata);
+#endif
+
   for (i = 0; i < idata->ctx->msgcount; i++)
   {
@@ -277 +281 @@
     }
   }
+
+#if USE_HCACHE
+  imap_hcache_close (idata);
+#endif
 
   /* We may be called on to expunge at any time. We can't rely on the caller
@@ -735 +743 @@
   ctx->v2r = safe_calloc (count, sizeof (int));
   ctx->msgcount = 0;
-#ifdef USE_HCACHE
-  idata->hcache = imap_hcache_open (idata, idata->ctx->path);
-#endif
+
   if (count && (imap_read_headers (idata, 0, count-1) < 0))
   {
@@ -1140 +1146 @@
   }
 
+#if USE_HCACHE
+  imap_hcache_open (idata);
+#endif
+
   /* save messages with real (non-flag) changes */
   for (n = 0; n < ctx->msgcount; n++)
@@ -1175 +1185 @@
   }
 
+#if USE_HCACHE
+  imap_hcache_close (idata);
+#endif
+
   /* sync +/- flags for the five flags mutt cares about */
   rc = 0;
@@ -1308 +1322 @@
   }
 
-#ifdef USE_HCACHE
-  mutt_hcache_close (idata->hcache);
-  idata->hcache = NULL;
-#endif
   mutt_bcache_close (&idata->bcache);