projects
/
shibboleth
/
cpp-xmltooling.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
77e5b4a
)
https://issues.shibboleth.net/jira/browse/CPPXT-83
author
Scott Cantor
<cantor.2@osu.edu>
Fri, 10 Feb 2012 19:50:30 +0000
(19:50 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Fri, 10 Feb 2012 19:50:30 +0000
(19:50 +0000)
xmltooling/util/CurlURLInputStream.cpp
patch
|
blob
|
history
diff --git
a/xmltooling/util/CurlURLInputStream.cpp
b/xmltooling/util/CurlURLInputStream.cpp
index
4d1e4b3
..
2c91f4b
100644
(file)
--- a/
xmltooling/util/CurlURLInputStream.cpp
+++ b/
xmltooling/util/CurlURLInputStream.cpp
@@
-75,7
+75,7
@@
namespace {
size_t curl_header_hook(void* ptr, size_t size, size_t nmemb, void* stream)
{
// only handle single-byte data
size_t curl_header_hook(void* ptr, size_t size, size_t nmemb, void* stream)
{
// only handle single-byte data
- if (size
!=1 || nmemb<
5 || !stream)
+ if (size
!= 1 || nmemb <
5 || !stream)
return nmemb;
string* cacheTag = reinterpret_cast<string*>(stream);
const char* hdr = reinterpret_cast<char*>(ptr);
return nmemb;
string* cacheTag = reinterpret_cast<string*>(stream);
const char* hdr = reinterpret_cast<char*>(ptr);
@@
-117,9
+117,9
@@
namespace {
}
break;
}
}
break;
}
- // append until
whitespace
+ // append until
data's gone or we see a CR/LF
while (remaining > 0) {
while (remaining > 0) {
- if (
!isspace(*hdr)
) {
+ if (
*hdr != '\r' && *hdr != '\n'
) {
(*cacheTag) += *hdr++;
--remaining;
continue;
(*cacheTag) += *hdr++;
--remaining;
continue;