summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/common/ers.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5b48c9699..f200e09a1 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/12/13
+ * Disabled ers until recent crashes are fixed.
+ - ers entries are being corrupted, probably by modifying them after they
+ are released or by releasing something else
* Abstracted the windows socket code so that all fd's are in the range
[1,FD_SETSIZE[. (bugreport:604)
- The socket of a fd is forgotten when executing sClose, so things that
diff --git a/src/common/ers.h b/src/common/ers.h
index a9ba50073..269681410 100644
--- a/src/common/ers.h
+++ b/src/common/ers.h
@@ -59,7 +59,7 @@
* All code except the typedef of ERInterface will be disabled.
* To allow a smooth transition,
*/
-//#define DISABLE_ERS
+#define DISABLE_ERS
/**
* Entries are aligned to ERS_ALIGNED bytes in the blocks of entries.