Сделана корректная обработка "неаккуратных" файлов с пропущенными кавычками вокруг...

[vpproxy.git] / vphttp.py

diff --git a/vphttp.py b/vphttp.py
index 155db57e8a739b03e35927112d76df419053c83d..0c09c5297bb8e040d32460a1201c517f473544ac 100644 (file)
--- a/vphttp.py
+++ b/vphttp.py
@@ -236,7 +236,8 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             logger.debug(
                 "Sending fake headers for " + useragent)
             self.send_response(200)
             logger.debug(
                 "Sending fake headers for " + useragent)
             self.send_response(200)

-            self.send_header('Cache-Control','no-cache');
+            self.send_header('Cache-Control','no-cache, no-store, must-revalidate');
+            self.send_header('Pragma','no-cache');

             if self.reqtype in ("ogg","ogv"):
                 self.send_header("Content-Type", "video/ogg")
             else:
             if self.reqtype in ("ogg","ogv"):
                 self.send_header("Content-Type", "video/ogg")
             else:


@@ -297,7 +298,8 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                 for key in self.video.info().dict:
                     self.send_header(key, self.video.info().dict[key])
 
                 for key in self.video.info().dict:
                     self.send_header(key, self.video.info().dict[key])
 

-                self.send_header('Cache-Control','no-cache');
+                self.send_header('Cache-Control','no-cache, no-store, must-revalidate');
+                self.send_header('Pragma','no-cache');

 
                 if self.reqtype=="ogg":
                     self.send_header("Content-Type", "video/ogg")
 
                 if self.reqtype=="ogg":
                     self.send_header("Content-Type", "video/ogg")


@@ -339,7 +341,7 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                 except:
                     pass
                 self.vp.destroy()
                 except:
                     pass
                 self.vp.destroy()

-            if not self.headersent:
+            if not self.headerssent:

                 logger.error("Problem receiving video stream, no headers!")
                 if VPStuff.clientcounter.total == 0:
                     logger.error("Probably VLC hang")
                 logger.error("Problem receiving video stream, no headers!")
                 if VPStuff.clientcounter.total == 0:
                     logger.error("Probably VLC hang")