Author: mhabersack
Date: 2007-10-16 06:04:35 -0400 (Tue, 16 Oct 2007)
New Revision: 87567
Modified:
trunk/mod_mono/ChangeLog
trunk/mod_mono/src/mod_mono.c
trunk/mod_mono/src/mod_mono.h
Log:
2007-10-16 Marek Habersack <[EMAIL PROTECTED]>
* src/mod_mono.c (xsp_data): revert the flush logic - use
'no_flush' instead of 'do_flush' as it matches the managed side
more closely. Fixes (again) bug #325441
* src/mod_mono.h (cmdNames): reorder the names to match the enum.
Modified: trunk/mod_mono/ChangeLog
===================================================================
--- trunk/mod_mono/ChangeLog 2007-10-16 10:01:30 UTC (rev 87566)
+++ trunk/mod_mono/ChangeLog 2007-10-16 10:04:35 UTC (rev 87567)
@@ -1,3 +1,11 @@
+2007-10-16 Marek Habersack <[EMAIL PROTECTED]>
+
+ * src/mod_mono.c (xsp_data): revert the flush logic - use
+ 'no_flush' instead of 'do_flush' as it matches the managed side
+ more closely. Fixes (again) bug #325441
+
+ * src/mod_mono.h (cmdNames): reorder the names to match the enum.
+
2007-10-03 Marek Habersack <[EMAIL PROTECTED]>
* man/mod_mono.8.in: removed documentation of the recently added
Modified: trunk/mod_mono/src/mod_mono.c
===================================================================
--- trunk/mod_mono/src/mod_mono.c 2007-10-16 10:01:30 UTC (rev 87566)
+++ trunk/mod_mono/src/mod_mono.c 2007-10-16 10:04:35 UTC (rev 87567)
@@ -97,7 +97,7 @@
uint32_t restart_time;
/* other settings */
- unsigned char do_flush;
+ unsigned char no_flush;
#ifndef APACHE13
apr_shm_t *dashboard_shm;
@@ -507,7 +507,7 @@
server->is_virtual = is_virtual;
server->start_attempts = "3";
server->start_wait_time = "2";
- server->do_flush = 0;
+ server->no_flush = 1;
#ifndef APACHE13
apr_snprintf (num, sizeof (num), "%u", (unsigned)config->nservers + 1);
@@ -714,15 +714,17 @@
}
static void
-request_send_response_from_memory (request_rec *r, char *byteArray, int size,
int doFlush)
+request_send_response_from_memory (request_rec *r, char *byteArray, int size,
int noFlush)
{
+ DEBUG_PRINT (0, "sending from memory with%s flush", noFlush ? "out" :
"");
+
#ifdef APACHE13
if (r->sent_bodyct == 0)
ap_send_http_header (r);
#endif
ap_rwrite (byteArray, size, r);
- if (doFlush) {
+ if (!noFlush) {
DEBUG_PRINT (0, "flushing");
ap_rflush (r);
}
@@ -1025,7 +1027,7 @@
return FALSE;
}
- DEBUG_PRINT (2, "Command received: %s", cmdNames [command]);
+ DEBUG_PRINT (2, "Command received: %s (%u)", cmdNames [command],
command);
*result = OK;
switch (command) {
case SEND_FROM_MEMORY:
@@ -1036,7 +1038,7 @@
apr_pool_destroy (temp_pool);
break;
}
- request_send_response_from_memory (r, str, size,
xsp->do_flush);
+ request_send_response_from_memory (r, str, size,
xsp->no_flush);
apr_pool_destroy (temp_pool);
break;
case GET_SERVER_VARIABLES:
@@ -1158,7 +1160,7 @@
case SET_CONFIGURATION: {
- if (read_data (sock, &xsp->do_flush, sizeof
(xsp->do_flush)) == -1) {
+ if (read_data (sock, &xsp->no_flush, sizeof
(xsp->no_flush)) == -1) {
error_message = "failed to set configuration
(output buffering)";
status = -1;
break;
Modified: trunk/mod_mono/src/mod_mono.h
===================================================================
--- trunk/mod_mono/src/mod_mono.h 2007-10-16 10:01:30 UTC (rev 87566)
+++ trunk/mod_mono/src/mod_mono.h 2007-10-16 10:04:35 UTC (rev 87567)
@@ -238,8 +238,8 @@
"DECLINE_REQUEST",
"NOT_FOUND",
"IS_CONNECTED",
- "SET_CONFIGURATION",
- "SEND_FILE"
+ "SEND_FILE",
+ "SET_CONFIGURATION"
};
/* Module definition */
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
