# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1349970650 -7200
# Node ID c7f1cea08f6f07370c74915568decc73d824ad3c
# Parent  efe5be1d6afc001677a3ebb1331d3d33b42b2c16# Parent  e7e19f042eb55e30b4bf4564eb58f037143ede11
merge

diff -r e7e19f042eb5 -r c7f1cea08f6f OrthancCppClient/HttpClient.cpp
--- a/OrthancCppClient/HttpClient.cpp	Thu Oct 11 13:57:56 2012 +0200
+++ b/OrthancCppClient/HttpClient.cpp	Thu Oct 11 17:50:50 2012 +0200
@@ -197,4 +197,12 @@
       return false;
     }
   }
+
+
+  void HttpClient::SetPassword(const char* username,
+			       const char* password)
+  {
+    std::string s = std::string(username) + ":" + std::string(password);
+    CheckCode(curl_easy_setopt(pimpl_->curl_, CURLOPT_USERPWD, s.c_str()));
+  }
 }
diff -r e7e19f042eb5 -r c7f1cea08f6f OrthancCppClient/HttpClient.h
--- a/OrthancCppClient/HttpClient.h	Thu Oct 11 13:57:56 2012 +0200
+++ b/OrthancCppClient/HttpClient.h	Thu Oct 11 17:50:50 2012 +0200
@@ -109,5 +109,7 @@
       return HttpException::GetDescription(lastStatus_);
     }
 
+    void SetPassword(const char* username,
+                     const char* password);
   };
 }
diff -r e7e19f042eb5 -r c7f1cea08f6f Resources/Configuration.json
--- a/Resources/Configuration.json	Thu Oct 11 13:57:56 2012 +0200
+++ b/Resources/Configuration.json	Thu Oct 11 17:50:50 2012 +0200
@@ -37,7 +37,7 @@
      **/
 
     // Whether remote hosts can connect to the HTTP server
-    "RemoteAccessAllowed" : true,
+    "RemoteAccessAllowed" : false,
 
     // Whether or not SSL is enabled
     "SslEnabled" : false,
diff -r e7e19f042eb5 -r c7f1cea08f6f Resources/EmbedResources.py
--- a/Resources/EmbedResources.py	Thu Oct 11 13:57:56 2012 +0200
+++ b/Resources/EmbedResources.py	Thu Oct 11 17:50:50 2012 +0200
@@ -1,3 +1,33 @@
+# Orthanc - A Lightweight, RESTful DICOM Store
+# Copyright (C) 2012 Medical Physics Department, CHU of Liege,
+# Belgium
+#
+# This program is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# In addition, as a special exception, the copyright holders of this
+# program give permission to link the code of its release with the
+# OpenSSL project's "OpenSSL" library (or with modified versions of it
+# that use the same license as the "OpenSSL" library), and distribute
+# the linked executables. You must obey the GNU General Public License
+# in all respects for all of the code used other than "OpenSSL". If you
+# modify file(s) with this exception, you may extend this exception to
+# your version of the file(s), but you are not obligated to do so. If
+# you do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source files
+# in the program, then also delete it here.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
 import sys
 import os
 import os.path