Author: mhabersack
Date: 2007-05-04 15:53:09 -0400 (Fri, 04 May 2007)
New Revision: 76722

Modified:
   trunk/xsp/ChangeLog
   trunk/xsp/src/Mono.WebServer/MonoWorkerRequest.cs
Log:
2007-05-04  Marek Habersack  <[EMAIL PROTECTED]>

        * src/Mono.WebServer/MonoWorkerRequest.cs: avoid possible NOR.


Modified: trunk/xsp/ChangeLog
===================================================================
--- trunk/xsp/ChangeLog 2007-05-04 19:51:28 UTC (rev 76721)
+++ trunk/xsp/ChangeLog 2007-05-04 19:53:09 UTC (rev 76722)
@@ -1,3 +1,7 @@
+2007-05-04  Marek Habersack  <[EMAIL PROTECTED]>
+
+       * src/Mono.WebServer/MonoWorkerRequest.cs: avoid possible NOR.
+
 2007-04-24  Marek Habersack  <[EMAIL PROTECTED]>
 
        * src/Mono.WebServer/BaseApplicationHost.cs: put the worker's

Modified: trunk/xsp/src/Mono.WebServer/MonoWorkerRequest.cs
===================================================================
--- trunk/xsp/src/Mono.WebServer/MonoWorkerRequest.cs   2007-05-04 19:51:28 UTC 
(rev 76721)
+++ trunk/xsp/src/Mono.WebServer/MonoWorkerRequest.cs   2007-05-04 19:53:09 UTC 
(rev 76722)
@@ -141,7 +141,10 @@
                        get {
 #if NET_2_0
                                if (headerEncoding == null) {
-                                       Encoding enc = inUnhandledException ? 
null : HttpContext.Current.Response.HeaderEncoding;
+                                       HttpContext ctx = HttpContext.Current;
+                                       HttpResponse response = ctx != null ? 
ctx.Response : null;
+                                       Encoding enc = inUnhandledException ? 
null :
+                                               response != null ? 
response.HeaderEncoding : null;
                                        if (enc != null)
                                                headerEncoding = enc;
                                        else

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to