Author: mhabersack
Date: 2007-10-02 09:10:40 -0400 (Tue, 02 Oct 2007)
New Revision: 86744

Modified:
   trunk/xsp/ChangeLog
   trunk/xsp/src/ModMonoRequest.cs
Log:
2007-10-02  Marek Habersack  <[EMAIL PROTECTED]>

        * src/ModMonoRequest.cs: make the protocol mismatch error message
        more informative.


Modified: trunk/xsp/ChangeLog
===================================================================
--- trunk/xsp/ChangeLog 2007-10-02 12:53:35 UTC (rev 86743)
+++ trunk/xsp/ChangeLog 2007-10-02 13:10:40 UTC (rev 86744)
@@ -1,3 +1,8 @@
+2007-10-02  Marek Habersack  <[EMAIL PROTECTED]>
+
+       * src/ModMonoRequest.cs: make the protocol mismatch error message
+       more informative.
+
 2007-09-21  Marek Habersack  <[EMAIL PROTECTED]>
 
        * src/ModMonoRequest.cs: use UTF8 when sending strings to

Modified: trunk/xsp/src/ModMonoRequest.cs
===================================================================
--- trunk/xsp/src/ModMonoRequest.cs     2007-10-02 12:53:35 UTC (rev 86743)
+++ trunk/xsp/src/ModMonoRequest.cs     2007-10-02 13:10:40 UTC (rev 86744)
@@ -97,6 +97,7 @@
                        get { return shutdown; }
                }
                
+               const byte protocol_version = 7;
                void GetInitialData ()
                {
                        byte cmd = reader.ReadByte ();
@@ -104,8 +105,9 @@
                        if (shutdown)
                                return;
 
-                       if (cmd != 7) {
-                               string msg = "mod_mono and xsp have different 
versions.";
+                       if (cmd != protocol_version) {
+                               string msg = String.Format ("mod_mono and xsp 
have different versions. Expected '{0}', got {1}",
+                                                           protocol_version, 
cmd);
                                Console.WriteLine (msg);
                                Console.Error.WriteLine (msg);
                                throw new InvalidOperationException (msg);

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

Reply via email to