summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/http/http.hpp
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-12-29 07:24:32 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-12-29 07:24:32 +0000
commit2fedb4a4b67f7856bbfc5d1508524ef9c3d85942 (patch)
treedb1669ec28075f3866ef5ab4e71eb57f4299bb40 /sca-cpp/trunk/modules/http/http.hpp
parent788cba4bc8028279dcf8dcd1ac192f0ce078a971 (diff)
Remove type=feed and type=entry parameters from application/atom+xml media types as they make IE 6's XMLHttpRequest hang.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1053559 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http/http.hpp')
-rw-r--r--sca-cpp/trunk/modules/http/http.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sca-cpp/trunk/modules/http/http.hpp b/sca-cpp/trunk/modules/http/http.hpp
index 95b904435d..26a2e0cf0c 100644
--- a/sca-cpp/trunk/modules/http/http.hpp
+++ b/sca-cpp/trunk/modules/http/http.hpp
@@ -405,13 +405,13 @@ const failable<value> get(const string& url, const CURLSession& cs) {
const list<string> ls(reverse(cadr(content(res))));
debug(ls, "http::get::content");
- if (contains(ct, "application/atom+xml;type=entry")) {
+ if (atom::isATOMEntry(ls)) {
// Read an ATOM entry
const value val(atom::entryValue(content(atom::readATOMEntry(ls))));
debug(val, "http::get::result");
return val;
}
- if (contains(ct, "application/atom+xml;type=feed") || atom::isATOMFeed(ls)) {
+ if (contains(ct, "application/atom+xml") || atom::isATOMFeed(ls)) {
// Read an ATOM feed
const value val(atom::feedValues(content(atom::readATOMFeed(ls))));
debug(val, "http::get::result");