[SCM] vlc/master: Apply upstream patch to fix VLSub

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Fri Dec 9 14:15:03 UTC 2016


The following commit has been merged in the master branch:
commit 1274a611a7b955dbd8ea386a740a5b03369da35c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Dec 9 15:12:56 2016 +0100

    Apply upstream patch to fix VLSub
    
    Closes: #847559

diff --git a/debian/patches/VLSub-don-t-pretend-to-support-HTTP-1.1.patch b/debian/patches/VLSub-don-t-pretend-to-support-HTTP-1.1.patch
new file mode 100644
index 0000000..c215d8f
--- /dev/null
+++ b/debian/patches/VLSub-don-t-pretend-to-support-HTTP-1.1.patch
@@ -0,0 +1,39 @@
+From 4b1c65d5da017d807efea415fb3ab069945da75d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi at remlab.net>
+Date: Sun, 4 Dec 2016 14:36:29 +0200
+Subject: [PATCH] VLSub: don't pretend to support HTTP 1.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+(cherry picked from commit 5c26ad66d4b3b1d3de13ae778161f9ddde25cd59)
+Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
+---
+ share/lua/extensions/VLSub.lua | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/share/lua/extensions/VLSub.lua b/share/lua/extensions/VLSub.lua
+index ecac0030ac..cd6f7b770d 100644
+--- a/share/lua/extensions/VLSub.lua
++++ b/share/lua/extensions/VLSub.lua
+@@ -1189,7 +1189,7 @@ openSub = {
+     local request = "<?xml version='1.0'?>"..dump_xml(reqTable)
+     local host, path = parse_url(openSub.conf.url)		
+     local header = {
+-      "POST "..path.." HTTP/1.1", 
++      "POST "..path.." HTTP/1.0", 
+       "Host: "..host, 
+       "User-Agent: "..openSub.conf.userAgentHTTP, 
+       "Content-Type: text/xml", 
+@@ -1840,7 +1840,7 @@ end
+ function get(url)
+   local host, path = parse_url(url)
+   local header = {
+-    "GET "..path.." HTTP/1.1", 
++    "GET "..path.." HTTP/1.0", 
+     "Host: "..host, 
+     "User-Agent: "..openSub.conf.userAgentHTTP,
+     "",
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 0343604..683cccf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ skins2-do-not-save-user-and-group-names-in-the-defau.patch
 skins-remove-timestamp-from-default.vlt-fixes-4562.patch
 skins-implement-silent-mode-make.patch
 skins2-do-not-generate-broken-default.vlt-on-error.patch
+VLSub-don-t-pretend-to-support-HTTP-1.1.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list