Исправлена опечатка

[vpproxy.git] / vphttp.py

diff --git a/vphttp.py b/vphttp.py
index 0a6ae43d3d3379e36cbaa5c4dec5c79a56f66341..0c09c5297bb8e040d32460a1201c517f473544ac 100644 (file)
--- a/vphttp.py
+++ b/vphttp.py
@@ -165,7 +165,7 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             self.reqtype = self.splittedpath[1].lower()
             # If first parameter is 'pid' or 'torrent' or it should be handled
             # by plugin
             self.reqtype = self.splittedpath[1].lower()
             # If first parameter is 'pid' or 'torrent' or it should be handled
             # by plugin

-            if not (self.reqtype in ('get','mp4','ogg') or self.reqtype in VPStuff.pluginshandlers):
+            if not (self.reqtype in ('get','mp4','ogg','ogv') or self.reqtype in VPStuff.pluginshandlers):

                 self.dieWithError(400)  # 400 Bad Request
                 return
         except IndexError:
                 self.dieWithError(400)  # 400 Bad Request
                 return
         except IndexError:


@@ -236,8 +236,9 @@ 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');
-            if self.reqtype=="ogg":
+            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:
                 self.send_header("Content-Type", "video/mpeg")
                 self.send_header("Content-Type", "video/ogg")
             else:
                 self.send_header("Content-Type", "video/mpeg")


@@ -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")