orthanc: Core/HttpServer/HttpOutput.cpp annotate

annotate Core/HttpServer/HttpOutput.cpp @ 3316:4b1017928fc4

Fix performance issue in DICOM protocol by disabling Nagle's algorithm

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 28 Feb 2019 18:21:28 +0100
parents	6d558598d713
children	0528a6c36f3d

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
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2954 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	11 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	13 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	22 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	34 #include "../PrecompiledHeaders.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "HttpOutput.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	37 #include "../Logging.h"
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	38 #include "../OrthancException.h"
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	39 #include "../Toolbox.h"
1514 d73a2178b319 support of deflate and gzip content-types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1511 diff changeset	40 #include "../Compression/GzipCompressor.h"
1511 7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	41 #include "../Compression/ZlibCompressor.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	42
324 64925c94825c api improvement Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	43 #include <iostream>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 #include <vector>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 #include <stdio.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 #include <boost/lexical_cast.hpp>
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1430 diff changeset	47
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48
3178 6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	49 #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	50 # 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	51 # 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	52 # endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	53 #endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	54
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	55
59 c996319e90bc renaming in Core Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	56 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 {
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	58 HttpOutput::StateMachine::StateMachine(IHttpOutputStream& stream,
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	59 bool isKeepAlive) :
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	60 stream_(stream),
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	61 state_(State_WritingHeader),
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	62 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	63 hasContentLength_(false),
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	64 contentPosition_(0),
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	65 keepAlive_(isKeepAlive)
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	66 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	67 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	68
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	69 HttpOutput::StateMachine::~StateMachine()
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	70 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	71 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	72 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	73 //asm volatile ("int3;");
1200 1e1390665639 fix sample Sebastien Jodogne <s.jodogne@gmail.com> parents: 1115 diff changeset	74 //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	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 if (hasContentLength_ && contentPosition_ != contentLength_)
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	78 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	79 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	80 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	81 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	82
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	83
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	84 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	85 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	86 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	87 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	88 throw OrthancException(ErrorCode_BadSequenceOfCalls);
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	89 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	90
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	91 status_ = status;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	92 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	93
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	94
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	95 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	96 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	97 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	98 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	99 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	100 }
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	101
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	102 hasContentLength_ = true;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	103 contentLength_ = length;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	104 }
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	105
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	106 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	107 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	108 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	109 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	110
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	111 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	112 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	113 // 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	114 AddHeader("Content-Disposition", "filename=\"" + std::string(filename) + "\"");
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	115 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	116
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	117 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	118 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	119 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	120 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	121 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	122 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	123 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	124
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	125 // TODO Escape "=" characters
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	126 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	127 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	128
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	129
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	130 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	131 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	132 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	133 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	134 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	135 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	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 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	139 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	140
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	141 void HttpOutput::StateMachine::ClearHeaders()
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	142 {
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	143 if (state_ != State_WritingHeader)
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	144 {
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	145 throw OrthancException(ErrorCode_BadSequenceOfCalls);
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	146 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	147
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	148 headers_.clear();
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	149 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	150
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	151 void HttpOutput::StateMachine::SendBody(const void* buffer, size_t length)
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	152 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	153 if (state_ == State_Done)
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	154 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	155 if (length == 0)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	156 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	157 return;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	158 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	159 else
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	160 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	161 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	162 "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	163 "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	164 }
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	165 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	166
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	167 if (state_ == State_WritingMultipart)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	168 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	169 throw OrthancException(ErrorCode_InternalError);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	170 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	171
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	172 if (state_ == State_WritingHeader)
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	173 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	174 // 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	175
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	176 stream_.OnHttpStatusReceived(status_);
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	177
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	178 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	179 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	180 " " + 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	181 "\r\n";
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	182
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	183 if (keepAlive_)
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	184 {
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	185 s += "Connection: keep-alive\r\n";
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	186 }
3171 81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	187 else
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	188 {
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	189 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	190 }
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	191
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	192 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	193 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	194 {
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	195 s += *it;
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	196 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	197
1115 da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	198 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	199 {
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	200 hasContentLength_ = false;
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	201 }
da56a7916e8a Experimental "KeepAlive" configuration option to enable HTTP Keep-Alive Sebastien Jodogne <s.jodogne@gmail.com> parents: 1113 diff changeset	202
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	203 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	204 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	205
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	206 stream_.Send(true, s.c_str(), s.size());
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	207 state_ = State_WritingBody;
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	208 }
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	209
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	210 if (hasContentLength_ &&
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	211 contentPosition_ + length > contentLength_)
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	212 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	213 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	214 "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	215 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	216
910 28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	217 if (length > 0)
28a52982196e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 908 diff changeset	218 {
911 306afd58a0b3 fix build Sebastien Jodogne <s.jodogne@gmail.com> parents: 910 diff changeset	219 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	220 contentPosition_ += length;
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	221 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	222
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	223 if (!hasContentLength_ \|\|
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	224 contentPosition_ == contentLength_)
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	225 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	226 state_ = State_Done;
330 78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	227 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	228 }
78a8eaa5f30b cookies Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	229
207 7f74209ea0f8 RestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: 155 diff changeset	230
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	231 void HttpOutput::StateMachine::CloseBody()
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	232 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	233 switch (state_)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	234 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	235 case State_WritingHeader:
1522 f938f7779bcb fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1521 diff changeset	236 SetContentLength(0);
f938f7779bcb fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1521 diff changeset	237 SendBody(NULL, 0);
f938f7779bcb fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1521 diff changeset	238 break;
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	239
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	240 case State_WritingBody:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	241 if (!hasContentLength_ \|\|
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	242 contentPosition_ == contentLength_)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	243 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	244 state_ = State_Done;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	245 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	246 else
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	247 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	248 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	249 "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	250 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	251
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	252 break;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	253
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	254 case State_WritingMultipart:
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	255 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	256 "Cannot invoke CloseBody() with multipart outputs");
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	257
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	258 case State_Done:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	259 return; // Ignore
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	260
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	261 default:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	262 throw OrthancException(ErrorCode_InternalError);
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 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	265
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	266
1517 4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	267 HttpCompression HttpOutput::GetPreferredCompression(size_t bodySize) const
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	268 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	269 #if 0
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	270 // TODO Do not compress small files?
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	271 if (bodySize < 512)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	272 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	273 return HttpCompression_None;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	274 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	275 #endif
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	276
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	277 // Prefer "gzip" over "deflate" if the choice is offered
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	278
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	279 if (isGzipAllowed_)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	280 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	281 return HttpCompression_Gzip;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	282 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	283 else if (isDeflateAllowed_)
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	284 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	285 return HttpCompression_Deflate;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	286 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	287 else
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	288 {
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	289 return HttpCompression_None;
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	290 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	291 }
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	292
4f8c8ef114db cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1514 diff changeset	293
1042 8d1845feb277 set cookies, not allowed methods, unauthorized in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 911 diff changeset	294 void HttpOutput::SendMethodNotAllowed(const std::string& allowed)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	296 stateMachine_.ClearHeaders();
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	297 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	298 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	299 stateMachine_.SendBody(NULL, 0);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302
1567 9c5d93510414 If error while calling the REST API, the answer body contains an error description jodogne parents: 1523 diff changeset	303 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	304 const char* message,
9c5d93510414 If error while calling the REST API, the answer body contains an error description jodogne parents: 1523 diff changeset	305 size_t messageSize)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 {
1954 1845512f8914 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1953 diff changeset	307 if (status == HttpStatus_301_MovedPermanently \|\|
908 e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	308 status == HttpStatus_401_Unauthorized \|\|
473 c9a5d72f8481 changing the namespace of HTTP enumerations Sebastien Jodogne <s.jodogne@gmail.com> parents: 398 diff changeset	309 status == HttpStatus_405_MethodNotAllowed)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	311 throw OrthancException(ErrorCode_ParameterOutOfRange,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	312 "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	313 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	315 stateMachine_.SetHttpStatus(status);
1645 1558b3226b18 IHttpExceptionFormatter Sebastien Jodogne <s.jodogne@gmail.com> parents: 1592 diff changeset	316 stateMachine_.SendBody(message, messageSize);
339 639272ef7615 answer raw buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	317 }
639272ef7615 answer raw buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	318
639272ef7615 answer raw buffers Sebastien Jodogne <s.jodogne@gmail.com> parents: 330 diff changeset	319
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 void HttpOutput::Redirect(const std::string& path)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	322 stateMachine_.ClearHeaders();
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	323 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	324 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	325 stateMachine_.SendBody(NULL, 0);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 }
908 e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	327
e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	328
e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	329 void HttpOutput::SendUnauthorized(const std::string& realm)
e078ea944089 refactoring HttpOutput Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	330 {
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	331 stateMachine_.ClearHeaders();
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	332 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	333 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	334 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	335 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	336
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	337
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	338 void HttpOutput::Answer(const void* buffer,
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	339 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	340 {
1511 7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	341 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	342 {
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	343 AnswerEmpty();
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	344 return;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	345 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	346
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	347 HttpCompression compression = GetPreferredCompression(length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	348
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	349 if (compression == HttpCompression_None)
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	350 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	351 stateMachine_.SetContentLength(length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	352 stateMachine_.SendBody(buffer, length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	353 return;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	354 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	355
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	356 std::string compressed, encoding;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	357
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	358 switch (compression)
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	359 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	360 case HttpCompression_Deflate:
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	361 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	362 encoding = "deflate";
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	363 ZlibCompressor compressor;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	364 // 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	365 compressor.SetPrefixWithUncompressedSize(false);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	366 compressor.Compress(compressed, buffer, length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	367 break;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	368 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	369
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	370 case HttpCompression_Gzip:
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	371 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	372 encoding = "gzip";
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	373 GzipCompressor compressor;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	374 compressor.Compress(compressed, buffer, length);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	375 break;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	376 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	377
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	378 default:
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	379 throw OrthancException(ErrorCode_InternalError);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	380 }
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	381
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	382 LOG(TRACE) << "Compressing a HTTP answer using " << encoding;
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	383
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	384 // The body is empty, do not use HTTP compression
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	385 if (compressed.size() == 0)
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	386 {
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	387 AnswerEmpty();
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	388 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	389 else
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	390 {
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	391 stateMachine_.AddHeader("Content-Encoding", encoding);
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	392 stateMachine_.SetContentLength(compressed.size());
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	393 stateMachine_.SendBody(compressed.c_str(), compressed.size());
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	394 }
1511 7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	395
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	396 stateMachine_.CloseBody();
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	397 }
ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	398
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	399
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	400 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	401 {
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	402 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	403 }
7962563129c9 starting support of deflate/gzip content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	404
1521 3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	405
3606278d305e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1519 diff changeset	406 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	407 {
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	408 stateMachine_.CloseBody();
1113 ba5c0908600c Refactoring of HttpOutput ("Content-Length" header is now always sent) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1042 diff changeset	409 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	410
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	411
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	412 void HttpOutput::StateMachine::StartMultipart(const std::string& subType,
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	413 const std::string& contentType)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	414 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	415 if (subType != "mixed" &&
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	416 subType != "related")
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	417 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	418 throw OrthancException(ErrorCode_ParameterOutOfRange);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	419 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	420
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	421 if (state_ != State_WritingHeader)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	422 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	423 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	424 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	425
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	426 if (status_ != HttpStatus_200_Ok)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	427 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	428 SendBody(NULL, 0);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	429 return;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	430 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	431
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	432 stream_.OnHttpStatusReceived(status_);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	433
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	434 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	435
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	436 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	437 {
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	438 #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	439 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	440 "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	441 "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	442
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	443 #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	444 # 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	445 // 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	446 // 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	447 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	448 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	449 # else
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	450 // 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	451 // 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	452 // decrease.
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	453 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	454 # endif
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	455
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	456 #else
6d558598d713 Fix build with unpatched versions of Civetweb (missing "mg_disable_keep_alive()") Sebastien Jodogne <s.jodogne@gmail.com> parents: 3171 diff changeset	457 # 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	458 #endif
6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	459 }
3171 81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	460 else
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	461 {
81cd9a4f3018 always add HTTP header "Connection: close" if keep-alive is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3154 diff changeset	462 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	463 }
3154 6e8822be2f08 Fix compatibility with DICOMweb plugin (allow multipart answers over HTTP Keep-Alive) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	464
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	465 // Possibly add the cookies
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	466 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	467 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	468 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	469 if (!Toolbox::StartsWith(*it, "Set-Cookie: "))
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	470 {
2954 d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	471 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	472 "The only headers that can be set in multipart answers "
d924f9bb61cc taking advantage of details in OrthancException Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	473 "are Set-Cookie (here: " + *it + " is set)");
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	474 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	475
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	476 header += *it;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	477 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	478
2805 e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	479 /**
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	480 * Fix for issue 54 ("Decide what to do wrt. quoting of multipart
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	481 * answers"). The "type" parameter in the "Content-Type" HTTP
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	482 * header must be quoted if it contains a forward slash "/". This
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	483 * is necessary for DICOMweb compatibility with OsiriX, but breaks
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	484 * compatibility with old releases of the client in the Orthanc
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	485 * DICOMweb plugin <= 0.3 (releases >= 0.4 work fine).
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	486 *
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	487 * Full history is available at the following locations:
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	488 * - In changeset 2248:69b0f4e8a49b:
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	489 * # hg history -v -r 2248
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	490 * - https://bitbucket.org/sjodogne/orthanc/issues/54/
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	491 * - https://groups.google.com/d/msg/orthanc-users/65zhIM5xbKI/TU5Q1_LhAwAJ
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	492 **/
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	493 std::string tmp;
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	494 if (contentType.find('/') == std::string::npos)
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	495 {
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	496 // No forward slash in the content type
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	497 tmp = contentType;
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	498 }
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	499 else
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	500 {
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	501 // Quote the content type because of the forward slash
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	502 tmp = "\"" + contentType + "\"";
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	503 }
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	504
2512 4dcafa8d6633 SystemToolbox::GenerateUuid moved to Toolbox::GenerateUuid Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	505 multipartBoundary_ = Toolbox::GenerateUuid();
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	506 multipartContentType_ = contentType;
2805 e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	507 header += ("Content-Type: multipart/" + subType + "; type=" +
e02af4ca8003 Fix issue #54 (quoting multipart answers) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2512 diff changeset	508 tmp + "; boundary=" + multipartBoundary_ + "\r\n\r\n");
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	509
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	510 stream_.Send(true, header.c_str(), header.size());
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	511 state_ = State_WritingMultipart;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	512 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	513
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	514
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	515 void HttpOutput::StateMachine::SendMultipartItem(const void* item,
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	516 size_t length,
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	517 const std::map<std::string, std::string>& headers)
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	518 {
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	519 if (state_ != State_WritingMultipart)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	520 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	521 throw OrthancException(ErrorCode_BadSequenceOfCalls);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	522 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	523
1832 b7da58699f92 Fix formatting of multipart HTTP answers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	524 std::string header = "--" + multipartBoundary_ + "\r\n";
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	525
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	526 bool hasContentType = false;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	527 bool hasContentLength = false;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	528 bool hasMimeVersion = false;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	529
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	530 for (std::map<std::string, std::string>::const_iterator
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	531 it = headers.begin(); it != headers.end(); ++it)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	532 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	533 header += it->first + ": " + it->second + "\r\n";
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	534
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	535 std::string tmp;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	536 Toolbox::ToLowerCase(tmp, it->first);
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	537
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	538 if (tmp == "content-type")
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	539 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	540 hasContentType = true;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	541 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	542
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	543 if (tmp == "content-length")
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	544 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	545 hasContentLength = true;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	546 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	547
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	548 if (tmp == "mime-version")
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	549 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	550 hasMimeVersion = true;
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	551 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	552 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	553
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	554 if (!hasContentType)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	555 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	556 header += "Content-Type: " + multipartContentType_ + "\r\n";
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	557 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	558
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	559 if (!hasContentLength)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	560 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	561 header += "Content-Length: " + boost::lexical_cast<std::string>(length) + "\r\n";
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	562 }
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	563
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	564 if (!hasMimeVersion)
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	565 {
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	566 header += "MIME-Version: 1.0\r\n\r\n";
5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	567 }
1430 ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	568
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	569 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	570
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	571 if (length > 0)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	572 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	573 stream_.Send(false, item, length);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	574 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	575
1882 5cf2bd0abfa2 OrthancPluginSendMultipartItem2 for DICOMweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 1875 diff changeset	576 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	577 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	578
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	579
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	580 void HttpOutput::StateMachine::CloseMultipart()
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	581 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	582 if (state_ != State_WritingMultipart)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	583 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	584 throw OrthancException(ErrorCode_BadSequenceOfCalls);
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	585 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	586
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	587 // 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	588 // 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	589 try
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	590 {
1832 b7da58699f92 Fix formatting of multipart HTTP answers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	591 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	592 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	593 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	594 catch (OrthancException&)
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	595 {
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	596 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	597
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	598 state_ = State_Done;
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	599 }
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	600
ad94a3583b07 Plugins can send answers as multipart messages Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	601
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	602 void HttpOutput::Answer(IHttpStreamAnswer& stream)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	603 {
1523 c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	604 HttpCompression compression = stream.SetupHttpCompression(isGzipAllowed_, isDeflateAllowed_);
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	605
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	606 switch (compression)
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	607 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	608 case HttpCompression_None:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	609 break;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	610
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	611 case HttpCompression_Gzip:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	612 stateMachine_.AddHeader("Content-Encoding", "gzip");
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	613 break;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	614
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	615 case HttpCompression_Deflate:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	616 stateMachine_.AddHeader("Content-Encoding", "deflate");
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	617 break;
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	618
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	619 default:
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	620 throw OrthancException(ErrorCode_ParameterOutOfRange);
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	621 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	622
1523 c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	623 stateMachine_.SetContentLength(stream.GetContentLength());
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	624
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	625 std::string contentType = stream.GetContentType();
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	626 if (contentType.empty())
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	627 {
2905 ae20fccdd867 refactoring mime types Sebastien Jodogne <s.jodogne@gmail.com> parents: 2805 diff changeset	628 contentType = MIME_BINARY;
1523 c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	629 }
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	630
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	631 stateMachine_.SetContentType(contentType.c_str());
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	632
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	633 std::string filename;
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	634 if (stream.HasContentFilename(filename))
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	635 {
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	636 SetContentFilename(filename.c_str());
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	637 }
c388502a066d testing FilesystemHttpSender Sebastien Jodogne <s.jodogne@gmail.com> parents: 1522 diff changeset	638
1519 8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	639 while (stream.ReadNextChunk())
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	640 {
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	641 stateMachine_.SendBody(stream.GetChunkContent(),
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	642 stream.GetChunkSize());
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	643 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	644
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	645 stateMachine_.CloseBody();
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	646 }
8bd0d897763f refactoring: IHttpStreamAnswer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1517 diff changeset	647
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 }

Mercurial > hg > orthanc

annotate Core/HttpServer/HttpOutput.cpp @ 3316:4b1017928fc4