Andrew Bonney
Modified version of NetServices. Fixes an issue where connections failed should the HTTP response status line be received in a packet on its own prior to any further headers. Changes are made to the HTTPClient.cpp file's readHeaders method.
services/http/client/data/HTTPText.cpp@0:ec559500a63f, 2011-04-08 (annotated)
- Committer:
- andrewbonney
- Date:
- Fri Apr 08 14:39:41 2011 +0000
- Revision:
- 0:ec559500a63f
Who changed what in which revision?
| User | Revision | Line number | New contents of line |
|---|---|---|---|
| andrewbonney | 0:ec559500a63f | 1 | |
| andrewbonney | 0:ec559500a63f | 2 | /* |
| andrewbonney | 0:ec559500a63f | 3 | Copyright (c) 2010 Donatien Garnier (donatiengar [at] gmail [dot] com) |
| andrewbonney | 0:ec559500a63f | 4 | |
| andrewbonney | 0:ec559500a63f | 5 | Permission is hereby granted, free of charge, to any person obtaining a copy |
| andrewbonney | 0:ec559500a63f | 6 | of this software and associated documentation files (the "Software"), to deal |
| andrewbonney | 0:ec559500a63f | 7 | in the Software without restriction, including without limitation the rights |
| andrewbonney | 0:ec559500a63f | 8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
| andrewbonney | 0:ec559500a63f | 9 | copies of the Software, and to permit persons to whom the Software is |
| andrewbonney | 0:ec559500a63f | 10 | furnished to do so, subject to the following conditions: |
| andrewbonney | 0:ec559500a63f | 11 | |
| andrewbonney | 0:ec559500a63f | 12 | The above copyright notice and this permission notice shall be included in |
| andrewbonney | 0:ec559500a63f | 13 | all copies or substantial portions of the Software. |
| andrewbonney | 0:ec559500a63f | 14 | |
| andrewbonney | 0:ec559500a63f | 15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| andrewbonney | 0:ec559500a63f | 16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| andrewbonney | 0:ec559500a63f | 17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
| andrewbonney | 0:ec559500a63f | 18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| andrewbonney | 0:ec559500a63f | 19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| andrewbonney | 0:ec559500a63f | 20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| andrewbonney | 0:ec559500a63f | 21 | THE SOFTWARE. |
| andrewbonney | 0:ec559500a63f | 22 | */ |
| andrewbonney | 0:ec559500a63f | 23 | |
| andrewbonney | 0:ec559500a63f | 24 | #include "HTTPText.h" |
| andrewbonney | 0:ec559500a63f | 25 | |
| andrewbonney | 0:ec559500a63f | 26 | |
| andrewbonney | 0:ec559500a63f | 27 | |
| andrewbonney | 0:ec559500a63f | 28 | #define MIN(a,b) ((a)<(b)?(a):(b)) |
| andrewbonney | 0:ec559500a63f | 29 | |
| andrewbonney | 0:ec559500a63f | 30 | HTTPText::HTTPText(const string& encoding /*= "text/html"*/, int maxSize /*= DEFAULT_MAX_MEM_ALLOC*/) : HTTPData(), m_buf(), m_encoding(encoding), m_maxSize(maxSize) |
| andrewbonney | 0:ec559500a63f | 31 | { |
| andrewbonney | 0:ec559500a63f | 32 | |
| andrewbonney | 0:ec559500a63f | 33 | } |
| andrewbonney | 0:ec559500a63f | 34 | |
| andrewbonney | 0:ec559500a63f | 35 | HTTPText::~HTTPText() |
| andrewbonney | 0:ec559500a63f | 36 | { |
| andrewbonney | 0:ec559500a63f | 37 | |
| andrewbonney | 0:ec559500a63f | 38 | } |
| andrewbonney | 0:ec559500a63f | 39 | |
| andrewbonney | 0:ec559500a63f | 40 | const char* HTTPText::gets() const |
| andrewbonney | 0:ec559500a63f | 41 | { |
| andrewbonney | 0:ec559500a63f | 42 | return m_buf.c_str(); |
| andrewbonney | 0:ec559500a63f | 43 | } |
| andrewbonney | 0:ec559500a63f | 44 | |
| andrewbonney | 0:ec559500a63f | 45 | void HTTPText::puts(const char* str) |
| andrewbonney | 0:ec559500a63f | 46 | { |
| andrewbonney | 0:ec559500a63f | 47 | m_buf = string(str); |
| andrewbonney | 0:ec559500a63f | 48 | } |
| andrewbonney | 0:ec559500a63f | 49 | |
| andrewbonney | 0:ec559500a63f | 50 | string& HTTPText::get() |
| andrewbonney | 0:ec559500a63f | 51 | { |
| andrewbonney | 0:ec559500a63f | 52 | return m_buf; |
| andrewbonney | 0:ec559500a63f | 53 | } |
| andrewbonney | 0:ec559500a63f | 54 | |
| andrewbonney | 0:ec559500a63f | 55 | void HTTPText::set(const string& str) |
| andrewbonney | 0:ec559500a63f | 56 | { |
| andrewbonney | 0:ec559500a63f | 57 | m_buf = str; |
| andrewbonney | 0:ec559500a63f | 58 | } |
| andrewbonney | 0:ec559500a63f | 59 | |
| andrewbonney | 0:ec559500a63f | 60 | void HTTPText::clear() |
| andrewbonney | 0:ec559500a63f | 61 | { |
| andrewbonney | 0:ec559500a63f | 62 | m_buf.clear(); |
| andrewbonney | 0:ec559500a63f | 63 | } |
| andrewbonney | 0:ec559500a63f | 64 | |
| andrewbonney | 0:ec559500a63f | 65 | int HTTPText::read(char* buf, int len) |
| andrewbonney | 0:ec559500a63f | 66 | { |
| andrewbonney | 0:ec559500a63f | 67 | len = MIN( len, m_buf.length() ); |
| andrewbonney | 0:ec559500a63f | 68 | memcpy( (void*)buf, (void*)m_buf.data(), len ); |
| andrewbonney | 0:ec559500a63f | 69 | m_buf.erase(0, len); //Erase these chars |
| andrewbonney | 0:ec559500a63f | 70 | return len; |
| andrewbonney | 0:ec559500a63f | 71 | } |
| andrewbonney | 0:ec559500a63f | 72 | |
| andrewbonney | 0:ec559500a63f | 73 | int HTTPText::write(const char* buf, int len) |
| andrewbonney | 0:ec559500a63f | 74 | { |
| andrewbonney | 0:ec559500a63f | 75 | len = MIN( m_maxSize - m_buf.length(), len ); //Do not go over m_maxSize |
| andrewbonney | 0:ec559500a63f | 76 | m_buf.append( buf, len ); |
| andrewbonney | 0:ec559500a63f | 77 | return len; |
| andrewbonney | 0:ec559500a63f | 78 | } |
| andrewbonney | 0:ec559500a63f | 79 | |
| andrewbonney | 0:ec559500a63f | 80 | string HTTPText::getDataType() //Internet media type for Content-Type header |
| andrewbonney | 0:ec559500a63f | 81 | { |
| andrewbonney | 0:ec559500a63f | 82 | return m_encoding; |
| andrewbonney | 0:ec559500a63f | 83 | } |
| andrewbonney | 0:ec559500a63f | 84 | |
| andrewbonney | 0:ec559500a63f | 85 | void HTTPText::setDataType(const string& type) //Internet media type from Content-Type header |
| andrewbonney | 0:ec559500a63f | 86 | { |
| andrewbonney | 0:ec559500a63f | 87 | //Do not really care here |
| andrewbonney | 0:ec559500a63f | 88 | } |
| andrewbonney | 0:ec559500a63f | 89 | |
| andrewbonney | 0:ec559500a63f | 90 | bool HTTPText::getIsChunked() //For Transfer-Encoding header |
| andrewbonney | 0:ec559500a63f | 91 | { |
| andrewbonney | 0:ec559500a63f | 92 | return false; //We don't want to chunk this |
| andrewbonney | 0:ec559500a63f | 93 | } |
| andrewbonney | 0:ec559500a63f | 94 | |
| andrewbonney | 0:ec559500a63f | 95 | void HTTPText::setIsChunked(bool chunked) //From Transfer-Encoding header |
| andrewbonney | 0:ec559500a63f | 96 | { |
| andrewbonney | 0:ec559500a63f | 97 | //Nothing to do |
| andrewbonney | 0:ec559500a63f | 98 | } |
| andrewbonney | 0:ec559500a63f | 99 | |
| andrewbonney | 0:ec559500a63f | 100 | int HTTPText::getDataLen() //For Content-Length header |
| andrewbonney | 0:ec559500a63f | 101 | { |
| andrewbonney | 0:ec559500a63f | 102 | return m_buf.length(); |
| andrewbonney | 0:ec559500a63f | 103 | } |
| andrewbonney | 0:ec559500a63f | 104 | |
| andrewbonney | 0:ec559500a63f | 105 | void HTTPText::setDataLen(int len) //From Content-Length header, or if the transfer is chunked, next chunk length |
| andrewbonney | 0:ec559500a63f | 106 | { |
| andrewbonney | 0:ec559500a63f | 107 | m_buf.reserve(MIN(m_buf.length() + len,m_maxSize)); |
| andrewbonney | 0:ec559500a63f | 108 | } |