diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-04-06 21:43:23 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-04-06 21:43:23 +0200 |
| commit | 7da308a7e158542fba0b28d3ad0e865b9e60bfc4 (patch) | |
| tree | 84e11eab9c0608e71acedae999bbc3fba9c95d2a /src/HTTPServer/MultipartParser.cpp | |
| parent | Add CanChangeDirtToGrass function to Block Handlers. (diff) | |
| parent | Updated cWorld::CreateProjectile() documentation (diff) | |
| download | cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar.gz cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar.bz2 cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar.lz cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar.xz cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar.zst cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.zip | |
Diffstat (limited to 'src/HTTPServer/MultipartParser.cpp')
| -rw-r--r-- | src/HTTPServer/MultipartParser.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/HTTPServer/MultipartParser.cpp b/src/HTTPServer/MultipartParser.cpp index 14c2c00fa..309495dd7 100644 --- a/src/HTTPServer/MultipartParser.cpp +++ b/src/HTTPServer/MultipartParser.cpp @@ -97,8 +97,6 @@ cMultipartParser::cMultipartParser(const AString & a_ContentType, cCallbacks & a m_EnvelopeParser(*this), m_HasHadData(false) { - static AString s_Multipart = "multipart/"; - // Check that the content type is multipart: AString ContentType(a_ContentType); if (strncmp(ContentType.c_str(), "multipart/", 10) != 0) @@ -146,7 +144,7 @@ cMultipartParser::cMultipartParser(const AString & a_ContentType, cCallbacks & a -void cMultipartParser::Parse(const char * a_Data, int a_Size) +void cMultipartParser::Parse(const char * a_Data, size_t a_Size) { // Skip parsing if invalid if (!m_IsValid) @@ -160,8 +158,8 @@ void cMultipartParser::Parse(const char * a_Data, int a_Size) { if (m_EnvelopeParser.IsInHeaders()) { - int BytesConsumed = m_EnvelopeParser.Parse(m_IncomingData.data(), m_IncomingData.size()); - if (BytesConsumed < 0) + size_t BytesConsumed = m_EnvelopeParser.Parse(m_IncomingData.data(), m_IncomingData.size()); + if (BytesConsumed == AString::npos) { m_IsValid = false; return; |