]>
err.no Git - varnish/log
petter [Tue, 5 Aug 2008 07:59:11 +0000 (07:59 +0000)]
Fixed makefile depedency. default_vcl.h is now generated as a depdency of mgt_vcc.c
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3062
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Mon, 4 Aug 2008 20:13:30 +0000 (20:13 +0000)]
Move the default VCL code into its own text file.
Generate "default_vcl.h" from this using sed(1) in the Makefile.
Include default_vcl.h in mgt_vcc.c
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3061
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 12:44:53 +0000 (12:44 +0000)]
The compiler should not care about field order in director decls.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3060
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 11:24:48 +0000 (11:24 +0000)]
Use WRONG instead of INCOMPL
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3059
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 11:07:58 +0000 (11:07 +0000)]
Make explicit what is missing and what is asserts in the state-engine.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3058
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 10:50:36 +0000 (10:50 +0000)]
Add WRONG(expl) macro for panicing from places we just shouldn't get to.
Dump the handling value from the last VCL method on panic
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3057
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 10:06:56 +0000 (10:06 +0000)]
Longer delay for panic to complete.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3056
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 09:50:28 +0000 (09:50 +0000)]
Actually wait for the varnish child to stop in "varnish -stop".
Update test-case
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3055
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 09:24:08 +0000 (09:24 +0000)]
Report back to CLI if we cannot start the child due to non-bindable sockets
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3054
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 09:22:21 +0000 (09:22 +0000)]
Be much more explicit about localhost.
Force varnish instance into /tmp/__${name}
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3053
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 08:24:23 +0000 (08:24 +0000)]
Go over the b* series of tests:
add expectes for stats counters where necessary
generally polish.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3052
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 08:23:30 +0000 (08:23 +0000)]
Add
-cliok <cli_cmd>
and
-clierr <expected_status> <cli_cmd>
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3051
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 08:22:40 +0000 (08:22 +0000)]
note when the fd gets closed
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3050
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 1 Aug 2008 07:46:43 +0000 (07:46 +0000)]
Fix pass statistics counter
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3049
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 22:38:01 +0000 (22:38 +0000)]
Rename the vcl_fetch{} action "insert" to "deliver" as we may not
insert (for instance on pass) but we certainly will deliver (unless
error or restart actions are used instead).
Update the dotgraph to 2.0 intent
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3048
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 14:59:58 +0000 (14:59 +0000)]
That test rightfully is a v* test
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3047
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 14:59:06 +0000 (14:59 +0000)]
Add a test-case for VCL purging
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3046
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 12:53:40 +0000 (12:53 +0000)]
Explanation
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3045
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 12:50:36 +0000 (12:50 +0000)]
Complete the separation of synthetic from received objects.
Any object, also errors, we receive from the backend will
go to vcl_fetch(), and can be cached if desired.
Any object we create, for instance if we cannot contact the
backend, will go to vcl_error() and will not be cached.
Technical details:
Implement VCL variable setting for booleans like obj.cacheable.
Remove obj.valid, only valid objects go to vcl_fetch now.
On fetch failure, drop the object and go to STP_ERROR with 503
Update testcase b00015.vtc accordingly.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3044
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 10:35:35 +0000 (10:35 +0000)]
Ok, 3 retries then...
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3043
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 10:24:19 +0000 (10:24 +0000)]
Retry client connects once.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3042
d4fa192b -c00b-0410-8231-
f00ffab90ce4
tfheen [Thu, 31 Jul 2008 10:19:44 +0000 (10:19 +0000)]
Add uptime to varnishstat -1 output
Make varnishstat -1 also output the uptime.
Closes #68
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3041
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 10:03:27 +0000 (10:03 +0000)]
An assert to convince FlexeLint that we have a variable.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3040
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 10:01:36 +0000 (10:01 +0000)]
Don't write to read-only structure members in the shared object
definition structure.
Fixes ticket 285
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3039
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 09:52:27 +0000 (09:52 +0000)]
Accept ECONNRESET when closing sockets during cleanup.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3038
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 09:25:25 +0000 (09:25 +0000)]
Make separate stats counters for number of object checked against purges
and number of regexps checked.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3037
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 09:24:25 +0000 (09:24 +0000)]
Flexelint silencing
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3036
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 09:23:28 +0000 (09:23 +0000)]
Check that we found a variable before using it.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3035
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 09:22:46 +0000 (09:22 +0000)]
We don't actually use miniobj.h, we do the same thing internally.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3034
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 31 Jul 2008 09:09:20 +0000 (09:09 +0000)]
FlexeLint polishing.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3033
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 30 Jul 2008 15:34:38 +0000 (15:34 +0000)]
Add statistics about regexp purges.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3032
d4fa192b -c00b-0410-8231-
f00ffab90ce4
tfheen [Wed, 30 Jul 2008 12:18:57 +0000 (12:18 +0000)]
Try to connect to CLI 30 times rather than 10 to avoid some timeout errors.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3031
d4fa192b -c00b-0410-8231-
f00ffab90ce4
tfheen [Wed, 30 Jul 2008 10:53:38 +0000 (10:53 +0000)]
Add cache_backend.h to the list of headers that go in the tarball; fixes build failure
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3030
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 27 Jul 2008 14:36:03 +0000 (14:36 +0000)]
Forgot to add this file.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3029
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 25 Jul 2008 19:23:35 +0000 (19:23 +0000)]
Change param thread_pool_min to be the minimum number of threads per
pool, and don't be so stingy with them: default to five.
Make sure we really do create the minimum complement of threads.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3028
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 25 Jul 2008 18:20:35 +0000 (18:20 +0000)]
NB: Be careful with -trunk, this is a quite intrusive change.
Continue the progress on synthetic/error pages
The default "guru meditation" is now generated from the vcl_error {}
function, which can be redefined to whatever suits your taste.
Techinical:
Add new vcl_error method and make variables available in it.
Fix a bug in "error" action, where the numeric argument would not get
interpreted correctly if it came from a variable like obj.status.
Forbid "error" action in vcl_deliver since vcl_error now goes to
vcl_deliver to send the error object.
Fix test v00001 to reflect this.
Move the obj->ws/http initialization to preallocation time to avoid
duplication.
Add read-only variable req.xid (a string!)
Add default guru meditation to default vcl.
Remove cache_synthetic.c which is now unecessary.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3027
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 25 Jul 2008 16:33:04 +0000 (16:33 +0000)]
Add a facility to constructing a synthetic object from VCL.
This is just the initial version and it doesn't quite work the way
we need it to yet, but the idea is to be able to say:
sub vcl_fetch {
if (obj.status == 503) {
synthetic {"
<HTML>
<H1>Sorry, could not contact the backend server</H1>
<P>
Try again later.
</P>
<HR>
<PRE>
URL: "} req.url {"
User Agnet: "} req.http.user-agent {"
</PRE>
</HTML>
"};
}
}
A new VCL syntactic element have been introduced to do this: "the
long string". A long string is anything from {" to "}, newlines,
controlcharacters and all. (Normal "..." strings cannot contain
control characters.
Technical details:
Don't NULL terminate string sequences in VRT context, we may have
NULL cropping up as a legal value if a header is missing, add the
magic "vrt_magic_string_end" for terminating string contactenation.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3026
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 25 Jul 2008 15:27:04 +0000 (15:27 +0000)]
Add a stevedore for synthetic pages.
The storage from this stevedore is backed by an autoextending vsb, which
can be used to generate synthetic pages into.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3025
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 25 Jul 2008 14:53:08 +0000 (14:53 +0000)]
Give VSB's the mini-obj/magic treatment and enable asserts in general.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3024
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 25 Jul 2008 14:52:08 +0000 (14:52 +0000)]
Neuter test b00015 so that automatic scripts don't trip on it all
the time.
To be reenabled when the code supports the desired functionality.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3023
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 25 Jul 2008 13:39:01 +0000 (13:39 +0000)]
polish dot graph a bit.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3022
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Fri, 25 Jul 2008 12:02:11 +0000 (12:02 +0000)]
Figure out if we need O_LARGEFILE to be compatible with 1990 or later
size disks.
Submitted by: wichert
Fixes ticket 283
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3021
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 24 Jul 2008 22:20:10 +0000 (22:20 +0000)]
Relax an assert to only check what we really care about, and not the
principle of the situation.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3020
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 24 Jul 2008 22:12:41 +0000 (22:12 +0000)]
Don my peril sensitive sun-glasses, and go over the TTL calculation
routine.
Follow RFC2616 more closely, and make relative (ie: max-age) specifications
take precedence over absolute specifications (Expires:)
Add an explicit clock-skew window (parameter: clock_skew) and only
interpret Expires: in absolute terms if the Date: header is inside
this window.
Explicit check for the case where the backend sends an Expires: which
is before the Date:, even if the Date: is out side our window.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3019
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 24 Jul 2008 22:09:25 +0000 (22:09 +0000)]
Make the ESI testcases start with an XML tag to satsify our new
non-XML detector logic.
Add a testcase to see if it works and that we can override it.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3018
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 24 Jul 2008 21:55:56 +0000 (21:55 +0000)]
Use "localhost" in our acls, so it works no matter which address it
picks off your loopback interface.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3017
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 24 Jul 2008 20:39:04 +0000 (20:39 +0000)]
Add a check to avoid doing ESI parsing of objects that do not look
like XML. Our definition of "looks like XML" is that the first
non-white-space character is '<'.
Add a new parameter "esi_syntax" with bits to steer the ESI parser.
Use the first bit to disable the "looks like XML" check.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3016
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Thu, 24 Jul 2008 20:16:04 +0000 (20:16 +0000)]
Properly truncate bytes before hexdumping.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3015
d4fa192b -c00b-0410-8231-
f00ffab90ce4
des [Thu, 24 Jul 2008 12:33:32 +0000 (12:33 +0000)]
Test caching of synthetic error pages (broken since 2266). This will need revisiting once caching has been reimplemented.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3014
d4fa192b -c00b-0410-8231-
f00ffab90ce4
des [Thu, 24 Jul 2008 12:24:17 +0000 (12:24 +0000)]
Set svn:keywords
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3013
d4fa192b -c00b-0410-8231-
f00ffab90ce4
des [Thu, 24 Jul 2008 12:22:35 +0000 (12:22 +0000)]
Set svn:keywords on files that didn't already have it
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3012
d4fa192b -c00b-0410-8231-
f00ffab90ce4
des [Thu, 24 Jul 2008 12:21:30 +0000 (12:21 +0000)]
Fix temp file names
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3011
d4fa192b -c00b-0410-8231-
f00ffab90ce4
des [Thu, 24 Jul 2008 11:23:16 +0000 (11:23 +0000)]
Correct copyright statement.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3010
d4fa192b -c00b-0410-8231-
f00ffab90ce4
des [Thu, 24 Jul 2008 11:21:35 +0000 (11:21 +0000)]
Reindent
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3009
d4fa192b -c00b-0410-8231-
f00ffab90ce4
des [Thu, 24 Jul 2008 11:04:46 +0000 (11:04 +0000)]
Markup
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3008
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 21:10:17 +0000 (21:10 +0000)]
Make the manager respect the diag_bitmap for child core creation.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3007
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 21:04:12 +0000 (21:04 +0000)]
Prevent loading multiple VCL's with the same name if the client is not
there to stop us.
Fixes #281
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3006
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 20:57:40 +0000 (20:57 +0000)]
Copy&Paste'o
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3005
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 17:37:44 +0000 (17:37 +0000)]
More Flexelint nitpickery
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3004
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 17:09:53 +0000 (17:09 +0000)]
Flexelint nits
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3003
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 17:04:53 +0000 (17:04 +0000)]
Add a missing error check.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3002
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 15:44:46 +0000 (15:44 +0000)]
Note that this testcase may fail on linux.
The problem is that a TCP connection to 127.0.0.1 appearantly does
not originate on the loopback interface, but on some other interface
on the machine.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3001
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 15:34:40 +0000 (15:34 +0000)]
We should not open the shm file until we have a cli connection, it
might not be there yet.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3000
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 15:30:02 +0000 (15:30 +0000)]
Prefix acl functions with "named_" and "anon_" to avoid naming conflicts.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2999
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 15:21:48 +0000 (15:21 +0000)]
Don't make assumptions about pthread_t
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2998
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 15:20:37 +0000 (15:20 +0000)]
use strtod() instead of strtof()
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2997
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 15:19:38 +0000 (15:19 +0000)]
don't make assumptions about pthread_t
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2996
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Wed, 23 Jul 2008 15:01:54 +0000 (15:01 +0000)]
ACL code rewrite:
Add IPv6 support (untested!)
Implement evil-acls
IPv6 support
------------
I have implemented IPv6 filtering support, but I have done so blindly
as I have no IPv6 networks to test with.
Please double check before relying on this to work, and please report
your findings back to us.
Syntax
------
The ACL rules still have the same syntax, but the sematics have
expanded to handle IPv6 also:
acl foo {
"foohost"; // Match, if the address is one of the
// ipv4 or ipv6 addresses of "foohost"
! "foohost"; // Fail, if...
"192.168.1.7" / 24; // Use mask for comparison: The '7' is
// ignored
// Implicit masks:
!"172.16"; // Fail 172.16.0.0 to 172.16.255.255
"10.0.0"; // Match 10.0.0.0 to 10.0.0.255
"www.freebsd.org" / 24; // This will give compile error, because
// the "www.freebsd.org" has both ipv4
// and ipv6 addresses, and using the same
// mask for both kinds do not make sense.
( ... ); // Ignore this rule if DNS lookup fails.
( ! "idiot.net" ); // If we can resolve "idiot.net", then
// return Failure to match, if we see them.
}
Please notice that DNS lookup happens *only* on VCL compilation, if a
DNS record changes you need to recompile (ie: vcl.load or vcl.inline)
your VCL code again, it is not enough to just switch vcl (vcl.use).
(This is the same as with backend DNS lookups)
Evil-acls
---------
Most firewall or ip-filtering facilities, compile the lists of
networks and masks to a table, and matches proceed sequentially
through that table until the table is exhausted or a match is found.
Since we compile our ACLs into C-code, we might as well implement the
"evil-acl" concept, and compile the rules directly into C-code instead.
An ACL like this:
acl foo {
"172.16";
!"172.16.17";
"172.16.17.18";
"172.16"/18;
}
Compiles to:
if (fam == 2) {
if (a[0] == 172) {
if (a[1] == 16) {
if (a[2] == 17) {
if (a[3] == 18) {
VRT_acl_log(sp, "MATCH bar " "172.16.17.18");
return (1);
}
VRT_acl_log(sp, "NEG_MATCH bar " "172.16.17");
return (0);
}
else if ((a[3] & 0xc0) == 0) {
VRT_acl_log(sp, "MATCH bar " "172.16" "/18" );
return (1);
}
VRT_acl_log(sp, "MATCH bar " "172.16");
return (1);
}
}
}
VRT_acl_log(sp, "NO_MATCH bar");
return (0);
As can be seen, for example the comparison with "172" is now shared
for all four rules in the ACL, instead of being carried out once for
each of the four rules.
In addition to this optimization, the C-compiler will of course use
its usual (and unusual) tricks to speed things up, quite likely inlining
the ACL code in the VCL functions where they are referenced.
It will also be noticed, that the compiler sorts the rules in "most
specific order".
This means that:
"172.16.17.18";
gets tested before
!"172.16.17";
even though it is listed later in the ACL.
Previously we tested the rules in the order given.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2995
d4fa192b -c00b-0410-8231-
f00ffab90ce4
petter [Wed, 23 Jul 2008 09:07:24 +0000 (09:07 +0000)]
Updated the default.vcl and man page with the latest config from mgt_vcc.c.
The following perl one-liner is useful:
perl -ne 'if( $print == 1 ) { exit if( /^$/ ); eval "print " . $_; } $print = 1 if /default_vcl/;' mgt_vcc.c
Fixes #135 (for now)
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2994
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Tue, 22 Jul 2008 14:40:33 +0000 (14:40 +0000)]
Add a counter for shmlog wraparounds.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2993
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Tue, 22 Jul 2008 14:40:13 +0000 (14:40 +0000)]
constage.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2992
d4fa192b -c00b-0410-8231-
f00ffab90ce4
petter [Tue, 22 Jul 2008 11:12:51 +0000 (11:12 +0000)]
Updated the man page with the granularity option for the file storage.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2991
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Tue, 22 Jul 2008 09:59:41 +0000 (09:59 +0000)]
Force -w thread limits
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2990
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Tue, 22 Jul 2008 09:57:11 +0000 (09:57 +0000)]
renovate tackle_warg()
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2989
d4fa192b -c00b-0410-8231-
f00ffab90ce4
petter [Tue, 22 Jul 2008 09:42:06 +0000 (09:42 +0000)]
Added granularity as a subargument to the options for file storage:
-s file,<dir_or_file>,<size>,<granularity>
Fixes #244
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2988
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Tue, 22 Jul 2008 09:02:17 +0000 (09:02 +0000)]
slightly more delay seems necessary for stability.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2987
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Tue, 22 Jul 2008 08:37:41 +0000 (08:37 +0000)]
Use exit(4) when we don't want a panic coredump.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2986
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Tue, 22 Jul 2008 08:21:29 +0000 (08:21 +0000)]
Add a testcase which panics the child, see the manager restart it.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2985
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Tue, 22 Jul 2008 08:06:16 +0000 (08:06 +0000)]
Add a "panic" vcl command, which does what you would expect.
Takes a string argument, so it is possible to do:
panic "Trouble with " req.url " (not the way I expected it!);
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2984
d4fa192b -c00b-0410-8231-
f00ffab90ce4
petter [Tue, 22 Jul 2008 07:52:00 +0000 (07:52 +0000)]
Added the variable server.port that holds the port on which the server has answered the request in the same way that server.ip holds the IP number. Fixes #264.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2983
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Tue, 22 Jul 2008 07:37:32 +0000 (07:37 +0000)]
Add a cli_quote() function for quoting a string properly when reporting
it in the CLI.
Use it for cc_command and listen_address parameters
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2982
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Tue, 22 Jul 2008 07:19:40 +0000 (07:19 +0000)]
Accept comma separation for the -a subargs for consistency with -s and -h
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2981
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 20:24:37 +0000 (20:24 +0000)]
Also check the "stats" command.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2980
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 12:03:14 +0000 (12:03 +0000)]
Also dump workspaces in panic.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2979
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 11:44:29 +0000 (11:44 +0000)]
Ignore a couple of return values
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2978
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 11:40:30 +0000 (11:40 +0000)]
Add diag_bitmap controls for panic behaviour.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2977
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 11:28:40 +0000 (11:28 +0000)]
Remove the session-specific assert facility, the general assert facility
dumps details now.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2976
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 11:28:10 +0000 (11:28 +0000)]
Reconstitute the dumping of sessions, objects &c &c, but now do it for
all asserts from a thread with a registered session.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2975
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 11:24:57 +0000 (11:24 +0000)]
panicstr is deliberately not static
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2974
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 10:46:00 +0000 (10:46 +0000)]
Remove debug hack which sneaked in.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2973
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 10:45:09 +0000 (10:45 +0000)]
Report thread name and thread session in panic messages.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2972
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 10:36:28 +0000 (10:36 +0000)]
Make room in the shared memory segment for a panic string
buffer.
Replace the default libvarnish assert handler with a child specific
function.
This function which fills the static panic string and copy the
result to the shared memory panicstring.
In the manager process, report the content of the panic string
when the child dies.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2971
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 10:03:42 +0000 (10:03 +0000)]
Make the backend function of libvarnish' assert facilities pluggable.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2970
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sun, 20 Jul 2008 09:57:25 +0000 (09:57 +0000)]
Store the current session in thread private data.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2969
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sat, 19 Jul 2008 12:38:28 +0000 (12:38 +0000)]
More assorted FlexeLint polishing
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2968
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sat, 19 Jul 2008 12:04:25 +0000 (12:04 +0000)]
Technically speaking, vsb_len() could return -1, except it won't because
of the vsb_overflow() assert.
Make this explicit for FlexeLint.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2967
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sat, 19 Jul 2008 12:03:16 +0000 (12:03 +0000)]
Explain to FlexeLint that _storage is not referenced.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2966
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sat, 19 Jul 2008 11:50:09 +0000 (11:50 +0000)]
Constify WS_Free()
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2965
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sat, 19 Jul 2008 11:49:43 +0000 (11:49 +0000)]
Explicitly specify index in name array.
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2964
d4fa192b -c00b-0410-8231-
f00ffab90ce4
phk [Sat, 19 Jul 2008 11:44:41 +0000 (11:44 +0000)]
Deal appropriately with ParseArgv returning NULL
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2963
d4fa192b -c00b-0410-8231-
f00ffab90ce4