[or-cvs] r10807: Backport r10148: open cached-routers with FILE_SHARE_READ on (in tor/branches/tor-0_1_2-patches: . doc src/common)

[nickm at seul.org]

Author: nickm
Date: 2007-07-12 12:17:23 -0400 (Thu, 12 Jul 2007)
New Revision: 10807

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/doc/TODO.012
   tor/branches/tor-0_1_2-patches/src/common/compat.c
Log:
 r13714 at catbus:  nickm | 2007-07-12 12:08:35 -0400
 Backport r10148: open cached-routers with FILE_SHARE_READ on win32.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r13714] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-07-12 16:17:20 UTC (rev 10806)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-07-12 16:17:23 UTC (rev 10807)
@@ -16,6 +16,8 @@
       correctly.  Previously, we were under-counting by 1.
 
   o Minor bugfixes (misc)
+    - On Windows, we were preventing other processes from reading
+      cached-routers while Tor was running.  (Reported by janbar)
     - Backport miscellaneous cosmetic bugfixes.
 
 

Modified: tor/branches/tor-0_1_2-patches/doc/TODO.012
===================================================================
--- tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-07-12 16:17:20 UTC (rev 10806)
+++ tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-07-12 16:17:23 UTC (rev 10807)
@@ -1,5 +1,5 @@
 Backport items for 0.1.2:
-  - r10148: open cached-routers with FILE_SHARE_READ on win32.
+  o r10148: open cached-routers with FILE_SHARE_READ on win32.
   o r10240,10242: avoid choosing family of exit as guard.
   o r10248: handle lack of nul at end of mmaped data.
   - r10346: Try even harder not to look at the first byte after an mmap.

Modified: tor/branches/tor-0_1_2-patches/src/common/compat.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/common/compat.c	2007-07-12 16:17:20 UTC (rev 10806)
+++ tor/branches/tor-0_1_2-patches/src/common/compat.c	2007-07-12 16:17:23 UTC (rev 10807)
@@ -199,8 +199,8 @@
   res->mmap_handle = NULL;
 
   res->file_handle = CreateFile(filename,
-                                GENERIC_READ,
-                                0, NULL,
+                                GENERIC_READ, FILE_SHARE_READ,
+                                NULL,
                                 OPEN_EXISTING,
                                 FILE_ATTRIBUTE_NORMAL,
                                 0);