From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Wed, 20 Jun 2007 21:39:29 +0000 (+0000)
Subject: don't check version of the LB protocol when talking to a non-LB client
X-Git-Tag: glite-lb-build_R_1_6_0_1~41
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e96ddd273b1805ca27d2891eeeb18cb68c141ea8;p=jra1mw.git

don't check version of the LB protocol when talking to a non-LB client
---

diff --git a/org.glite.lb.server/src/lb_proto.c b/org.glite.lb.server/src/lb_proto.c
index 7dba657..db59d31 100644
--- a/org.glite.lb.server/src/lb_proto.c
+++ b/org.glite.lb.server/src/lb_proto.c
@@ -392,28 +392,30 @@ edg_wll_ErrorCode edg_wll_Proto(edg_wll_Context ctx,
 		if ( strstr(headers[i], KEY_AGENT) ) break;
   
 	if (headers[i] == NULL) { ret = HTTP_BADREQ; goto err; } /* if not present */
-	switch (is_protocol_incompatible(headers[i])) { 
-		case 0  : /* protocols compatible */
-			  ctx->is_V21 = 0;
-			  break;
-		case -1 : /* malformed 'User Agent:' line */
-			  ret = HTTP_BADREQ;
-			  goto err;
-			  break;
-		case 1  : /* protocols incompatible */
-			  /* try old (V21) version compatibility */
-			  edg_wll_ProtoV21(ctx, request, headers, messageBody, 
-					  response, headersOut, bodyOut);
-					  
-			  /* and propagate errors or results */
-			  return edg_wll_Error(ctx,NULL,NULL);
-			  break;
-		case -2 : /* version of one protocol unknown */
-			  /* fallthrough */
-		default : ret = HTTP_UNSUPPORTED; 
-			  edg_wll_SetError(ctx,ENOTSUP,"Protocol versions are incompatible.");
-			  goto err; 
-			  break;
+	if (!html) {
+		switch (is_protocol_incompatible(headers[i])) { 
+			case 0  : /* protocols compatible */
+				  ctx->is_V21 = 0;
+				  break;
+			case -1 : /* malformed 'User Agent:' line */
+				  ret = HTTP_BADREQ;
+				  goto err;
+				  break;
+			case 1  : /* protocols incompatible */
+				  /* try old (V21) version compatibility */
+				  edg_wll_ProtoV21(ctx, request, headers, messageBody, 
+						  response, headersOut, bodyOut);
+						  
+				  /* and propagate errors or results */
+				  return edg_wll_Error(ctx,NULL,NULL);
+				  break;
+			case -2 : /* version of one protocol unknown */
+				  /* fallthrough */
+			default : ret = HTTP_UNSUPPORTED; 
+				  edg_wll_SetError(ctx,ENOTSUP,"Protocol versions are incompatible.");
+				  goto err; 
+				  break;
+		}
 	}