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/util/urlencode.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 "url.h" |
| andrewbonney | 0:ec559500a63f | 25 | #include <stdlib.h> |
| andrewbonney | 0:ec559500a63f | 26 | #include <ctype.h> |
| andrewbonney | 0:ec559500a63f | 27 | |
| andrewbonney | 0:ec559500a63f | 28 | //From http://www.geekhideout.com/urlcode.shtml |
| andrewbonney | 0:ec559500a63f | 29 | |
| andrewbonney | 0:ec559500a63f | 30 | char from_hex(char ch); |
| andrewbonney | 0:ec559500a63f | 31 | char to_hex(char code); |
| andrewbonney | 0:ec559500a63f | 32 | |
| andrewbonney | 0:ec559500a63f | 33 | /* Converts a hex character to its integer value */ |
| andrewbonney | 0:ec559500a63f | 34 | char from_hex(char ch) { |
| andrewbonney | 0:ec559500a63f | 35 | return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10; |
| andrewbonney | 0:ec559500a63f | 36 | } |
| andrewbonney | 0:ec559500a63f | 37 | |
| andrewbonney | 0:ec559500a63f | 38 | /* Converts an integer value to its hex character*/ |
| andrewbonney | 0:ec559500a63f | 39 | char to_hex(char code) { |
| andrewbonney | 0:ec559500a63f | 40 | static char hex[] = "0123456789abcdef"; |
| andrewbonney | 0:ec559500a63f | 41 | return hex[code & 15]; |
| andrewbonney | 0:ec559500a63f | 42 | } |
| andrewbonney | 0:ec559500a63f | 43 | |
| andrewbonney | 0:ec559500a63f | 44 | /* Returns a url-encoded version of str */ |
| andrewbonney | 0:ec559500a63f | 45 | /* IMPORTANT: be sure to free() the returned string after use */ |
| andrewbonney | 0:ec559500a63f | 46 | char *url_encode(char *str) { |
| andrewbonney | 0:ec559500a63f | 47 | char *pstr = str, *buf = (char*)malloc(strlen(str) * 3 + 1), *pbuf = buf; |
| andrewbonney | 0:ec559500a63f | 48 | while (*pstr) { |
| andrewbonney | 0:ec559500a63f | 49 | if (isalnum(*pstr) || *pstr == '-' || *pstr == '_' || *pstr == '.' || *pstr == '~') |
| andrewbonney | 0:ec559500a63f | 50 | *pbuf++ = *pstr; |
| andrewbonney | 0:ec559500a63f | 51 | else if (*pstr == ' ') |
| andrewbonney | 0:ec559500a63f | 52 | *pbuf++ = '+'; |
| andrewbonney | 0:ec559500a63f | 53 | else |
| andrewbonney | 0:ec559500a63f | 54 | *pbuf++ = '%', *pbuf++ = to_hex(*pstr >> 4), *pbuf++ = to_hex(*pstr & 15); |
| andrewbonney | 0:ec559500a63f | 55 | pstr++; |
| andrewbonney | 0:ec559500a63f | 56 | } |
| andrewbonney | 0:ec559500a63f | 57 | *pbuf = '\0'; |
| andrewbonney | 0:ec559500a63f | 58 | return buf; |
| andrewbonney | 0:ec559500a63f | 59 | } |
| andrewbonney | 0:ec559500a63f | 60 | |
| andrewbonney | 0:ec559500a63f | 61 | /* Returns a url-decoded version of str */ |
| andrewbonney | 0:ec559500a63f | 62 | /* IMPORTANT: be sure to free() the returned string after use */ |
| andrewbonney | 0:ec559500a63f | 63 | char *url_decode(char *str) { |
| andrewbonney | 0:ec559500a63f | 64 | char *pstr = str, *buf = (char*)malloc(strlen(str) + 1), *pbuf = buf; |
| andrewbonney | 0:ec559500a63f | 65 | while (*pstr) { |
| andrewbonney | 0:ec559500a63f | 66 | if (*pstr == '%') { |
| andrewbonney | 0:ec559500a63f | 67 | if (pstr[1] && pstr[2]) { |
| andrewbonney | 0:ec559500a63f | 68 | *pbuf++ = from_hex(pstr[1]) << 4 | from_hex(pstr[2]); |
| andrewbonney | 0:ec559500a63f | 69 | pstr += 2; |
| andrewbonney | 0:ec559500a63f | 70 | } |
| andrewbonney | 0:ec559500a63f | 71 | } else if (*pstr == '+') { |
| andrewbonney | 0:ec559500a63f | 72 | *pbuf++ = ' '; |
| andrewbonney | 0:ec559500a63f | 73 | } else { |
| andrewbonney | 0:ec559500a63f | 74 | *pbuf++ = *pstr; |
| andrewbonney | 0:ec559500a63f | 75 | } |
| andrewbonney | 0:ec559500a63f | 76 | pstr++; |
| andrewbonney | 0:ec559500a63f | 77 | } |
| andrewbonney | 0:ec559500a63f | 78 | *pbuf = '\0'; |
| andrewbonney | 0:ec559500a63f | 79 | return buf; |
| andrewbonney | 0:ec559500a63f | 80 | } |