Fixed HttpServer.cs

13 years ago · ce93711cf2
parent 52ceb665fb
commit ce93711cf2
56 changed files with 5 additions and 3 deletions
--- a/Example/bin/Debug/example.exe
+++ b/Example/bin/Debug/example.exe
--- a/Example/bin/Debug/example.exe.mdb
+++ b/Example/bin/Debug/example.exe.mdb
--- a/Example/bin/Debug/websocket-sharp.dll
+++ b/Example/bin/Debug/websocket-sharp.dll
--- a/Example/bin/Debug/websocket-sharp.dll.mdb
+++ b/Example/bin/Debug/websocket-sharp.dll.mdb
--- a/Example/bin/Debug_Ubuntu/example.exe
+++ b/Example/bin/Debug_Ubuntu/example.exe
--- a/Example/bin/Debug_Ubuntu/example.exe.mdb
+++ b/Example/bin/Debug_Ubuntu/example.exe.mdb
--- a/Example/bin/Debug_Ubuntu/websocket-sharp.dll
+++ b/Example/bin/Debug_Ubuntu/websocket-sharp.dll
--- a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
+++ b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
--- a/Example/bin/Release/example.exe
+++ b/Example/bin/Release/example.exe
--- a/Example/bin/Release/websocket-sharp.dll
+++ b/Example/bin/Release/websocket-sharp.dll
--- a/Example/bin/Release_Ubuntu/example.exe
+++ b/Example/bin/Release_Ubuntu/example.exe
--- a/Example/bin/Release_Ubuntu/websocket-sharp.dll
+++ b/Example/bin/Release_Ubuntu/websocket-sharp.dll
--- a/Example1/bin/Debug/example1.exe
+++ b/Example1/bin/Debug/example1.exe
--- a/Example1/bin/Debug/example1.exe.mdb
+++ b/Example1/bin/Debug/example1.exe.mdb
--- a/Example1/bin/Debug/websocket-sharp.dll
+++ b/Example1/bin/Debug/websocket-sharp.dll
--- a/Example1/bin/Debug/websocket-sharp.dll.mdb
+++ b/Example1/bin/Debug/websocket-sharp.dll.mdb
--- a/Example1/bin/Debug_Ubuntu/example1.exe
+++ b/Example1/bin/Debug_Ubuntu/example1.exe
--- a/Example1/bin/Debug_Ubuntu/example1.exe.mdb
+++ b/Example1/bin/Debug_Ubuntu/example1.exe.mdb
--- a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll
+++ b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll
--- a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
+++ b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
--- a/Example1/bin/Release/example1.exe
+++ b/Example1/bin/Release/example1.exe
--- a/Example1/bin/Release/websocket-sharp.dll
+++ b/Example1/bin/Release/websocket-sharp.dll
--- a/Example1/bin/Release_Ubuntu/example1.exe
+++ b/Example1/bin/Release_Ubuntu/example1.exe
--- a/Example1/bin/Release_Ubuntu/websocket-sharp.dll
+++ b/Example1/bin/Release_Ubuntu/websocket-sharp.dll
--- a/Example2/bin/Debug/example2.exe
+++ b/Example2/bin/Debug/example2.exe
--- a/Example2/bin/Debug/example2.exe.mdb
+++ b/Example2/bin/Debug/example2.exe.mdb
--- a/Example2/bin/Debug/websocket-sharp.dll
+++ b/Example2/bin/Debug/websocket-sharp.dll
--- a/Example2/bin/Debug/websocket-sharp.dll.mdb
+++ b/Example2/bin/Debug/websocket-sharp.dll.mdb
--- a/Example2/bin/Debug_Ubuntu/example2.exe
+++ b/Example2/bin/Debug_Ubuntu/example2.exe
--- a/Example2/bin/Debug_Ubuntu/example2.exe.mdb
+++ b/Example2/bin/Debug_Ubuntu/example2.exe.mdb
--- a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll
+++ b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll
--- a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
+++ b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
--- a/Example2/bin/Release/example2.exe
+++ b/Example2/bin/Release/example2.exe
--- a/Example2/bin/Release/websocket-sharp.dll
+++ b/Example2/bin/Release/websocket-sharp.dll
--- a/Example2/bin/Release_Ubuntu/example2.exe
+++ b/Example2/bin/Release_Ubuntu/example2.exe
--- a/Example2/bin/Release_Ubuntu/websocket-sharp.dll
+++ b/Example2/bin/Release_Ubuntu/websocket-sharp.dll
--- a/Example3/bin/Debug/Example3.exe
+++ b/Example3/bin/Debug/Example3.exe
--- a/Example3/bin/Debug/Example3.exe.mdb
+++ b/Example3/bin/Debug/Example3.exe.mdb
--- a/Example3/bin/Debug/websocket-sharp.dll
+++ b/Example3/bin/Debug/websocket-sharp.dll
--- a/Example3/bin/Debug/websocket-sharp.dll.mdb
+++ b/Example3/bin/Debug/websocket-sharp.dll.mdb
--- a/Example3/bin/Debug_Ubuntu/Example3.exe
+++ b/Example3/bin/Debug_Ubuntu/Example3.exe
--- a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb
+++ b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb
--- a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll
+++ b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll
--- a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
+++ b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
--- a/Example3/bin/Release/Example3.exe
+++ b/Example3/bin/Release/Example3.exe
--- a/Example3/bin/Release/websocket-sharp.dll
+++ b/Example3/bin/Release/websocket-sharp.dll
--- a/Example3/bin/Release_Ubuntu/Example3.exe
+++ b/Example3/bin/Release_Ubuntu/Example3.exe
--- a/Example3/bin/Release_Ubuntu/websocket-sharp.dll
+++ b/Example3/bin/Release_Ubuntu/websocket-sharp.dll
--- a/websocket-sharp/Server/HttpServer.cs
+++ b/websocket-sharp/Server/HttpServer.cs
@ -257,9 +257,11 @@ namespace WebSocketSharp.Server {
    public byte[] GetFile(string path)
    {
      var filePath = _rootPath + path;
-    #if WINDOWS
+
+      var os = Environment.OSVersion;
+      if (os.Platform != PlatformID.Unix && os.Platform != PlatformID.MacOSX)
        filePath = filePath.Replace("/", "\\");
-    #endif
+
      if (File.Exists(filePath))
        return File.ReadAllBytes(filePath);

--- a/websocket-sharp/bin/Debug/websocket-sharp.dll
+++ b/websocket-sharp/bin/Debug/websocket-sharp.dll
--- a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb
+++ b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb
--- a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll
+++ b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll
--- a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
+++ b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
--- a/websocket-sharp/bin/Release/websocket-sharp.dll
+++ b/websocket-sharp/bin/Release/websocket-sharp.dll
--- a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll
+++ b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll
--- a/websocket-sharp/websocket-sharp.pidb
+++ b/websocket-sharp/websocket-sharp.pidb