r5039 - in branches/2.1: . varnish-cache/bin/varnishd varnish-cache/bin/varnishtest/tests varnish-cache/include varnish-cache/lib/libvarnish varnish-cache/lib/libvcl
tfheen at varnish-cache.org
tfheen at varnish-cache.org
Tue Jul 13 10:52:55 CEST 2010
Author: tfheen
Date: 2010-07-13 10:52:54 +0200 (Tue, 13 Jul 2010)
New Revision: 5039
Modified:
branches/2.1/
branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
branches/2.1/varnish-cache/bin/varnishd/vparam.h
branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
branches/2.1/varnish-cache/include/vct.h
branches/2.1/varnish-cache/include/vev.h
branches/2.1/varnish-cache/lib/libvarnish/tcp.c
branches/2.1/varnish-cache/lib/libvarnish/vev.c
branches/2.1/varnish-cache/lib/libvcl/vcc_action.c
branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c
Log:
Merge r4971: Use ExpectErr() instead of Expect
this gives us compiler error messages rather than panics.
Property changes on: branches/2.1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:4637,4640,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk:4637,4640,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishd/cache_backend.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/bin/varnishd/cache_backend_cfg.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishd/cache_backend_cfg.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/bin/varnishd/vparam.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishd/vparam.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/c00019.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishtest/tests/c00019.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00325.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishtest/tests/r00325.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/r00416.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishtest/tests/r00416.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/bin/varnishtest/tests/v00011.vtc
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/bin/varnishtest/tests/v00011.vtc:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/include/vct.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/include/vct.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/include/vev.h
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/include/vev.h:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/tcp.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/lib/libvarnish/tcp.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Property changes on: branches/2.1/varnish-cache/lib/libvarnish/vev.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/lib/libvarnish/vev.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_action.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_action.c 2010-07-13 08:32:53 UTC (rev 5038)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_action.c 2010-07-13 08:52:54 UTC (rev 5039)
@@ -321,7 +321,7 @@
vcc_NextToken(tl);
- Expect(tl, '(');
+ ExpectErr(tl, '(');
vcc_NextToken(tl);
if (tl->t->tok == VAR) {
@@ -390,7 +390,7 @@
Fb(tl, 0, "vrt_magic_string_end);\n");
}
- Expect(tl, ')');
+ ExpectErr(tl, ')');
vcc_NextToken(tl);
}
@@ -401,7 +401,7 @@
{
vcc_NextToken(tl);
- Expect(tl, '(');
+ ExpectErr(tl, '(');
vcc_NextToken(tl);
Fb(tl, 1, "VRT_ban(sp, \"req.url\", \"~\", ");
@@ -409,7 +409,7 @@
vcc_ExpectedStringval(tl);
return;
}
- Expect(tl, ')');
+ ExpectErr(tl, ')');
vcc_NextToken(tl);
Fb(tl, 0, ", 0);\n");
}
@@ -450,9 +450,9 @@
int retval = 0;
vcc_NextToken(tl);
- Expect(tl, '(');
+ ExpectErr(tl, '(');
vcc_NextToken(tl);
- Expect(tl, ID);
+ ExpectErr(tl, ID);
#define VCL_RET_MAC(l, U) \
do { \
@@ -470,7 +470,7 @@
ERRCHK(tl);
}
vcc_NextToken(tl);
- Expect(tl, ')');
+ ExpectErr(tl, ')');
vcc_NextToken(tl);
}
Property changes on: branches/2.1/varnish-cache/lib/libvcl/vcc_dir_random.c
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4973-4975,4977,4980-4981,4989
+ /trunk/varnish-cache/lib/libvcl/vcc_dir_random.c:4637,4643-4645,4647-4650,4654-4670,4686,4689-4690,4700,4712,4715-4719,4731,4750,4757-4758,4762,4783,4818,4829,4842,4865-4868,4971,4973-4975,4977,4980-4981,4989
Modified: branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c
===================================================================
--- branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c 2010-07-13 08:32:53 UTC (rev 5038)
+++ branches/2.1/varnish-cache/lib/libvcl/vcc_parse.c 2010-07-13 08:52:54 UTC (rev 5039)
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <string.h>
+#include <math.h>
#include "vsb.h"
@@ -153,6 +154,8 @@
const char *p;
Expect(tl, CNUM);
+ if (tl->err)
+ return (NAN);
for (p = tl->t->b; p < tl->t->e; p++) {
d *= 10;
d += *p - '0';
More information about the varnish-commit
mailing list