mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse source
This commit is contained in:
Nick Mathewson 2013-06-12 13:01:14 -04:00
commit 616fd790ec
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
changes/bug2077_share_delete
View file

@ -1,7 +0,0 @@
o Major bugfixes (windows):
- Open files to be mapped with FILE_SHARE_DELETE so that we can
replace them before closing the mapping. This is a likely cause of
warnings and crashes when replacing the microdescriptor cache
file. Diagnosed based on comments by "doorss" and by Robert
Ransom. Possible fix for bug 2077; bugfix on 0.2.2.6-alpha.

2
src/common/compat.c
View file

@ -248,7 +248,7 @@ tor_mmap_file(const char *filename)
strlcpy(tfilename,filename,MAX_PATH);
#endif
file_handle = CreateFile(tfilename,
GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE,
GENERIC_READ, FILE_SHARE_READ,
NULL,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL,