orthanc: OrthancFramework/Sources/HttpServer/HttpOutput.cpp annotate

annotate OrthancFramework/Sources/HttpServer/HttpOutput.cpp @ 5406:aaf7c49a9ddc am-http-compression

tentative to implement smart HTTP compression with detection of transfer syntax

author	Alain Mazy <am@osimis.io>
date	Sat, 04 Nov 2023 13:42:30 +0100
parents	0ea402b4d901
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
5185 0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5119 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5119 diff changeset	6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	9 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	10 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	11 * the License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	12 *
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * 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	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	16 * Lesser General Public License for more details.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	18 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	19 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	20 * <http://www.gnu.org/licenses/>.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	24 #include "../PrecompiledHeaders.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 #include "HttpOutput.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26
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	27 #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	28 #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	29 #include "../Compression/ZlibCompressor.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	30 #include "../Logging.h"
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	31 #include "../OrthancException.h"
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	32 #include "../Toolbox.h"
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	33
324 64925c94825c api improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	34 #include <iostream>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include <vector>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include <stdio.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #include <boost/lexical_cast.hpp>
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	38
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	40 #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	41 # 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	42 # 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	43 # endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	44 #endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	45
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	46
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	47 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 {
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	49 HttpOutput::StateMachine::StateMachine(IHttpOutputStream& stream,
5119 bdec57f3cbf2 New configuration KeepAliveTimeout with a default value of 1 second Alain Mazy <am@osimis.io> parents: 4870 diff changeset	50 bool isKeepAlive,
bdec57f3cbf2 New configuration KeepAliveTimeout with a default value of 1 second Alain Mazy <am@osimis.io> parents: 4870 diff changeset	51 unsigned int keepAliveTimeout) :
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	52 stream_(stream),
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	53 state_(State_WritingHeader),
5406 aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	54 contentCompression_(ContentCompression_Unknown),
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	55 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	56 hasContentLength_(false),
4201 2d5209153b32 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	57 contentLength_(0),
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	58 contentPosition_(0),
5119 bdec57f3cbf2 New configuration KeepAliveTimeout with a default value of 1 second Alain Mazy <am@osimis.io> parents: 4870 diff changeset	59 keepAlive_(isKeepAlive),
bdec57f3cbf2 New configuration KeepAliveTimeout with a default value of 1 second Alain Mazy <am@osimis.io> parents: 4870 diff changeset	60 keepAliveTimeout_(keepAliveTimeout)
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	61 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	62 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	63
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	64 HttpOutput::StateMachine::~StateMachine()
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	65 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	66 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	67 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	68 //asm volatile ("int3;");
1200 1e1390665639 fix sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 1115 diff changeset	69 //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	70 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	71
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	72 if (hasContentLength_ && contentPosition_ != contentLength_)
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	73 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	74 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	75 }
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
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	79 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	80 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	81 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	82 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	83 throw OrthancException(ErrorCode_BadSequenceOfCalls);
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	84 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	85
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	86 status_ = status;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	87 }
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
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	90 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	91 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	92 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	93 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	94 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	95 }
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	96
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	97 hasContentLength_ = true;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	98 contentLength_ = length;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	99 }
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	100
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	101 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	102 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	103 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	104 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	105
5406 aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	106 void HttpOutput::StateMachine::SetContentCompression(ContentCompression contentCompression)
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	107 {
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	108 contentCompression_ = contentCompression;
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	109 }
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	110
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	111 bool HttpOutput::StateMachine::IsContentCompressible() const
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	112 {
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	113 // We assume that all files that compress correctly (mainly JSON, XML) are clearly identified.
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	114 // Therefore, only the content identified as NotCompressed are compressed again.
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	115 // We consider that the content whose compression is Unknown, likely DICOM file whose transfer syntax
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	116 // could not be determined, must not be compressed either.
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	117 return contentCompression_ == ContentCompression_NotCompressed;
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	118 }
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	119
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	120 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	121 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	122 // 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	123 AddHeader("Content-Disposition", "filename=\"" + std::string(filename) + "\"");
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	124 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	125
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	126 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	127 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	128 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	129 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	130 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	131 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	132 }
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 // TODO Escape "=" characters
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	135 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	136 }
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 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	140 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	141 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	142 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	143 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	144 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	145 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	146
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	147 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	148 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	149
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	150 void HttpOutput::StateMachine::ClearHeaders()
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	151 {
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	152 if (state_ != State_WritingHeader)
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	153 {
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	154 throw OrthancException(ErrorCode_BadSequenceOfCalls);
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	155 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	156
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	157 headers_.clear();
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	158 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	159
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	160 void HttpOutput::StateMachine::SendBody(const void* buffer, size_t length)
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	161 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	162 if (state_ == State_Done)
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	163 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	164 if (length == 0)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	165 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	166 return;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	167 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	168 else
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	169 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	170 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	171 "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	172 "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	173 }
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	174 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	175
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	176 if (state_ == State_WritingMultipart)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	177 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	178 throw OrthancException(ErrorCode_InternalError);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	179 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	180
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	181 if (state_ == State_WritingHeader)
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	182 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	183 // 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	184
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	185 stream_.OnHttpStatusReceived(status_);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	186
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	187 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	188 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	189 " " + 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	190 "\r\n";
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	191
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	192 if (keepAlive_)
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	193 {
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	194 s += "Connection: keep-alive\r\n";
4301 6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	195
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	196 /**
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	197 * [LIFY-2311] The "Keep-Alive" HTTP header was missing in
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	198 * Orthanc <= 1.8.0, which notably caused failures if
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	199 * uploading DICOM instances by applying Java's
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	200 * "org.apache.http.client.methods.HttpPost()" on "/instances"
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	201 * URI, if "PoolingHttpClientConnectionManager" was in used. A
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	202 * workaround was to manually set a timeout for the keep-alive
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	203 * client to, say, 200 milliseconds, by using
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	204 * "HttpClients.custom().setKeepAliveStrategy((httpResponse,httpContext)->200)".
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	205 * Note that the "timeout" value can only be integer in the
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	206 * HTTP header, so we can't use the milliseconds granularity.
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	207 **/
6919242d2265 Fix keep-alive in the embedded HTTP server by setting the "Keep-Alive" HTTP header Sebastien Jodogne <s.jodogne@gmail.com> parents: 4298 diff changeset	208 s += ("Keep-Alive: timeout=" +
5119 bdec57f3cbf2 New configuration KeepAliveTimeout with a default value of 1 second Alain Mazy <am@osimis.io> parents: 4870 diff changeset	209 boost::lexical_cast<std::string>(keepAliveTimeout_) + "\r\n");
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	210 }
3171 81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	211 else
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	212 {
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	213 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	214 }
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	215
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	216 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	217 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	218 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	219 s += *it;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	220 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	221
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	222 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	223 {
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	224 hasContentLength_ = false;
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	225 }
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 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 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	228 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	229
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	230 stream_.Send(true, s.c_str(), s.size());
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	231 state_ = State_WritingBody;
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	232 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	233
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	234 if (hasContentLength_ &&
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	235 contentPosition_ + length > contentLength_)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	236 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	237 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	238 "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	239 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	240
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	241 if (length > 0)
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	242 {
911 306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 910 diff changeset	243 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	244 contentPosition_ += length;
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	245 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	246
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	247 if (!hasContentLength_ \|\|
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	248 contentPosition_ == contentLength_)
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	249 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	250 state_ = State_Done;
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	251 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	252 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	253
207 7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 155 diff changeset	254
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	255 void HttpOutput::StateMachine::CloseBody()
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	256 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	257 switch (state_)
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_WritingHeader:
1522 f938f7779bcb fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1521 diff changeset	260 SetContentLength(0);
f938f7779bcb fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1521 diff changeset	261 SendBody(NULL, 0);
f938f7779bcb fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1521 diff changeset	262 break;
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	263
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	264 case State_WritingBody:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	265 if (!hasContentLength_ \|\|
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	266 contentPosition_ == contentLength_)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	267 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	268 state_ = State_Done;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	269 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	270 else
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	271 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	272 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	273 "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	274 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	275
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	276 break;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	277
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	278 case State_WritingMultipart:
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	279 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	280 "Cannot invoke CloseBody() with multipart outputs");
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	281
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	282 case State_Done:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	283 return; // Ignore
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	284
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	285 default:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	286 throw OrthancException(ErrorCode_InternalError);
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	287 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	288 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	289
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	290
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	291 HttpCompression HttpOutput::GetPreferredCompression(size_t bodySize) const
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	292 {
5406 aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	293 // Do not compress small files since there is no real size benefit.
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	294 if (bodySize < 2048)
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	295 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	296 return HttpCompression_None;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	297 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	298
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	299 // Prefer "gzip" over "deflate" if the choice is offered
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	300
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	301 if (isGzipAllowed_)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	302 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	303 return HttpCompression_Gzip;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	304 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	305 else if (isDeflateAllowed_)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	306 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	307 return HttpCompression_Deflate;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	308 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	309 else
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	310 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	311 return HttpCompression_None;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	312 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	313 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	314
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	315
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	316 HttpOutput::HttpOutput(IHttpOutputStream &stream,
5119 bdec57f3cbf2 New configuration KeepAliveTimeout with a default value of 1 second Alain Mazy <am@osimis.io> parents: 4870 diff changeset	317 bool isKeepAlive,
bdec57f3cbf2 New configuration KeepAliveTimeout with a default value of 1 second Alain Mazy <am@osimis.io> parents: 4870 diff changeset	318 unsigned int keepAliveTimeout) :
bdec57f3cbf2 New configuration KeepAliveTimeout with a default value of 1 second Alain Mazy <am@osimis.io> parents: 4870 diff changeset	319 stateMachine_(stream, isKeepAlive, keepAliveTimeout),
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	320 isDeflateAllowed_(false),
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	321 isGzipAllowed_(false)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	322 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	323 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	324
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	325 void HttpOutput::SetDeflateAllowed(bool allowed)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	326 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	327 isDeflateAllowed_ = allowed;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	328 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	329
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	330 bool HttpOutput::IsDeflateAllowed() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	331 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	332 return isDeflateAllowed_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	333 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	334
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	335 void HttpOutput::SetGzipAllowed(bool allowed)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	336 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	337 isGzipAllowed_ = allowed;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	338 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	339
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	340 bool HttpOutput::IsGzipAllowed() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	341 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	342 return isGzipAllowed_;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	343 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	344
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	345
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 911 diff changeset	346 void HttpOutput::SendMethodNotAllowed(const std::string& allowed)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	348 stateMachine_.ClearHeaders();
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	349 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	350 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	351 stateMachine_.SendBody(NULL, 0);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354
1567 9c5d93510414 If error while calling the REST API, the answer body contains an error description jodogne parents: 1523 diff changeset	355 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	356 const char* message,
9c5d93510414 If error while calling the REST API, the answer body contains an error description jodogne parents: 1523 diff changeset	357 size_t messageSize)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 {
1954 1845512f8914 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1953 diff changeset	359 if (status == HttpStatus_301_MovedPermanently \|\|
3425 2f6dcb9c8cc1 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 3416 diff changeset	360 //status == HttpStatus_401_Unauthorized \|\|
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	361 status == HttpStatus_405_MethodNotAllowed)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	363 throw OrthancException(ErrorCode_ParameterOutOfRange,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	364 "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	365 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	367 stateMachine_.SetHttpStatus(status);
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	368 stateMachine_.SendBody(message, messageSize);
339 639272ef7615 answer raw buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	369 }
639272ef7615 answer raw buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	370
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	371 void HttpOutput::SendStatus(HttpStatus status)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	372 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	373 SendStatus(status, NULL, 0);
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	374 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	375
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	376 void HttpOutput::SendStatus(HttpStatus status, const std::string &message)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	377 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	378 SendStatus(status, message.c_str(), message.size());
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	379 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	380
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	381 void HttpOutput::SetContentType(MimeType contentType)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	382 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	383 stateMachine_.SetContentType(EnumerationToString(contentType));
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	384 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	385
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	386 void HttpOutput::SetContentType(const std::string &contentType)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	387 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	388 stateMachine_.SetContentType(contentType.c_str());
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	389 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	390
5406 aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	391 void HttpOutput::SetContentCompression(ContentCompression contentCompression)
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	392 {
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	393 stateMachine_.SetContentCompression(contentCompression);
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	394 }
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	395
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	396 void HttpOutput::SetContentFilename(const char *filename)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	397 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	398 stateMachine_.SetContentFilename(filename);
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	399 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	400
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	401 void HttpOutput::SetCookie(const std::string &cookie, const std::string &value)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	402 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	403 stateMachine_.SetCookie(cookie, value);
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	404 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	405
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	406 void HttpOutput::AddHeader(const std::string &key, const std::string &value)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	407 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	408 stateMachine_.AddHeader(key, value);
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	409 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	410
339 639272ef7615 answer raw buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	411
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 void HttpOutput::Redirect(const std::string& path)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	414 stateMachine_.ClearHeaders();
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	415 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	416 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	417 stateMachine_.SendBody(NULL, 0);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418 }
908 e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	419
e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	420
e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	421 void HttpOutput::SendUnauthorized(const std::string& realm)
e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	422 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	423 stateMachine_.ClearHeaders();
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	424 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	425 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	426 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	427 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	428
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	429 void HttpOutput::StartMultipart(const std::string &subType, const std::string &contentType)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	430 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	431 stateMachine_.StartMultipart(subType, contentType);
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	432 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	433
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	434 void HttpOutput::SendMultipartItem(const void *item,
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	435 size_t size,
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	436 const std::map<std::string, std::string> &headers)
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	437 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	438 stateMachine_.SendMultipartItem(item, size, headers);
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	439 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	440
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	441 void HttpOutput::CloseMultipart()
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	442 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	443 stateMachine_.CloseMultipart();
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	444 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	445
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	446 bool HttpOutput::IsWritingMultipart() const
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	447 {
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	448 return stateMachine_.GetState() == StateMachine::State_WritingMultipart;
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	449 }
db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	450
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	451
4298 db3932f9660d abi continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 4201 diff changeset	452 void HttpOutput::Answer(const void* buffer,
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	453 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	454 {
1511 7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	455 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	456 {
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	457 AnswerEmpty();
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	458 return;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	459 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	460
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	461 HttpCompression compression = GetPreferredCompression(length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	462
5406 aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	463 if (compression == HttpCompression_None \|\| !IsContentCompressible())
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	464 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	465 stateMachine_.SetContentLength(length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	466 stateMachine_.SendBody(buffer, length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	467 return;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	468 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	469
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	470 std::string compressed, encoding;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	471
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	472 switch (compression)
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	473 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	474 case HttpCompression_Deflate:
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	475 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	476 encoding = "deflate";
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	477 ZlibCompressor compressor;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	478 // 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	479 compressor.SetPrefixWithUncompressedSize(false);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	480 compressor.Compress(compressed, buffer, length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	481 break;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	482 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	483
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	484 case HttpCompression_Gzip:
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	485 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	486 encoding = "gzip";
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	487 GzipCompressor compressor;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	488 compressor.Compress(compressed, buffer, length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	489 break;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	490 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	491
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	492 default:
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	493 throw OrthancException(ErrorCode_InternalError);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	494 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	495
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	496 LOG(TRACE) << "Compressing a HTTP answer using " << encoding;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	497
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	498 // The body is empty, do not use HTTP compression
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	499 if (compressed.size() == 0)
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	500 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	501 AnswerEmpty();
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	502 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	503 else
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	504 {
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	505 stateMachine_.AddHeader("Content-Encoding", encoding);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	506 stateMachine_.SetContentLength(compressed.size());
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	507 stateMachine_.SendBody(compressed.c_str(), compressed.size());
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	508 }
1511 7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	509
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	510 stateMachine_.CloseBody();
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	511 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	512
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	513
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	514 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	515 {
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	516 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	517 }
7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	518
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	519
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	520 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	521 {
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	522 stateMachine_.CloseBody();
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	523 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	524
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	525
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	526 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	527 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	528 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	529 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	530 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	531 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	532 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	533 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	534 "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	535 "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	536 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	537 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	538 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	539
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	540
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	541 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	542 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	543 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	544 const std::string& contentType)
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 if (subType != "mixed" &&
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	547 subType != "related")
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 throw OrthancException(ErrorCode_ParameterOutOfRange);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	550 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	551
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	552 /**
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	553 * 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	554 * 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	555 * 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	556 * 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	557 * 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	558 * 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	559 *
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	560 * 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	561 * - 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	562 * # hg history -v -r 2248
4476 c1f36fd13730 migrate remaining links to issues in bitbucket to mercurial server Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	563 * - https://bugs.orthanc-server.com/show_bug.cgi?id=54
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	564 * - 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	565 **/
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	566 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	567 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	568 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	569 // 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	570 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	571 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	572 else
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	573 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	574 // 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	575 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	576 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	577
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	578 boundary = Toolbox::GenerateUuid() + "-" + Toolbox::GenerateUuid();
3616 b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	579
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	580 /**
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	581 * Fix for issue #165: "Encapsulation boundaries must not appear
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	582 * within the encapsulations, and must be no longer than 70
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	583 * characters, not counting the two leading hyphens."
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	584 * https://tools.ietf.org/html/rfc1521
4476 c1f36fd13730 migrate remaining links to issues in bitbucket to mercurial server Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	585 * https://bugs.orthanc-server.com/show_bug.cgi?id=165
3616 b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	586 **/
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	587 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	588 {
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	589 throw OrthancException(ErrorCode_InternalError);
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	590 }
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	591
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 diff changeset	592 boundary = boundary.substr(0, 70);
b6a569e6e85b Fix issue #165 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3528 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 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	595 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	596
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	597
4672 d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	598 void HttpOutput::StateMachine::StartStreamInternal(const std::string& 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	599 {
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	600 if (state_ != State_WritingHeader)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	601 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	602 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	603 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	604
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	605 if (status_ != HttpStatus_200_Ok)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	606 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	607 SendBody(NULL, 0);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	608 return;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	609 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	610
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	611 stream_.OnHttpStatusReceived(status_);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	612
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	613 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	614
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	615 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	616 {
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	617 #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	618 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	619 "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	620 "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	621
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	622 #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	623 # 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	624 // 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	625 // 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	626 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	627 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	628 # else
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	629 // 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	630 // 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	631 // decrease.
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	632 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	633 # endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	634
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	635 #else
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	636 # 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	637 #endif
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	638 }
3171 81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	639 else
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	640 {
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	641 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	642 }
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	643
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	644 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	645 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	646 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	647 header += *it;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	648 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	649
4672 d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	650 header += ("Content-Type: " + contentType + "\r\n\r\n");
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	651
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	652 stream_.Send(true, header.c_str(), header.size());
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	653 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	654
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	655
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	656 void HttpOutput::StateMachine::StartMultipart(const std::string& subType,
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	657 const std::string& contentType)
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	658 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	659 CheckHeadersCompatibilityWithMultipart();
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	660
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	661 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	662 PrepareMultipartMainHeader(multipartBoundary_, contentTypeHeader, subType, contentType);
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	663 multipartContentType_ = contentType;
4672 d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	664
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	665 StartStreamInternal(contentTypeHeader);
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	666
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	667 state_ = State_WritingMultipart;
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	668 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	669
4672 d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	670
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	671 void HttpOutput::StateMachine::StartStream(const std::string& contentType)
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	672 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	673 StartStreamInternal(contentType);
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	674 state_ = State_WritingStream;
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	675 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	676
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	677
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	678 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	679 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	680 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	681 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	682 const std::string& contentType)
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	683 {
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	684 target = "--" + boundary + "\r\n";
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	685
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	686 bool hasContentType = false;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	687 bool hasContentLength = false;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	688 bool hasMimeVersion = false;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	689
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	690 for (std::map<std::string, std::string>::const_iterator
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	691 it = headers.begin(); it != headers.end(); ++it)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	692 {
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	693 target += it->first + ": " + it->second + "\r\n";
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	694
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	695 std::string tmp;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	696 Toolbox::ToLowerCase(tmp, it->first);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	697
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	698 if (tmp == "content-type")
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	699 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	700 hasContentType = true;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	701 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	702
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	703 if (tmp == "content-length")
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	704 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	705 hasContentLength = true;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	706 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	707
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	708 if (tmp == "mime-version")
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	709 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	710 hasMimeVersion = true;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	711 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	712 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	713
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	714 if (!hasContentType)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	715 {
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	716 target += "Content-Type: " + contentType + "\r\n";
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	717 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	718
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	719 if (!hasContentLength)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	720 {
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	721 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	722 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	723
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	724 if (!hasMimeVersion)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	725 {
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	726 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	727 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	728 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	729
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	730
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	731 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	732 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	733 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	734 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	735 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	736 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	737 throw OrthancException(ErrorCode_BadSequenceOfCalls);
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	738 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	739
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	740 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	741 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	742 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	743
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	744 if (length > 0)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	745 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	746 stream_.Send(false, item, length);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	747 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	748
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	749 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	750 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	751
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	752
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	753 void HttpOutput::StateMachine::CloseMultipart()
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	754 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	755 if (state_ != State_WritingMultipart)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	756 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	757 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	758 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	759
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	760 // 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	761 // 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	762 try
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	763 {
1832 b7da58699f92 Fix formatting of multipart HTTP answers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	764 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	765 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	766 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	767 catch (OrthancException&)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	768 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	769 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	770
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	771 state_ = State_Done;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	772 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	773
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	774
4672 d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	775 void HttpOutput::StateMachine::SendStreamItem(const void* data,
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	776 size_t size)
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	777 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	778 if (state_ != State_WritingStream)
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	779 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	780 throw OrthancException(ErrorCode_BadSequenceOfCalls);
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	781 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	782 else
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	783 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	784 if (size > 0)
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	785 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	786 stream_.Send(false, data, size);
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	787 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	788 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	789 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	790
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	791
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	792 void HttpOutput::StateMachine::CloseStream()
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	793 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	794 if (state_ != State_WritingStream)
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	795 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	796 throw OrthancException(ErrorCode_BadSequenceOfCalls);
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	797 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	798 else
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	799 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	800 state_ = State_Done;
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	801 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	802 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	803
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	804
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	805 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	806 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	807 {
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	808 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	809
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	810 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	811 {
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	812 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	813 {
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	814 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	815 }
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	816 }
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	817
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	818 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	819 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	820
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	821 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	822
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	823 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	824 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	825 {
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	826 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	827 }
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	828
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	829 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	830 }
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	831
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	832
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	833 void HttpOutput::Answer(IHttpStreamAnswer& stream)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	834 {
1523 c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	835 HttpCompression compression = stream.SetupHttpCompression(isGzipAllowed_, isDeflateAllowed_);
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	836
5406 aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	837 if (!IsContentCompressible())
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	838 {
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	839 compression = HttpCompression_None;
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	840 }
aaf7c49a9ddc tentative to implement smart HTTP compression with detection of transfer syntax Alain Mazy <am@osimis.io> parents: 5185 diff changeset	841
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	842 switch (compression)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	843 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	844 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	845 {
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	846 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	847 {
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	848 // 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	849 // 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	850 // 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	851 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	852 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	853 }
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	854
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	855 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	856 }
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	857
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	858 case HttpCompression_Gzip:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	859 stateMachine_.AddHeader("Content-Encoding", "gzip");
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	860 break;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	861
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	862 case HttpCompression_Deflate:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	863 stateMachine_.AddHeader("Content-Encoding", "deflate");
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	864 break;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	865
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	866 default:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	867 throw OrthancException(ErrorCode_ParameterOutOfRange);
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	868 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	869
1523 c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	870 stateMachine_.SetContentLength(stream.GetContentLength());
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	871
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	872 std::string contentType = stream.GetContentType();
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	873 if (contentType.empty())
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	874 {
2905 ae20fccdd867 refactoring mime types Sebastien Jodogne <s.jodogne@gmail.com> parents: 2805 diff changeset	875 contentType = MIME_BINARY;
1523 c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	876 }
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	877
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	878 stateMachine_.SetContentType(contentType.c_str());
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	879
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	880 std::string filename;
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	881 if (stream.HasContentFilename(filename))
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	882 {
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	883 SetContentFilename(filename.c_str());
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	884 }
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	885
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	886 while (stream.ReadNextChunk())
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	887 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	888 stateMachine_.SendBody(stream.GetChunkContent(),
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	889 stream.GetChunkSize());
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	890 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	891
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	892 stateMachine_.CloseBody();
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	893 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	894
3528 f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	895
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	896 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	897 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	898 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	899 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	900 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	901 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	902 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	903 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	904 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	905 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	906 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	907
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	908 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	909
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	910 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	911 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	912 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	913
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	914 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	915
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	916 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	917 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	918 {
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	919 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	920 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	921 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	922
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	923 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	924 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	925 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	926 }
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	927
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	928 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	929
f6fe095f7130 don't open a multipart stream if plugin only sends one part Sebastien Jodogne <s.jodogne@gmail.com> parents: 3425 diff changeset	930 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	931 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	932 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	933 }
4672 d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	934
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	935
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	936 void HttpOutput::AnswerWithoutBuffering(IHttpStreamAnswer& stream)
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	937 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	938 std::string contentType = stream.GetContentType();
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	939 if (contentType.empty())
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	940 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	941 contentType = MIME_BINARY;
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	942 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	943
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	944 std::string filename;
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	945 if (stream.HasContentFilename(filename))
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	946 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	947 stateMachine_.AddHeader("Content-Disposition", "filename=\"" + std::string(filename) + "\"");
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	948 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	949
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	950 stateMachine_.StartStream(contentType.c_str());
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	951
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	952 while (stream.ReadNextChunk())
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	953 {
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	954 stateMachine_.SendStreamItem(stream.GetChunkContent(), stream.GetChunkSize());
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	955 }
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	956
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	957 stateMachine_.CloseStream();
d9942d48fea7 ZipWriter::CancelStream(), ZipWriter::GetArchiveSize() and HttpOutput::AnswerWithoutBuffering() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4476 diff changeset	958 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	959 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/HttpServer/HttpOutput.cpp @ 5406:aaf7c49a9ddc am-http-compression