# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1449478114 -3600
# Node ID 09a737a6bf3698bad6a520f11c416de93e20d471
# Parent  e8146c9c28a4c821d4ce55d1e1cf10284ed7e35b# Parent  a6c431193c79bdd0b8c987731ef40116e4d6b59f
merge

diff -r a6c431193c79 -r 09a737a6bf36 NEWS
--- a/NEWS	Sat Dec 05 12:45:19 2015 +0100
+++ b/NEWS	Mon Dec 07 09:48:34 2015 +0100
@@ -3,6 +3,7 @@
 
 * Fix modality worklists server if some fields are null
 * More tolerant "/series/.../ordered-slices" with broken series
+* Promiscuous mode is now turned off by default
 * Improved logging information if upgrade fails
 
 
diff -r a6c431193c79 -r 09a737a6bf36 OrthancServer/main.cpp
--- a/OrthancServer/main.cpp	Sat Dec 05 12:45:19 2015 +0100
+++ b/OrthancServer/main.cpp	Mon Dec 07 09:48:34 2015 +0100
@@ -269,7 +269,7 @@
       }
     }
 
-    return Configuration::GetGlobalBoolParameter(configuration, true);
+    return Configuration::GetGlobalBoolParameter(configuration, false);
   }
 };
 
diff -r a6c431193c79 -r 09a737a6bf36 Resources/Configuration.json
--- a/Resources/Configuration.json	Sat Dec 05 12:45:19 2015 +0100
+++ b/Resources/Configuration.json	Mon Dec 07 09:48:34 2015 +0100
@@ -104,7 +104,7 @@
 
   // Whether Orthanc accepts to act as C-Store SCP for unknown storage
   // SOP classes (aka. "promiscuous mode")
-  "UnknownSopClassAccepted"            : true,
+  "UnknownSopClassAccepted"            : false,