From 712f03464f8d2887fb7ca3040d0d8d6941636c09 2013-02-22 09:59:24
From: HanzZ <hanzz.k@gmail.com>
Date: 2013-02-22 09:59:24
Subject: [PATCH] Merge branch 'master' of github.com:hanzz/libtransport

---

diff --git a/backends/swiften_raw/CMakeLists.txt b/backends/swiften_raw/CMakeLists.txt
index ccd50e8e857599e2bc46c86de1332f6f2aa68b18..5d656002d9c245de0f331be2a6462ff96947fec8 100644
--- a/backends/swiften_raw/CMakeLists.txt
+++ b/backends/swiften_raw/CMakeLists.txt
@@ -10,5 +10,5 @@ else()
 target_link_libraries(spectrum2_swiften_raw_backend transport ${Boost_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
 endif()
 
-INSTALL(TARGETS spectrum2_swiften_raw_backend RUNTIME DESTINATION bin)
+#INSTALL(TARGETS spectrum2_swiften_raw_backend RUNTIME DESTINATION bin)
 
diff --git a/backends/twitter/TwitterResponseParser.cpp b/backends/twitter/TwitterResponseParser.cpp
index a6d919a9c66932890fd8e9de38a9ea45f07b0a56..f8ef061e9e33bd8f6422fdcd4754f155025c7f6d 100644
--- a/backends/twitter/TwitterResponseParser.cpp
+++ b/backends/twitter/TwitterResponseParser.cpp
@@ -137,11 +137,13 @@ std::vector<Status> getTimeline(std::string &xml)
 	
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML")
+        LOG4CXX_ERROR(logger, xml)
 		return statuses;
 	}
 
 	if(rootElement->getName() != "statuses") {
-		LOG4CXX_ERROR(logger, "XML doesn't correspond to timeline")
+		LOG4CXX_ERROR(logger, "XML doesn't correspond to timeline:")
+        LOG4CXX_ERROR(logger, xml)
 		return statuses;
 	}
 
@@ -162,11 +164,13 @@ std::vector<DirectMessage> getDirectMessages(std::string &xml)
 	
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML")
+        LOG4CXX_ERROR(logger, xml)
 		return DMs;
 	}
 	
 	if(rootElement->getName() != TwitterReponseTypes::directmessages) {
-		LOG4CXX_ERROR(logger, "XML doesn't correspond to direct-messages")
+		LOG4CXX_ERROR(logger, "XML doesn't correspond to direct-messages:")
+        LOG4CXX_ERROR(logger, xml)
 		return DMs;
 	}
 
@@ -187,11 +191,13 @@ std::vector<User> getUsers(std::string &xml)
 	
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML")
+        LOG4CXX_ERROR(logger, xml)
 		return users;
 	}
 
 	if(rootElement->getName() != TwitterReponseTypes::users) {
-		LOG4CXX_ERROR(logger, "XML doesn't correspond to user list")
+		LOG4CXX_ERROR(logger, "XML doesn't correspond to user list:")
+        LOG4CXX_ERROR(logger, xml)
 		return users;
 	}
 
@@ -212,11 +218,13 @@ User getUser(std::string &xml)
 	
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML")
+        LOG4CXX_ERROR(logger, xml)
 		return user;
 	}
 
 	if(rootElement->getName() != TwitterReponseTypes::user) {
 		LOG4CXX_ERROR(logger, "XML doesn't correspond to user object")
+        LOG4CXX_ERROR(logger, xml)
 		return user;
 	}
 
@@ -231,11 +239,13 @@ std::vector<std::string> getIDs(std::string &xml)
 
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML")
+        LOG4CXX_ERROR(logger, xml)
 		return IDs;
 	}
 
 	if(rootElement->getName() != TwitterReponseTypes::id_list) {
 		LOG4CXX_ERROR(logger, "XML doesn't correspond to id_list");
+        LOG4CXX_ERROR(logger, xml)
 		return IDs;
 	}
 
@@ -258,6 +268,7 @@ Error getErrorMessage(std::string &xml)
 
 	if(rootElement == NULL) {
 		LOG4CXX_ERROR(logger, "Error while parsing XML");
+        LOG4CXX_ERROR(logger, xml)
 		return resp;
 	}
 
diff --git a/backends/twitter/libtwitcurl/twitcurl.cpp b/backends/twitter/libtwitcurl/twitcurl.cpp
index 6d2b2577360b838c041ebb26d9641afe581885a6..a22b887c6d7906dce113e0e3c2f807aadd683de5 100644
--- a/backends/twitter/libtwitcurl/twitcurl.cpp
+++ b/backends/twitter/libtwitcurl/twitcurl.cpp
@@ -41,6 +41,7 @@ m_eProtocolType( twitCurlTypes::eTwitCurlProtocolHttp )
         getLastCurlError( dummyStr );
     }
     curl_easy_setopt(m_curlHandle, CURLOPT_VERBOSE, 1);
+    curl_easy_setopt(m_curlHandle, CURLOPT_FOLLOWLOCATION, 1);
 	curl_easy_setopt(m_curlHandle, CURLOPT_DEBUGFUNCTION, myDebugCallback);
 }