orthanc: Plugins/Engine/OrthancPlugins.cpp comparison

OrthancPluginHttpClient can return the HTTP headers of the answer

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 21 Jun 2016 17:08:09 +0200
parents	d108412411e5
children	21a8ca9ad928

comparison

equal deleted inserted replaced

-:6ea2e264ca50
+:9f61ca1e3eb3
 }
 client.SetClientCertificate(certificate, key, password);
 }
-	client.SetPkcs11Enabled(p.pkcs11 ? true : false);
+client.SetPkcs11Enabled(p.pkcs11 ? true : false);
 for (uint32_t i = 0; i < p.headersCount; i++)
 {
 if (p.headersKeys[i] == NULL ||
 p.headersValues[i] == NULL)
 default:
 throw OrthancException(ErrorCode_ParameterOutOfRange);
 }
-std::string s;
+std::string body;
+HttpClient::HttpHeaders headers;
-if (!client.Apply(s))
-{
+client.ApplyAndThrowException(body, headers);
-*p.httpStatus = 0;
-throw OrthancException(ErrorCode_NetworkProtocol);
+// The HTTP request has succeeded
-}
 *p.httpStatus = static_cast<uint16_t>(client.GetLastStatus());
+// Copy the HTTP headers of the answer, if the plugin requested them
+if (p.answerHeaders != NULL)
+{
+Json::Value json = Json::objectValue;
+for (HttpClient::HttpHeaders::const_iterator
+it = headers.begin(); it != headers.end(); ++it)
+{
+json[it->first] = it->second;
+}
+std::string s = json.toStyledString();
+CopyToMemoryBuffer(*p.answerHeaders, s);
+}
+// Copy the body of the answer if it makes sense
 if (p.method != OrthancPluginHttpMethod_Delete)
 {
-CopyToMemoryBuffer(*p.target, s);
+CopyToMemoryBuffer(*p.answerBody, body);
 }
 }
 void OrthancPlugins::ConvertPixelFormat(const void* parameters)

Mercurial > hg > orthanc