--- MakeReq.c.SAV	2005-08-30 14:26:19.000000000 -0600
+++ MakeReq.c	2005-09-06 14:54:53.000000000 -0600
@@ -417,7 +417,7 @@
 	xReq *rp;
 	char *valuePtr = NULL;	/* set NULL to trap errors */
 	XstDisplay *dpy = Get_Display(client);
-
+	
 	/* if max_request_size is 65535 then we can't exceed it in the 16-bit
 	* length field of requests so no TOO_LONG testing can be done. In
 	* this case abandon ship now, with a reason.
@@ -1272,9 +1272,15 @@
 		break;
 	case BAD_LENGTH:
 	case JUST_TOO_LONG:
-	case TOO_LONG:
 		rp->length = bad_len;
 		break;
+	case TOO_LONG:
+		if (dpy->bigreq_size > 0) 
+			/* big request, set the length to be 0 */
+			rp->length = 0;
+		else
+			rp->length = bad_len;
+		break;
 	default:
 		Log_Msg ("INTERNAL ERROR: Make_Req - bad test type %d\n", Get_Test_Type(client));
 		Delete ();