Move examples to webcast repo, cleanup some Printf.printf, accept only

webcast protocol.
savonet · Jul 20, 2013 · ecaf1bd · smimram · Jul 21, 2013 · toots
1 parent 8d2bf32
commit ecaf1bd
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 612 deletions.
diff --git a/src/tools/harbor.camlp4 b/src/tools/harbor.camlp4
@@ -661,7 +661,11 @@ let handle_client ~port ~icy h =
   in
   let hprotocol =
     try
-      if hmethod = `Get && assoc_uppercase "UPGRADE" headers <> "websocket" then raise Exit;
+      if hmethod = `Get &&
+         assoc_uppercase "UPGRADE" headers <> "websocket" then
+        raise Exit;
+      if assoc_uppercase "SEC-WEBSOCKET-PROTOCOL" headers <> "webcast" then
+        raise Exit;
       `Websocket
     with
     | _ -> hprotocol

diff --git a/src/tools/harbor.ml b/src/tools/harbor.ml
@@ -634,6 +634,11 @@ let handle_client ~port ~icy h = (* Read and process lines *)
                          ((assoc_uppercase "UPGRADE" headers) <> "websocket")
                      then raise Exit
                      else ();
+                     if
+                       (assoc_uppercase "SEC-WEBSOCKET-PROTOCOL" headers) <>
+                         "webcast"
+                     then raise Exit
+                     else ();
                      `Websocket)
                   with | _ -> hprotocol
                 in

diff --git a/test/Makefile b/test/Makefile
diff --git a/test/README b/test/README
diff --git a/test/lame.html b/test/lame.html
diff --git a/test/old/httpserver.ml b/test/old/httpserver.ml
diff --git a/test/old/test.html b/test/old/test.html