Changeset 182 for SimpleHttpServer

Timestamp:

04/07/07 02:12:57 (21 months ago)

Author:

mayuki

Message:

 

Files:

• SimpleHttpServer/SimpleHttpServer/SimpleHttpServer.cs (modified) (3 diffs)

SimpleHttpServer/SimpleHttpServer/SimpleHttpServer.cs

@@ -170 +170 @@
         public SimpleHttpServer()
         {
-            _versionString = String.Format("{0}/{1}", GetType().Name, GetType().Assembly.GetName().Version);
+            _versionString = String.Format("{0}/{1}", GetType().FullName, GetType().Assembly.GetName().Version);
         }
 
@@ -188 +188 @@
 
         public event EventHandler<HttpErrorEventArgs> HttpErrorHandled;
-        protected virtual void OnHttpErrorHandled(HttpException e)
+        protected virtual void OnHttpErrorHandled(HttpException he)
         {
             if (HttpErrorHandled != null)
             {
+                HttpErrorHandled(this, new HttpErrorEventArgs(he));
             }
             else
             {
                 // default error handling
+                using (StreamWriter sw = new StreamWriter(Context.Current.Stream))
+                {
+                    sw.WriteLine("HTTP/1.0 {0} {1}", he.GetHttpCode(), he.Message);
+                    sw.WriteLine("Content-Type: text/html; charset=utf-8");
+                    sw.WriteLine("Server: {0}", VersionString);
+                    sw.WriteLine("Connection: close");
+                    sw.WriteLine("");
+                    sw.WriteLine("<title>{0} {1}</title>", he.GetHttpCode(), he.Message);
+                    sw.WriteLine("<h1>{0} {1}</h1>", he.GetHttpCode(), he.Message);
+                    sw.WriteLine("<p>{0}</p>", he.GetHtmlErrorMessage());
+                    sw.WriteLine("<h2>��</h2>");
+                    sw.WriteLine("<pre>{0}</pre>", HttpUtility.HtmlEncode(he.ToString()));
+                }
             }
         }
@@ -217 +231 @@
                     {
                         Trace.WriteLineIf(_loggingEnabled, he.Message, "error");
-                        sw.WriteLine("HTTP/1.0 {0} {1}", he.GetHttpCode(), he.Message);
-                        sw.WriteLine("Content-Type: text/html; charset=utf-8");
-                        sw.WriteLine("Server: {0}", VersionString);
-                        sw.WriteLine("Connection: close");
-                        sw.WriteLine("");
-                        sw.WriteLine("<title>{0} {1}</title>", he.GetHttpCode(), he.Message);
-                        sw.WriteLine("<h1>{0} {1}</h1>", he.GetHttpCode(), he.Message);
-                        sw.WriteLine("<p>{0}</p>", he.GetHtmlErrorMessage());
-                        sw.WriteLine("<h2>��</h2>");
-                        sw.WriteLine("<pre>{0}</pre>", HttpUtility.HtmlEncode(he.ToString()));
-                        sw.Flush();
+                        OnHttpErrorHandled(he);
                     }
                 }