Author: miguel
Date: 2007-03-29 00:52:32 -0500 (Thu, 29 Mar 2007)
New Revision: 75121

Modified:
   trunk/mod_mono/ChangeLog
   trunk/mod_mono/src/mod_mono.c
Log:
2007-03-29  Miguel de Icaza  <[EMAIL PROTECTED]>

        * src/mod_mono.c (do_command.GET_CLIENT_BLOCK): If we get a -1
        from ap_get_client_block, send that value but not any further
        data.   There is now a guard in xsp for this condition.

Modified: trunk/mod_mono/ChangeLog
===================================================================
--- trunk/mod_mono/ChangeLog    2007-03-29 01:33:25 UTC (rev 75120)
+++ trunk/mod_mono/ChangeLog    2007-03-29 05:52:32 UTC (rev 75121)
@@ -1,3 +1,9 @@
+2007-03-29  Miguel de Icaza  <[EMAIL PROTECTED]>
+
+       * src/mod_mono.c (do_command.GET_CLIENT_BLOCK): If we get a -1
+       from ap_get_client_block, send that value but not any further
+       data.   There is now a guard in xsp for this condition.
+
 2007-03-28  Marek Habersack  <[EMAIL PROTECTED]>
 
        * src/mod_mono.c (do_command): abort when either xsp sends us size

Modified: trunk/mod_mono/src/mod_mono.c
===================================================================
--- trunk/mod_mono/src/mod_mono.c       2007-03-29 01:33:25 UTC (rev 75120)
+++ trunk/mod_mono/src/mod_mono.c       2007-03-29 05:52:32 UTC (rev 75121)
@@ -694,13 +694,11 @@
                }
                str = get_client_block_buffer (r, (uint32_t) i, &actual_size);
                i = ap_get_client_block (r, str, actual_size);
-               if (i < 0) {
-                       DEBUG_PRINT (2, "our block has size %d: not sending to 
xsp", i);
-                       abort();
-               }
                i = LE_FROM_INT (i);
                status = write_data (sock, &i, sizeof (int32_t));
                i = INT_FROM_LE (i);
+               if (i == -1)
+                       break;
                status = write_data (sock, str, i);
                break;
        case SET_STATUS:

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

Reply via email to