Changeset 154 for binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/StaticHandler.cs

Timestamp:

Sep 2, 2014, 9:32:25 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

• binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/StaticHandler.cs (modified) (3 diffs)

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/StaticHandler.cs

@@ -34 +34 @@
                                                 if (!fileCache.ContainsKey (fn)) {
                                                         if (!File.Exists (datapath + "/" + fn)) {
-                                                                resp.StatusCode = (int)HttpStatusCode.NotFound;
-                                                                if (logMissingFiles)
-                                                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" + fn + "\"");
-                                                                return;
+                                                                throw new FileNotFoundException ();
                                                         }
 
@@ -49 +46 @@
                                 } else {
                                         if (!File.Exists (datapath + "/" + fn)) {
-                                                resp.StatusCode = (int)HttpStatusCode.NotFound;
-                                                if (logMissingFiles)
-                                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" + fn + "\"");
-                                                return;
+                                                throw new FileNotFoundException ();
                                         }
 
@@ -61 +55 @@
                                 resp.ContentLength64 = content.Length;
                                 resp.OutputStream.Write (content, 0, content.Length);
+                        } catch (FileNotFoundException e) {
+                                resp.StatusCode = (int)HttpStatusCode.NotFound;
+                                if (logMissingFiles)
+                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" + req.Url.AbsolutePath.Remove (0, staticPart.Length) + "\"");
+                                return;
                         } catch (Exception e) {
                                 Log.Out ("Error in StaticHandler.HandleRequest: " + e);