r2935 - trunk/varnish-cache/lib/libvcl

phk at projects.linpro.no phk at projects.linpro.no
Fri Jul 11 20:57:13 CEST 2008


Author: phk
Date: 2008-07-11 20:57:13 +0200 (Fri, 11 Jul 2008)
New Revision: 2935

Modified:
   trunk/varnish-cache/lib/libvcl/vcc_backend.c
Log:
Emit backend probe data to ->fb.



Modified: trunk/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_backend.c	2008-07-11 10:12:52 UTC (rev 2934)
+++ trunk/varnish-cache/lib/libvcl/vcc_backend.c	2008-07-11 18:57:13 UTC (rev 2935)
@@ -341,7 +341,7 @@
 	ExpectErr(tl, '{');
 	vcc_NextToken(tl);
 
-	Fh(tl, 0, "\t.probe = {\n");
+	Fb(tl, 0, "\t.probe = {\n");
 	while (tl->t->tok != '}') {
 
 		vcc_IsField(tl, &t_field, fs);
@@ -352,35 +352,35 @@
 			vcc_ProbeRedef(tl, &t_did, t_field);
 			ERRCHK(tl);
 			ExpectErr(tl, CSTR);
-			Fh(tl, 0, "\t\t.request =\n");
-			Fh(tl, 0, "\t\t\t\"GET \" ");
+			Fb(tl, 0, "\t\t.request =\n");
+			Fb(tl, 0, "\t\t\t\"GET \" ");
 			EncToken(tl->fb, tl->t);
-			Fh(tl, 0, " \" /HTTP/1.1\\r\\n\"\n");
-			Fh(tl, 0, "\t\t\t\"Connection: close\\r\\n\"\n");
-			Fh(tl, 0, "\t\t\t\"\\r\\n\",\n");
+			Fb(tl, 0, " \" /HTTP/1.1\\r\\n\"\n");
+			Fb(tl, 0, "\t\t\t\"Connection: close\\r\\n\"\n");
+			Fb(tl, 0, "\t\t\t\"\\r\\n\",\n");
 			vcc_NextToken(tl);
 		} else if (vcc_IdIs(t_field, "request")) {
 			vcc_ProbeRedef(tl, &t_did, t_field);
 			ERRCHK(tl);
 			ExpectErr(tl, CSTR);
-			Fh(tl, 0, "\t\t.request =\n");
+			Fb(tl, 0, "\t\t.request =\n");
 			while (tl->t->tok == CSTR) {
-				Fh(tl, 0, "\t\t\t");
+				Fb(tl, 0, "\t\t\t");
 				EncToken(tl->fb, tl->t);
-				Fh(tl, 0, " \"\\r\\n\"\n");
+				Fb(tl, 0, " \"\\r\\n\"\n");
 				vcc_NextToken(tl);
 			}
-			Fh(tl, 0, "\t\t\t\"\\r\\n\",\n");
+			Fb(tl, 0, "\t\t\t\"\\r\\n\",\n");
 		} else if (vcc_IdIs(t_field, "timeout")) {
-			Fh(tl, 0, "\t\t.timeout = ");
+			Fb(tl, 0, "\t\t.timeout = ");
 			vcc_TimeVal(tl);
 			ERRCHK(tl);
-			Fh(tl, 0, ",\n");
+			Fb(tl, 0, ",\n");
 		} else if (vcc_IdIs(t_field, "rate")) {
-			Fh(tl, 0, "\t\t.rate = ");
+			Fb(tl, 0, "\t\t.rate = ");
 			vcc_TimeVal(tl);
 			ERRCHK(tl);
-			Fh(tl, 0, ",\n");
+			Fb(tl, 0, ",\n");
 		} else {
 			vcc_ErrToken(tl, t_field);
 			vcc_ErrWhere(tl, t_field);
@@ -391,7 +391,7 @@
 		ExpectErr(tl, ';');
 		vcc_NextToken(tl);
 	}
-	Fh(tl, 0, "\t},\n");
+	Fb(tl, 0, "\t},\n");
 	ExpectErr(tl, '}');
 	vcc_NextToken(tl);
 }




More information about the varnish-commit mailing list