orthanc: Core/HttpServer/HttpOutput.cpp annotate

annotate Core/HttpServer/HttpOutput.cpp @ 3951:5fe8c6d3212e transcoding

removed useless information "hasSopInstanceUidChanged"

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 19 May 2020 21:06:53 +0200
parents	94f4a18a79cc
children

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1882 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1200 diff changeset	4 * Department, University Hospital of Liege, Belgium
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3616 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	11 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	13 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	22 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	34 #include "../PrecompiledHeaders.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "HttpOutput.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
3380 0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	37 #include "../ChunkedBuffer.h"
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	38 #include "../Compression/GzipCompressor.h"
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	39 #include "../Compression/ZlibCompressor.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	40 #include "../Logging.h"
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	41 #include "../OrthancException.h"
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	42 #include "../Toolbox.h"
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	43
324 64925c94825c api improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	44 #include <iostream>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 #include <vector>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 #include <stdio.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 #include <boost/lexical_cast.hpp>
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	48
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	50 #if ORTHANC_ENABLE_CIVETWEB == 1
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	51 # if !defined(CIVETWEB_HAS_DISABLE_KEEP_ALIVE)
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	52 # error Macro CIVETWEB_HAS_DISABLE_KEEP_ALIVE must be defined
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	53 # endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	54 #endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	55
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	56
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	57 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 {
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	59 HttpOutput::StateMachine::StateMachine(IHttpOutputStream& stream,
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	60 bool isKeepAlive) :
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	61 stream_(stream),
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	62 state_(State_WritingHeader),
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	63 status_(HttpStatus_200_Ok),
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	64 hasContentLength_(false),
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	65 contentPosition_(0),
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	66 keepAlive_(isKeepAlive)
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	67 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	68 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	69
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	70 HttpOutput::StateMachine::~StateMachine()
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	71 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	72 if (state_ != State_Done)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	73 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	74 //asm volatile ("int3;");
1200 1e1390665639 fix sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 1115 diff changeset	75 //LOG(ERROR) << "This HTTP answer does not contain any body";
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	76 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	77
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	78 if (hasContentLength_ && contentPosition_ != contentLength_)
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	79 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	80 LOG(ERROR) << "This HTTP answer has not sent the proper number of bytes in its body";
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	81 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	82 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	83
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	84
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	85 void HttpOutput::StateMachine::SetHttpStatus(HttpStatus status)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	86 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	87 if (state_ != State_WritingHeader)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	88 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	89 throw OrthancException(ErrorCode_BadSequenceOfCalls);
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	90 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	91
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	92 status_ = status;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	93 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	94
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	95
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	96 void HttpOutput::StateMachine::SetContentLength(uint64_t length)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	97 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	98 if (state_ != State_WritingHeader)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	99 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	100 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	101 }
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	102
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	103 hasContentLength_ = true;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	104 contentLength_ = length;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	105 }
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	106
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	107 void HttpOutput::StateMachine::SetContentType(const char* contentType)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	108 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	109 AddHeader("Content-Type", contentType);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	110 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	111
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	112 void HttpOutput::StateMachine::SetContentFilename(const char* filename)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	113 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	114 // TODO Escape double quotes
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	115 AddHeader("Content-Disposition", "filename=\"" + std::string(filename) + "\"");
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	116 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	117
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	118 void HttpOutput::StateMachine::SetCookie(const std::string& cookie,
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	119 const std::string& value)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	120 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	121 if (state_ != State_WritingHeader)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	122 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	123 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	124 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	125
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	126 // TODO Escape "=" characters
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	127 AddHeader("Set-Cookie", cookie + "=" + value);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	128 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	129
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	130
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	131 void HttpOutput::StateMachine::AddHeader(const std::string& header,
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	132 const std::string& value)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	133 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	134 if (state_ != State_WritingHeader)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	135 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	136 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	137 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	138
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	139 headers_.push_back(header + ": " + value + "\r\n");
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	140 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	141
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	142 void HttpOutput::StateMachine::ClearHeaders()
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	143 {
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	144 if (state_ != State_WritingHeader)
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	145 {
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	146 throw OrthancException(ErrorCode_BadSequenceOfCalls);
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	147 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	148
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	149 headers_.clear();
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	150 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	151
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	152 void HttpOutput::StateMachine::SendBody(const void* buffer, size_t length)
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	153 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	154 if (state_ == State_Done)
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	155 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	156 if (length == 0)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	157 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	158 return;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	159 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	160 else
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	161 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	162 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	163 "Because of keep-alive connections, the entire body must "
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	164 "be sent at once or Content-Length must be given");
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	165 }
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	166 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	167
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	168 if (state_ == State_WritingMultipart)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	169 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	170 throw OrthancException(ErrorCode_InternalError);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	171 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	172
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	173 if (state_ == State_WritingHeader)
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	174 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	175 // Send the HTTP header before writing the body
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	176
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	177 stream_.OnHttpStatusReceived(status_);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	178
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	179 std::string s = "HTTP/1.1 " +
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	180 boost::lexical_cast<std::string>(status_) +
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	181 " " + std::string(EnumerationToString(status_)) +
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	182 "\r\n";
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	183
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	184 if (keepAlive_)
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	185 {
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	186 s += "Connection: keep-alive\r\n";
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	187 }
3171 81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	188 else
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	189 {
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	190 s += "Connection: close\r\n";
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	191 }
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	192
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	193 for (std::list<std::string>::const_iterator
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	194 it = headers_.begin(); it != headers_.end(); ++it)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	195 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	196 s += *it;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	197 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	198
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	199 if (status_ != HttpStatus_200_Ok)
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	200 {
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	201 hasContentLength_ = false;
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	202 }
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	203
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	204 uint64_t contentLength = (hasContentLength_ ? contentLength_ : length);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	205 s += "Content-Length: " + boost::lexical_cast<std::string>(contentLength) + "\r\n\r\n";
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	206
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	207 stream_.Send(true, s.c_str(), s.size());
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	208 state_ = State_WritingBody;
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	209 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	210
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	211 if (hasContentLength_ &&
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	212 contentPosition_ + length > contentLength_)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	213 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	214 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	215 "The body size exceeds what was declared with SetContentSize()");
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	216 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	217
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	218 if (length > 0)
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	219 {
911 306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 910 diff changeset	220 stream_.Send(false, buffer, length);
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	221 contentPosition_ += length;
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	222 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	223
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	224 if (!hasContentLength_ \|\|
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	225 contentPosition_ == contentLength_)
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	226 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	227 state_ = State_Done;
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	228 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	229 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	230
207 7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 155 diff changeset	231
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	232 void HttpOutput::StateMachine::CloseBody()
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	233 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	234 switch (state_)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	235 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	236 case State_WritingHeader:
1522 f938f7779bcb fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1521 diff changeset	237 SetContentLength(0);
f938f7779bcb fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1521 diff changeset	238 SendBody(NULL, 0);
f938f7779bcb fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1521 diff changeset	239 break;
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	240
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	241 case State_WritingBody:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	242 if (!hasContentLength_ \|\|
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	243 contentPosition_ == contentLength_)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	244 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	245 state_ = State_Done;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	246 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	247 else
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	248 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	249 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	250 "The body size has not reached what was declared with SetContentSize()");
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	251 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	252
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	253 break;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	254
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	255 case State_WritingMultipart:
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	256 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	257 "Cannot invoke CloseBody() with multipart outputs");
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	258
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	259 case State_Done:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	260 return; // Ignore
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	261
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	262 default:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	263 throw OrthancException(ErrorCode_InternalError);
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	264 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	265 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	266
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	267
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	268 HttpCompression HttpOutput::GetPreferredCompression(size_t bodySize) const
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	269 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	270 #if 0
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	271 // TODO Do not compress small files?
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	272 if (bodySize < 512)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	273 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	274 return HttpCompression_None;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	275 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	276 #endif
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	277
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	278 // Prefer "gzip" over "deflate" if the choice is offered
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	279
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	280 if (isGzipAllowed_)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	281 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	282 return HttpCompression_Gzip;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	283 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	284 else if (isDeflateAllowed_)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	285 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	286 return HttpCompression_Deflate;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	287 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	288 else
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	289 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	290 return HttpCompression_None;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	291 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	292 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	293
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	294
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 911 diff changeset	295 void HttpOutput::SendMethodNotAllowed(const std::string& allowed)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	297 stateMachine_.ClearHeaders();
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	298 stateMachine_.SetHttpStatus(HttpStatus_405_MethodNotAllowed);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	299 stateMachine_.AddHeader("Allow", allowed);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	300 stateMachine_.SendBody(NULL, 0);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303
1567 9c5d93510414 If error while calling the REST API, the answer body contains an error description jodogne parents: 1523 diff changeset	304 void HttpOutput::SendStatus(HttpStatus status,
9c5d93510414 If error while calling the REST API, the answer body contains an error description jodogne parents: 1523 diff changeset	305 const char* message,
9c5d93510414 If error while calling the REST API, the answer body contains an error description jodogne parents: 1523 diff changeset	306 size_t messageSize)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 {
1954 1845512f8914 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1953 diff changeset	308 if (status == HttpStatus_301_MovedPermanently \|\|
3425 2f6dcb9c8cc1 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3416 diff changeset	309 //status == HttpStatus_401_Unauthorized \|\|
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	310 status == HttpStatus_405_MethodNotAllowed)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	312 throw OrthancException(ErrorCode_ParameterOutOfRange,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	313 "Please use the dedicated methods to this HTTP status code in HttpOutput");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	316 stateMachine_.SetHttpStatus(status);
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	317 stateMachine_.SendBody(message, messageSize);
339 639272ef7615 answer raw buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	318 }
639272ef7615 answer raw buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	319
639272ef7615 answer raw buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	320
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321 void HttpOutput::Redirect(const std::string& path)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	323 stateMachine_.ClearHeaders();
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	324 stateMachine_.SetHttpStatus(HttpStatus_301_MovedPermanently);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	325 stateMachine_.AddHeader("Location", path);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	326 stateMachine_.SendBody(NULL, 0);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 }
908 e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	328
e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	329
e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	330 void HttpOutput::SendUnauthorized(const std::string& realm)
e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	331 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	332 stateMachine_.ClearHeaders();
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	333 stateMachine_.SetHttpStatus(HttpStatus_401_Unauthorized);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	334 stateMachine_.AddHeader("WWW-Authenticate", "Basic realm=\"" + realm + "\"");
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	335 stateMachine_.SendBody(NULL, 0);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	336 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	337
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	338
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	339 void HttpOutput::Answer(const void* buffer,
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	340 size_t length)
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	341 {
1511 7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	342 if (length == 0)
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	343 {
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	344 AnswerEmpty();
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	345 return;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	346 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	347
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	348 HttpCompression compression = GetPreferredCompression(length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	349
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	350 if (compression == HttpCompression_None)
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	351 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	352 stateMachine_.SetContentLength(length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	353 stateMachine_.SendBody(buffer, length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	354 return;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	355 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	356
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	357 std::string compressed, encoding;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	358
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	359 switch (compression)
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	360 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	361 case HttpCompression_Deflate:
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	362 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	363 encoding = "deflate";
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	364 ZlibCompressor compressor;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	365 // Do not prefix the buffer with its uncompressed size, to be compatible with "deflate"
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	366 compressor.SetPrefixWithUncompressedSize(false);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	367 compressor.Compress(compressed, buffer, length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	368 break;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	369 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	370
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	371 case HttpCompression_Gzip:
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	372 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	373 encoding = "gzip";
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	374 GzipCompressor compressor;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	375 compressor.Compress(compressed, buffer, length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	376 break;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	377 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	378
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	379 default:
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	380 throw OrthancException(ErrorCode_InternalError);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	381 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	382
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	383 LOG(TRACE) << "Compressing a HTTP answer using " << encoding;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	384
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	385 // The body is empty, do not use HTTP compression
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	386 if (compressed.size() == 0)
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	387 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	388 AnswerEmpty();
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	389 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	390 else
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	391 {
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	392 stateMachine_.AddHeader("Content-Encoding", encoding);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	393 stateMachine_.SetContentLength(compressed.size());
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	394 stateMachine_.SendBody(compressed.c_str(), compressed.size());
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	395 }
1511 7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	396
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	397 stateMachine_.CloseBody();
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	398 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	399
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	400
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	401 void HttpOutput::Answer(const std::string& str)
1511 7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	402 {
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	403 Answer(str.size() == 0 ? NULL : str.c_str(), str.size());
1511 7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	404 }
7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	405
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	406
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	407 void HttpOutput::AnswerEmpty()
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	408 {
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	409 stateMachine_.CloseBody();
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	410 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	411
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	412
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	413 void HttpOutput::StateMachine::CheckHeadersCompatibilityWithMultipart() const
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	414 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	415 for (std::list<std::string>::const_iterator
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	416 it = headers_.begin(); it != headers_.end(); ++it)
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	417 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	418 if (!Toolbox::StartsWith(*it, "Set-Cookie: "))
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	419 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	420 throw OrthancException(ErrorCode_BadSequenceOfCalls,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	421 "The only headers that can be set in multipart answers "
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	422 "are Set-Cookie (here: " + *it + " is set)");
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	423 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	424 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	425 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	426
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	427
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	428 static void PrepareMultipartMainHeader(std::string& boundary,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	429 std::string& contentTypeHeader,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	430 const std::string& subType,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	431 const std::string& contentType)
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	432 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	433 if (subType != "mixed" &&
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	434 subType != "related")
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	435 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	436 throw OrthancException(ErrorCode_ParameterOutOfRange);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	437 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	438
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	439 /**
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	440 * Fix for issue 54 ("Decide what to do wrt. quoting of multipart
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	441 * answers"). The "type" parameter in the "Content-Type" HTTP
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	442 * header must be quoted if it contains a forward slash "/". This
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	443 * is necessary for DICOMweb compatibility with OsiriX, but breaks
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	444 * compatibility with old releases of the client in the Orthanc
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	445 * DICOMweb plugin <= 0.3 (releases >= 0.4 work fine).
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	446 *
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	447 * Full history is available at the following locations:
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	448 * - In changeset 2248:69b0f4e8a49b:
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	449 * # hg history -v -r 2248
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	450 * - https://bitbucket.org/sjodogne/orthanc/issues/54/
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	451 * - https://groups.google.com/d/msg/orthanc-users/65zhIM5xbKI/TU5Q1_LhAwAJ
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	452 **/
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	453 std::string tmp;
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	454 if (contentType.find('/') == std::string::npos)
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	455 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	456 // No forward slash in the content type
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	457 tmp = contentType;
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	458 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	459 else
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	460 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	461 // Quote the content type because of the forward slash
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	462 tmp = "\"" + contentType + "\"";
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	463 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	464
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	465 boundary = Toolbox::GenerateUuid() + "-" + Toolbox::GenerateUuid();
3616 b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	466
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	467 /**
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	468 * Fix for issue #165: "Encapsulation boundaries must not appear
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	469 * within the encapsulations, and must be no longer than 70
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	470 * characters, not counting the two leading hyphens."
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	471 * https://tools.ietf.org/html/rfc1521
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	472 * https://bitbucket.org/sjodogne/orthanc/issues/165/
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	473 **/
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	474 if (boundary.size() != 36 + 1 + 36) // one UUID contains 36 characters
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	475 {
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	476 throw OrthancException(ErrorCode_InternalError);
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	477 }
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	478
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	479 boundary = boundary.substr(0, 70);
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	480
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	481 contentTypeHeader = ("multipart/" + subType + "; type=" + tmp + "; boundary=" + boundary);
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	482 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	483
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	484
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	485 void HttpOutput::StateMachine::StartMultipart(const std::string& subType,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	486 const std::string& contentType)
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	487 {
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	488 if (state_ != State_WritingHeader)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	489 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	490 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	491 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	492
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	493 if (status_ != HttpStatus_200_Ok)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	494 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	495 SendBody(NULL, 0);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	496 return;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	497 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	498
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	499 stream_.OnHttpStatusReceived(status_);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	500
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	501 std::string header = "HTTP/1.1 200 OK\r\n";
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	502
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	503 if (keepAlive_)
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	504 {
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	505 #if ORTHANC_ENABLE_MONGOOSE == 1
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	506 throw OrthancException(ErrorCode_NotImplemented,
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	507 "Multipart answers are not implemented together "
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	508 "with keep-alive connections if using Mongoose");
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	509
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	510 #elif ORTHANC_ENABLE_CIVETWEB == 1
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	511 # if CIVETWEB_HAS_DISABLE_KEEP_ALIVE == 1
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	512 // Turn off Keep-Alive for multipart answers
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	513 // https://github.com/civetweb/civetweb/issues/727
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	514 stream_.DisableKeepAlive();
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	515 header += "Connection: close\r\n";
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	516 # else
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	517 // The function "mg_disable_keep_alive()" is not available,
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	518 // let's continue with Keep-Alive. Performance of WADO-RS will
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	519 // decrease.
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	520 header += "Connection: keep-alive\r\n";
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	521 # endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	522
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	523 #else
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	524 # error Please support your embedded Web server here
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	525 #endif
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	526 }
3171 81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	527 else
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	528 {
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	529 header += "Connection: close\r\n";
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	530 }
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	531
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	532 // Possibly add the cookies
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	533 CheckHeadersCompatibilityWithMultipart();
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	534
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	535 for (std::list<std::string>::const_iterator
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	536 it = headers_.begin(); it != headers_.end(); ++it)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	537 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	538 header += *it;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	539 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	540
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	541 std::string contentTypeHeader;
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	542 PrepareMultipartMainHeader(multipartBoundary_, contentTypeHeader, subType, contentType);
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	543 multipartContentType_ = contentType;
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	544 header += ("Content-Type: " + contentTypeHeader + "\r\n\r\n");
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	545
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	546 stream_.Send(true, header.c_str(), header.size());
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	547 state_ = State_WritingMultipart;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	548 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	549
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	550
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	551 static void PrepareMultipartItemHeader(std::string& target,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	552 size_t length,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	553 const std::map<std::string, std::string>& headers,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	554 const std::string& boundary,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	555 const std::string& contentType)
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	556 {
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	557 target = "--" + boundary + "\r\n";
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	558
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	559 bool hasContentType = false;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	560 bool hasContentLength = false;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	561 bool hasMimeVersion = false;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	562
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	563 for (std::map<std::string, std::string>::const_iterator
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	564 it = headers.begin(); it != headers.end(); ++it)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	565 {
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	566 target += it->first + ": " + it->second + "\r\n";
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	567
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	568 std::string tmp;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	569 Toolbox::ToLowerCase(tmp, it->first);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	570
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	571 if (tmp == "content-type")
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	572 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	573 hasContentType = true;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	574 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	575
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	576 if (tmp == "content-length")
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	577 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	578 hasContentLength = true;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	579 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	580
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	581 if (tmp == "mime-version")
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	582 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	583 hasMimeVersion = true;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	584 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	585 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	586
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	587 if (!hasContentType)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	588 {
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	589 target += "Content-Type: " + contentType + "\r\n";
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	590 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	591
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	592 if (!hasContentLength)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	593 {
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	594 target += "Content-Length: " + boost::lexical_cast<std::string>(length) + "\r\n";
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	595 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	596
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	597 if (!hasMimeVersion)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	598 {
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	599 target += "MIME-Version: 1.0\r\n\r\n";
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	600 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	601 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	602
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	603
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	604 void HttpOutput::StateMachine::SendMultipartItem(const void* item,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	605 size_t length,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	606 const std::map<std::string, std::string>& headers)
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	607 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	608 if (state_ != State_WritingMultipart)
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	609 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	610 throw OrthancException(ErrorCode_BadSequenceOfCalls);
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	611 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	612
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	613 std::string header;
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	614 PrepareMultipartItemHeader(header, length, headers, multipartBoundary_, multipartContentType_);
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	615 stream_.Send(false, header.c_str(), header.size());
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	616
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	617 if (length > 0)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	618 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	619 stream_.Send(false, item, length);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	620 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	621
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	622 stream_.Send(false, "\r\n", 2);
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	623 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	624
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	625
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	626 void HttpOutput::StateMachine::CloseMultipart()
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	627 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	628 if (state_ != State_WritingMultipart)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	629 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	630 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	631 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	632
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	633 // The two lines below might throw an exception, if the client has
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	634 // closed the connection. Such an error is ignored.
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	635 try
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	636 {
1832 b7da58699f92 Fix formatting of multipart HTTP answers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	637 std::string header = "--" + multipartBoundary_ + "--\r\n";
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	638 stream_.Send(false, header.c_str(), header.size());
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	639 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	640 catch (OrthancException&)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	641 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	642 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	643
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	644 state_ = State_Done;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	645 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	646
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	647
3380 0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	648 static void AnswerStreamAsBuffer(HttpOutput& output,
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	649 IHttpStreamAnswer& stream)
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	650 {
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	651 ChunkedBuffer buffer;
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	652
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	653 while (stream.ReadNextChunk())
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	654 {
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	655 if (stream.GetChunkSize() > 0)
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	656 {
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	657 buffer.AddChunk(stream.GetChunkContent(), stream.GetChunkSize());
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	658 }
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	659 }
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	660
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	661 std::string s;
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	662 buffer.Flatten(s);
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	663
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	664 output.SetContentType(stream.GetContentType());
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	665
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	666 std::string filename;
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	667 if (stream.HasContentFilename(filename))
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	668 {
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	669 output.SetContentFilename(filename.c_str());
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	670 }
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	671
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	672 output.Answer(s);
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	673 }
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	674
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	675
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	676 void HttpOutput::Answer(IHttpStreamAnswer& stream)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	677 {
1523 c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	678 HttpCompression compression = stream.SetupHttpCompression(isGzipAllowed_, isDeflateAllowed_);
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	679
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	680 switch (compression)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	681 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	682 case HttpCompression_None:
3380 0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	683 {
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	684 if (isGzipAllowed_ \|\| isDeflateAllowed_)
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	685 {
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	686 // New in Orthanc 1.5.7: Compress streams without built-in
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	687 // compression, if requested by the "Accept-Encoding" HTTP
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	688 // header
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	689 AnswerStreamAsBuffer(*this, stream);
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	690 return;
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	691 }
0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	692
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	693 break;
3380 0528a6c36f3d HTTP header "Accept-Encoding" is honored for streams without built-in support for compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 3178 diff changeset	694 }
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	695
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	696 case HttpCompression_Gzip:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	697 stateMachine_.AddHeader("Content-Encoding", "gzip");
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	698 break;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	699
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	700 case HttpCompression_Deflate:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	701 stateMachine_.AddHeader("Content-Encoding", "deflate");
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	702 break;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	703
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	704 default:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	705 throw OrthancException(ErrorCode_ParameterOutOfRange);
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	706 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	707
1523 c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	708 stateMachine_.SetContentLength(stream.GetContentLength());
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	709
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	710 std::string contentType = stream.GetContentType();
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	711 if (contentType.empty())
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	712 {
2905 ae20fccdd867 refactoring mime types Sebastien Jodogne <s.jodogne@gmail.com> parents: 2805 diff changeset	713 contentType = MIME_BINARY;
1523 c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	714 }
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	715
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	716 stateMachine_.SetContentType(contentType.c_str());
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	717
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	718 std::string filename;
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	719 if (stream.HasContentFilename(filename))
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	720 {
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	721 SetContentFilename(filename.c_str());
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	722 }
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	723
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	724 while (stream.ReadNextChunk())
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	725 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	726 stateMachine_.SendBody(stream.GetChunkContent(),
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	727 stream.GetChunkSize());
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	728 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	729
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	730 stateMachine_.CloseBody();
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	731 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	732
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	733
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	734 void HttpOutput::AnswerMultipartWithoutChunkedTransfer(
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	735 const std::string& subType,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	736 const std::string& contentType,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	737 const std::vector<const void*>& parts,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	738 const std::vector<size_t>& sizes,
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	739 const std::vector<const std::map<std::string, std::string>*>& headers)
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	740 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	741 if (parts.size() != sizes.size())
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	742 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	743 throw OrthancException(ErrorCode_ParameterOutOfRange);
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	744 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	745
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	746 stateMachine_.CheckHeadersCompatibilityWithMultipart();
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	747
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	748 std::string boundary, contentTypeHeader;
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	749 PrepareMultipartMainHeader(boundary, contentTypeHeader, subType, contentType);
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	750 SetContentType(contentTypeHeader);
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	751
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	752 std::map<std::string, std::string> empty;
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	753
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	754 ChunkedBuffer chunked;
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	755 for (size_t i = 0; i < parts.size(); i++)
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	756 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	757 std::string partHeader;
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	758 PrepareMultipartItemHeader(partHeader, sizes[i], headers[i] == NULL ? empty : *headers[i],
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	759 boundary, contentType);
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	760
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	761 chunked.AddChunk(partHeader);
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	762 chunked.AddChunk(parts[i], sizes[i]);
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	763 chunked.AddChunk("\r\n");
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	764 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	765
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	766 chunked.AddChunk("--" + boundary + "--\r\n");
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	767
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	768 std::string body;
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	769 chunked.Flatten(body);
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	770 Answer(body);
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	771 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	772 }

Mercurial > hg > orthanc

annotate Core/HttpServer/HttpOutput.cpp @ 3951:5fe8c6d3212e transcoding