Merge lp:~zorba-coders/zorba/trim-http_status into lp:zorba

[Matthias Brantner]

fix bug causing an untrimmed status message in the result of an http request

fix bug causing an untrimmed status message in the result of an http request

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/trim-http_status/+merge/214314

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/trim-http_status/+merge/214314 :
Votes: {'Approve': 1, 'Pending': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/trim-http_status/+merge/214314

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu:8180/job/CommitZorba/312/console to view the results.

[William Candillon (wcandillon)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/trim-http_status/+merge/214314

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'modules/http-client/json/http-client.xq.src/http_response_parser.cpp'
--- modules/http-client/json/http-client.xq.src/http_response_parser.cpp	2014-01-10 15:23:51 +0000
+++ modules/http-client/json/http-client.xq.src/http_response_parser.cpp	2014-04-04 17:28:32 +0000
@@ -30,6 +30,7 @@
 #include <zorba/item.h>
 #include <zorba/item_factory.h>
 #include <zorba/util/transcode_stream.h>
+#include <zorba/zorba_functions.h>
 #include <zorba/xmldatamanager.h>
 #include <zorba/xquery_exception.h>
 #include <zorba/xquery_exception.h>
@@ -286,12 +287,15 @@
 
   void HttpResponseParser::parseStatusAndMessage(std::string const &aHeader)
   {
-    std::string::size_type lPos = aHeader.find(' ');
-    assert(lPos != std::string::npos);
-    std::string lStatus = aHeader.substr(lPos, aHeader.find(' ', lPos + 1));
+    zorba::String lHeader(aHeader);
+    zfn::trim(lHeader);
+    zorba::String::size_type lPos = aHeader.find(' ');
+    assert(lPos != zorba::String::npos);
+    zorba::String lStatus = aHeader.substr(lPos, aHeader.find(' ', lPos + 1));
     theMessage = aHeader.substr(aHeader.find(' ', lPos + 1) + 1);
+
     {
-      std::string::size_type lPosition = theMessage.size() - 1;
+      zorba::String::size_type lPosition = theMessage.size() - 1;
       while (true) {
         if (lPosition != std::string::npos) {
           break;
@@ -304,7 +308,7 @@
       }
       theMessage = theMessage.substr(0, lPosition + 1);
     }
-    std::stringstream lStream(lStatus);
+    std::stringstream lStream(lStatus.c_str());
     lStream >> theStatus;
     // everything that is not a valid http status is an error
     if (theStatus < 100) {