diff Resources/Configuration.json @ 1308:f7966e9950e4 db-changes

integration mainline->db-changes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 11 Feb 2015 10:32:14 +0100
parents 21ea32170764
children 60cc0ee61edb
line wrap: on
line diff
--- a/Resources/Configuration.json	Tue Nov 04 13:56:17 2014 +0100
+++ b/Resources/Configuration.json	Wed Feb 11 10:32:14 2015 +0100
@@ -35,7 +35,9 @@
 
   // List of paths to the plugins that are to be loaded into this
   // instance of Orthanc (e.g. "./libPluginTest.so" for Linux, or
-  // "./PluginTest.dll" for Windows).
+  // "./PluginTest.dll" for Windows). These paths can refer to
+  // folders, in which case they will be scanned non-recursively to
+  // find shared libraries.
   "Plugins" : [
   ],
 
@@ -138,6 +140,11 @@
     // "peer2" : [ "http://localhost:8044/" ]
   },
 
+  // Parameters of the HTTP proxy to be used by Orthanc. If set to the
+  // empty string, no HTTP proxy is used. For instance:
+  //   "HttpProxy" : "192.168.0.1:3128"
+  //   "HttpProxy" : "proxyUser:proxyPassword@192.168.0.1:3128"
+  "HttpProxy" : "",
 
 
   /**
@@ -203,11 +210,17 @@
   // to grow indefinitely in auto-routing tasks.
   "LogExportedResources" : true,
 
-  // Enable or disable HTTP Keep-Alive (experimental). Set this option
+  // Enable or disable HTTP Keep-Alive (deprecated). Set this option
   // to "true" only in the case of high HTTP loads.
   "KeepAlive" : false,
 
   // If this option is set to "false", Orthanc will run in index-only
   // mode. The DICOM files will not be stored on the drive.
-  "StoreDicom" : true
+  "StoreDicom" : true,
+
+  // DICOM associations are kept open as long as new DICOM commands
+  // are issued. This option sets the number of seconds of inactivity
+  // to wait before automatically closing a DICOM association. If set
+  // to 0, the connection is closed immediately.
+  "DicomAssociationCloseDelay" : 5
 }