New upstream version 1.3.4

Author: xhaakon

.travis.yml

@@ -15,14 +15,10 @@ matrix:
         - env: BUILD_TYPE=Debug
         - env: BUILD_TYPE=Release
         - os: osx
-          osx_image: xcode7.3
+          osx_image: xcode10.2
           env: BUILD_TYPE=Debug
-          before_install: brew update
-          install: brew install openssl gnutls nettle
         - os: osx
-          osx_image: xcode7.3
-          before_install: brew update
-          install: brew install openssl gnutls nettle
+          osx_image: xcode10.2
           env: BUILD_TYPE=Release
         - os: linux
           compiler: x86_64-w64-mingw32-g++
@@ -35,9 +31,8 @@ matrix:
                 - gcc-mingw-w64
                 - g++-mingw-w64-x86-64
           before_script:
-            - git clone https://github.com/openssl/openssl.git
+            - git clone -b OpenSSL_1_1_1-stable https://github.com/openssl/openssl.git openssl
             - cd openssl
-            - git checkout origin/OpenSSL_1_1_0-stable -b OpenSSL_1_1_0-stable
             - ./Configure --cross-compile-prefix=x86_64-w64-mingw32- mingw64
             - make
             - cd ..

apps/srt-multiplex.cpp renamed to ATTIC/srt-multiplex.cpp

@@ -105,8 +105,8 @@ struct MediumPair
 
         if (!initial_portion.empty())
         {
-            tar->Write(initial_portion);
-            if ( tar->Broken() )
+            tar->Write(initial_portion.data(), initial_portion.size());
+            if (tar->Broken())
             {
                 applog.Note() << "OUTPUT BROKEN for loop: " << name;
                 return;
@@ -121,7 +121,8 @@ struct MediumPair
                 ostringstream sout;
                 alarm(1);
                 bytevector data;
-                src->Read(chunk, data);
+                const int read_res = src->Read(chunk, data);
+
                 alarm(0);
                 if (alarm_state)
                 {
@@ -131,15 +132,15 @@ struct MediumPair
                         break;
                     continue;
                 }
-                sout << " << " << data.size() << "  ->  ";
-                if ( data.empty() && src->End() )
+                sout << " << " << read_res << "  ->  ";
+                if (read_res <= 0 || (data.empty() && src->End()))
                 {
                     sout << "EOS";
                     applog.Note() << sout.str();
                     break;
                 }
-                tar->Write(data);
-                if ( tar->Broken() )
+                tar->Write(data.data(), data.size());
+                if (tar->Broken())
                 {
                     sout << " OUTPUT broken";
                     applog.Note() << sout.str();
@@ -565,9 +566,9 @@ int main( int argc, char** argv )
     }
 
     int iport = atoi(up.port().c_str());
-    if ( iport <= 1024 )
+    if ( iport < 1024 )
     {
-        cerr << "Port value invalid: " << iport << " - must be >1024\n";
+        cerr << "Port value invalid: " << iport << " - must be >=1024\n";
         return 1;
     }