New version : 2018.3.4

Aircraft model reinit deletes sound effect samples, but leaves them defined in the sample group, so a reload doesn't re-add them.
[soundmgr_openal] Pause/Resume Sound.
2019-08-07 09:58:45 +01:00 · 2019-07-30 16:36:49 +01:00 · 2019-07-30 16:36:49 +01:00 · 2019-07-30 16:36:49 +01:00 · 2019-07-30 16:36:49 +01:00
9 changed files with 73 additions and 11 deletions
--- a/simgear/io/HTTPClient.cxx
+++ b/simgear/io/HTTPClient.cxx
@@ -472,12 +472,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;
--- 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)
 {
--- 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;
--- 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;
--- 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();
    }

--- a/simgear/nasal/lib.c
+++ b/simgear/nasal/lib.c
@@ -302,15 +302,18 @@ static char* dosprintf(char* f, ...)
    char* buf;
    va_list va;
    int olen, len = 16;
+    va_start(va, f);
    while(1) {
        buf = naAlloc(len);
-        va_start(va, f);
-        olen = vsnprintf(buf, len, f, va);
+        va_list vaCopy;
+        va_copy(vaCopy, va);
+        olen = vsnprintf(buf, len, f, vaCopy);
        if(olen >= 0 && olen < len) {
            va_end(va);
+            va_end(vaCopy);
            return buf;
        }
-        va_end(va);
+        va_end(vaCopy);
        naFree(buf);
        len *= 2;
    }
--- a/simgear/sound/soundmgr_openal.cxx
+++ b/simgear/sound/soundmgr_openal.cxx
@@ -340,7 +340,7 @@ void SGSoundMgr::suspend()
        for ( auto current = d->_sample_groups.begin();
                   current != d->_sample_groups.end(); ++current ) {
            SGSampleGroup *sgrp = current->second;
-            sgrp->stop();
+            sgrp->suspend();
        }
        _active = false;
    }
--- a/simgear/sound/xmlsound.cxx
+++ b/simgear/sound/xmlsound.cxx
@@ -83,6 +83,9 @@ SGXmlSound::~SGXmlSound()
    if (_sample)
        _sample->stop();

+    if (_sgrp && (_name != ""))
+        _sgrp->remove(_name);
+
    _volume.clear();
    _pitch.clear();
 }
--- a/2
+++ b/2
@@ -1 +1 @@
-2018.3.3
+2018.3.4
Author	SHA1	Message	Date
James Turner	1b3c048363	New version : 2018.3.4	2019-08-07 09:58:45 +01:00
Dan Wickstrom	01f689a0e4	Aircraft model reinit deletes sound effect samples, but leaves them defined in the sample group, so a reload doesn't re-add them.	2019-07-30 16:36:49 +01:00
Scott Giese	b155f2e40f	[soundmgr_openal] Pause/Resume Sound. The following changes fixes a case for me where I hear the sound change levels up and down for each pause un-pause cycle. Patch provided by daniel.c.wickstrom@gmail.com.	2019-07-30 16:36:49 +01:00
Tim Moore	10ab8b830a	nasal/lib.c: Make copy of va_list for each traversal It's not portable to traverse a va_list more than once.	2019-07-30 16:36:49 +01:00
James Turner	8a4871db83	Improve HTTP redirect handling, and add test. Ensure we get the final status code for the request after redirecting.	2019-07-30 16:36:49 +01:00
@@ -1 +1 @@
 .3.3
 .3.4