From 8342c9e5546df01e2931ea15bf652532f484c10a Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 3 Aug 2015 13:13:49 +0200 Subject: [PATCH] [Transcode] Close stderr fd in order to avoid potential transcode locks --- src/transcode/AvConvTranscoder.cpp | 1 + src/ui/resource/AvConvTranscodeStreamResource.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/transcode/AvConvTranscoder.cpp b/src/transcode/AvConvTranscoder.cpp index 655bffc6..8d50d685 100644 --- a/src/transcode/AvConvTranscoder.cpp +++ b/src/transcode/AvConvTranscoder.cpp @@ -164,6 +164,7 @@ AvConvTranscoder::AvConvTranscoder(const Parameters& parameters) boost::process::initializers::set_cmd_line(oss.str()), boost::process::initializers::bind_stdout(sink), boost::process::initializers::close_fd(STDIN_FILENO), + boost::process::initializers::close_fd(STDERR_FILENO), boost::process::initializers::close_fds(ranges) ) ); diff --git a/src/ui/resource/AvConvTranscodeStreamResource.cpp b/src/ui/resource/AvConvTranscodeStreamResource.cpp index 025455a2..7eb81ad8 100644 --- a/src/ui/resource/AvConvTranscodeStreamResource.cpp +++ b/src/ui/resource/AvConvTranscodeStreamResource.cpp @@ -47,7 +47,7 @@ AvConvTranscodeStreamResource::handleRequest(const Wt::Http::Request& request, // see if this request is for a continuation: Wt::Http::ResponseContinuation *continuation = request.continuation(); - LMS_LOG(MOD_UI, SEV_DEBUG) << "Handling new request. Continuation = " << std::boolalpha << continuation; + LMS_LOG(MOD_UI, SEV_DEBUG) << "Handling new request. Continuation = " << continuation; std::shared_ptr transcoder; if (continuation)