[Android] Remove useless Chromecast patch
Nicolas Pomepuy
git at videolan.org
Fri Nov 13 07:31:03 CET 2020
vlc-android | branch: 3.3.x | Nicolas Pomepuy <nicolas at videolabs.io> | Wed Nov 4 14:37:44 2020 +0100| [60facc7355510bd0db05b18910f1a09fce6c3870] | committer: Nicolas Pomepuy
Remove useless Chromecast patch
(cherry picked from commit 7d8ab54fc733364746e60e2b46a73f0bb4bc24e7)
> https://code.videolan.org/videolan/vlc-android/commit/60facc7355510bd0db05b18910f1a09fce6c3870
---
...e-activity-time-before-processing-timeout.patch | 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/libvlc/patches/vlc3/0008-httpd-update-activity-time-before-processing-timeout.patch b/libvlc/patches/vlc3/0008-httpd-update-activity-time-before-processing-timeout.patch
deleted file mode 100644
index 0c3833d7d..000000000
--- a/libvlc/patches/vlc3/0008-httpd-update-activity-time-before-processing-timeout.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7ed2885b6a960e0f3d3d40b758b40dcbccaf9ba4 Mon Sep 17 00:00:00 2001
-Message-Id: <7ed2885b6a960e0f3d3d40b758b40dcbccaf9ba4.1602659942.git.nicolas at videolabs.io>
-In-Reply-To: <7911214e6bde9e4c74765cea26c5944e8e78ca98.1602659942.git.nicolas at videolabs.io>
-References: <7911214e6bde9e4c74765cea26c5944e8e78ca98.1602659942.git.nicolas at videolabs.io>
-From: Francois Cartegnie <fcvlcdev at free.fr>
-Date: Mon, 28 Sep 2020 17:52:16 +0200
-Subject: [PATCH 8/9] httpd: update activity time before processing timeout
- (#25151)
-
-as connection state handling block has moved in
-67cdaeea58641d6d515728596f8b194f52538e2b
-sockets can now timeout when still active.
-Message-Id: <0bb4737b520e5d4edd0dd50e48f747fff90b8df2.1601374253.git.nicolas at videolabs.io>
----
- src/network/httpd.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/network/httpd.c b/src/network/httpd.c
-index 3197fb2ec9..d9c19c2c29 100644
---- a/src/network/httpd.c
-+++ b/src/network/httpd.c
-@@ -1730,6 +1730,11 @@ static void httpdLoop(httpd_host_t *host)
- break;
- }
-
-+ if (val == 0) {
-+ cl->i_activity_date = now;
-+ delay = 0;
-+ }
-+
- if (cl->i_ref < 0 || (cl->i_ref == 0 &&
- (cl->i_state == HTTPD_CLIENT_DEAD ||
- (cl->i_activity_timeout > 0 &&
-@@ -1740,11 +1745,6 @@ static void httpdLoop(httpd_host_t *host)
- continue;
- }
-
-- if (val == 0) {
-- cl->i_activity_date = now;
-- delay = 0;
-- }
--
- struct pollfd *pufd = ufd + nfd;
- assert (pufd < ufd + (sizeof (ufd) / sizeof (ufd[0])));
-
---
-2.25.1
-
More information about the Android
mailing list