From 2508e9f9ff4ff172d235678c9a06ebc4cd32ea20 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 18 Jun 2016 12:34:39 -0700 Subject: [PATCH] Add timeout to mjpeg streams --- homeassistant/components/camera/mjpeg.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/camera/mjpeg.py b/homeassistant/components/camera/mjpeg.py index affc4c1ccda..b7f31404a8f 100644 --- a/homeassistant/components/camera/mjpeg.py +++ b/homeassistant/components/camera/mjpeg.py @@ -46,10 +46,9 @@ class MjpegCamera(Camera): return requests.get(self._mjpeg_url, auth=HTTPBasicAuth(self._username, self._password), - stream=True) + stream=True, timeout=10) else: - return requests.get(self._mjpeg_url, - stream=True) + return requests.get(self._mjpeg_url, stream=True, timeout=10) def camera_image(self): """Return a still image response from the camera."""