Hello community, here is the log from the commit of package SimGear for openSUSE:Factory checked in at 2019-03-06 15:50:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SimGear (Old) and /work/SRC/openSUSE:Factory/.SimGear.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SimGear" Wed Mar 6 15:50:56 2019 rev:10 rq:681969 version:2018.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2019-02-19 12:00:07.541147076 +0100 +++ /work/SRC/openSUSE:Factory/.SimGear.new.28833/SimGear.changes 2019-03-06 15:51:04.692439578 +0100 @@ -1,0 +2,6 @@ +Mon Mar 4 20:09:34 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix redirect handling, add + 0001-Improve-HTTP-redirect-handling-and-add-test.patch + +------------------------------------------------------------------- New: ---- 0001-Improve-HTTP-redirect-handling-and-add-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SimGear.spec ++++++ --- /var/tmp/diff_new_pack.uvPEE9/_old 2019-03-06 15:51:06.140439319 +0100 +++ /var/tmp/diff_new_pack.uvPEE9/_new 2019-03-06 15:51:06.168439314 +0100 @@ -1,7 +1,7 @@ # # spec file for package SimGear # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,8 @@ Group: Amusements/Games/3D/Simulation Url: http://www.flightgear.org/ Source0: https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM 0001-Improve-HTTP-redirect-handling-and-add-test.patch +Patch0: 0001-Improve-HTTP-redirect-handling-and-add-test.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libOpenSceneGraph-devel < 3.6 @@ -87,6 +89,7 @@ %prep %setup -q -n simgear-%{version} +%patch0 -p1 %build export CFLAGS="%{optflags}" ++++++ 0001-Improve-HTTP-redirect-handling-and-add-test.patch ++++++ >From 34b3c52a288d62779073fc7694344d0658755645 Mon Sep 17 00:00:00 2001 From: James Turner <zakal...@mac.com> Date: Wed, 13 Feb 2019 12:34:17 +0000 Subject: [PATCH] Improve HTTP redirect handling, and add test. Ensure we get the final status code for the request after redirecting. --- simgear/io/HTTPClient.cxx | 14 ++++++++++++++ simgear/io/HTTPRequest.cxx | 10 ++++++++++ simgear/io/HTTPRequest.hxx | 2 +- simgear/io/test_HTTP.cxx | 36 +++++++++++++++++++++++++++++++++++- simgear/io/test_HTTP.hxx | 6 ++---- 5 files changed, 62 insertions(+), 6 deletions(-) diff --git a/simgear/io/HTTPClient.cxx b/simgear/io/HTTPClient.cxx index 0c31354b..0adf0be8 100644 --- a/simgear/io/HTTPClient.cxx +++ b/simgear/io/HTTPClient.cxx @@ -476,12 +476,26 @@ size_t Client::requestReadCallback(char *ptr, size_t size, size_t nmemb, void *u return actualBytes; } +bool isRedirectStatus(int code) +{ + return ((code >= 300) && (code < 400)); +} + size_t Client::requestHeaderCallback(char *rawBuffer, size_t size, size_t nitems, void *userdata) { size_t byteSize = size * nitems; Request* req = static_cast<Request*>(userdata); std::string h = strutils::simplify(std::string(rawBuffer, byteSize)); + if (req->readyState() >= HTTP::Request::HEADERS_RECEIVED) { + // this can happen with chunked transfers (secondary chunks) + // or redirects + if (isRedirectStatus(req->responseCode())) { + req->responseStart(h); + return byteSize; + } + } + if (req->readyState() == HTTP::Request::OPENED) { req->responseStart(h); return byteSize; diff --git a/simgear/io/HTTPRequest.cxx b/simgear/io/HTTPRequest.cxx index 294d2f0c..7266d780 100644 --- a/simgear/io/HTTPRequest.cxx +++ b/simgear/io/HTTPRequest.cxx @@ -328,6 +328,16 @@ unsigned int Request::responseLength() const return _responseLength; } +//------------------------------------------------------------------------------ +void Request::setSuccess(int code) +{ + _responseStatus = code; + _responseReason.clear(); + if( !isComplete() ) { + setReadyState(DONE); + } +} + //------------------------------------------------------------------------------ void Request::setFailure(int code, const std::string& reason) { diff --git a/simgear/io/HTTPRequest.hxx b/simgear/io/HTTPRequest.hxx index 0def0888..9ba8db3e 100644 --- a/simgear/io/HTTPRequest.hxx +++ b/simgear/io/HTTPRequest.hxx @@ -224,7 +224,7 @@ protected: virtual void onAlways(); void setFailure(int code, const std::string& reason); - + void setSuccess(int code); private: friend class Client; friend class Connection; diff --git a/simgear/io/test_HTTP.cxx b/simgear/io/test_HTTP.cxx index 3bf9947d..ccef3f9e 100644 --- a/simgear/io/test_HTTP.cxx +++ b/simgear/io/test_HTTP.cxx @@ -273,7 +273,23 @@ public: d << "\r\n"; // final CRLF to terminate the headers d << contentStr; push(d.str().c_str()); - + } else if (path == "/test_redirect") { + string contentStr("<html>See <a href=\"wibble\">Here</a></html>"); + stringstream d; + d << "HTTP/1.1 " << 302 << " " << "Found" << "\r\n"; + d << "Location:" << " http://localhost:2000/was_redirected"; << "\r\n"; + d << "Content-Length:" << contentStr.size() << "\r\n"; + d << "\r\n"; // final CRLF to terminate the headers + d << contentStr; + push(d.str().c_str()); + } else if (path == "/was_redirected") { + string contentStr(BODY1); + stringstream d; + d << "HTTP/1.1 " << 200 << " " << reasonForCode(200) << "\r\n"; + d << "Content-Length:" << contentStr.size() << "\r\n"; + d << "\r\n"; // final CRLF to terminate the headers + d << contentStr; + push(d.str().c_str()); } else { TestServerChannel::processRequestHeaders(); } @@ -773,6 +789,24 @@ cout << "testing proxy close" << endl; SG_CHECK_EQUAL(tr2->bodyData, string(BODY1)); SG_CHECK_EQUAL(tr2->responseBytesReceived(), strlen(BODY1)); } + + { + cout << "redirect test" << endl; + // redirect test + testServer.disconnectAll(); + cl.clearAllConnections(); + + TestRequest* tr = new TestRequest("http://localhost:2000/test_redirect";); + HTTP::Request_ptr own(tr); + cl.makeRequest(tr); + + waitForComplete(&cl, tr); + SG_CHECK_EQUAL(tr->responseCode(), 200); + SG_CHECK_EQUAL(tr->responseReason(), string("OK")); + SG_CHECK_EQUAL(tr->responseLength(), strlen(BODY1)); + SG_CHECK_EQUAL(tr->responseBytesReceived(), strlen(BODY1)); + SG_CHECK_EQUAL(tr->bodyData, string(BODY1)); + } cout << "all tests passed ok" << endl; return EXIT_SUCCESS; diff --git a/simgear/io/test_HTTP.hxx b/simgear/io/test_HTTP.hxx index 3cb925c0..f8dde98c 100644 --- a/simgear/io/test_HTTP.hxx +++ b/simgear/io/test_HTTP.hxx @@ -30,7 +30,6 @@ public: virtual ~TestServerChannel() { - std::cerr << "dtor test server channel" << std::endl; } virtual void collectIncomingData(const char* s, int n) @@ -139,8 +138,8 @@ public: void sendErrorResponse(int code, bool close, std::string content) { - std::cerr << "sending error " << code << " for " << path << std::endl; - std::cerr << "\tcontent:" << content << std::endl; + // std::cerr << "sending error " << code << " for " << path << std::endl; + // std::cerr << "\tcontent:" << content << std::endl; std::stringstream headerData; headerData << "HTTP/1.1 " << code << " " << reasonForCode(code) << "\r\n"; @@ -168,7 +167,6 @@ public: virtual void handleClose (void) { - std::cerr << "channel close" << std::endl; NetBufferChannel::handleClose(); } -- 2.21.0
