Обработка Unicode-листов, убрана отладочная печать.

[vpproxy.git] / vphttp.py

diff --git a/vphttp.py b/vphttp.py
index 6108bd81055d9b089e885c9e4380e4ffe331c6b9..bda34851d4be98e4ef5b7df5b6ef2d710e5e44ee 100644 (file)
--- a/vphttp.py
+++ b/vphttp.py
@@ -164,7 +164,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
-            if not (self.reqtype in ('get','mp4','webm') or self.reqtype in VPStuff.pluginshandlers):
+            if not (self.reqtype in ('get','mp4','ogg') or self.reqtype in VPStuff.pluginshandlers):
                 self.dieWithError(400)  # 400 Bad Request
                 return
         except IndexError:
@@ -187,7 +187,6 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     def handleRequest(self, headers_only):
 
         # Limit concurrent connections
-        print VPStuff.clientcounter.total
         if 0 < VPConfig.maxconns <= VPStuff.clientcounter.total:
             logger.debug("Maximum connections reached, can't serve this")
             self.dieWithError(503)  # 503 Service Unavailable
@@ -236,7 +235,10 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             logger.debug(
                 "Sending fake headers for " + useragent)
             self.send_response(200)
-            self.send_header("Content-Type", "video/mpeg")
+            if self.reqtype=="ogg":
+                self.send_header("Content-Type", "video/ogg")
+            else:
+                self.send_header("Content-Type", "video/mpeg")
             self.end_headers()
             # Do not send real headers at all
             self.headerssent = True
@@ -292,7 +294,12 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
                 for key in self.video.info().dict:
                     self.send_header(key, self.video.info().dict[key])
-                self.send_header("Content-Type", "video/mpeg")
+
+                if self.reqtype=="ogg":
+                    self.send_header("Content-Type", "video/ogg")
+                else:
+                    self.send_header("Content-Type", "video/mpeg")
+
                 # End headers. Next goes video data
                 self.end_headers()
                 logger.debug("Headers sent")