Changeset e20226


Ignore:
Timestamp:
2010-03-16 10:29:37 (4 years ago)
Author:
Poul-Henning Kamp <phk@…>
Branches:
2.1, tags/varnish-2.1.0, tags/varnish-2.1.1, tags/varnish-2.1.2, tags/varnish-2.1.3, tags/varnish-2.1.4
Children:
f951d4
Parents:
2cc08a
git-author:
Poul-Henning Kamp <phk@…> (2010-03-16 10:29:37)
git-committer:
Poul-Henning Kamp <phk@…> (2010-03-16 10:29:37)
Message:

Remove the last remains of purge_hash, and obj.hash.

git-svn-id:  http://www.varnish-cache.org/svn/trunk@4614 d4fa192b-c00b-0410-8231-f00ffab90ce4

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • bin/varnishd/cache_ban.c

    re2d196 re20226  
    746746 
    747747static void 
    748 ccf_purge_hash(struct cli *cli, const char * const *av, void *priv) 
    749 { 
    750  
    751         (void)av; 
    752         (void)priv; 
    753         cli_out(cli, "purge.hash is no longer supported.\n"); 
    754         cli_result(cli, CLIS_CANT); 
    755         return; 
    756 } 
    757  
    758 static void 
    759748ccf_purge_list(struct cli *cli, const char * const *av, void *priv) 
    760749{ 
     
    796785         */ 
    797786        { CLI_HIDDEN("url.purge", 1, 1)         "h", ccf_purge_url }, 
    798         { CLI_HIDDEN("hash.purge", 0, 1)        "h", ccf_purge_hash }, 
    799         { CLI_HIDDEN("purge.hash", 0, 1)        "h", ccf_purge_hash }, 
    800787 
    801788        { CLI_PURGE_URL,                        "", ccf_purge_url }, 
  • bin/varnishd/varnishd.1

    r650505 re20226  
    394394.Va Purge expressions 
    395395for more documentation and examples. 
    396 .It Cm purge.hash Ar regex 
    397 Immediately invalidate all documents where 
    398 .Va obj.hash 
    399 matches the 
    400 .Va regex . 
    401 The default object hash contains the values from 
    402 .Va req.url 
    403 and either 
    404 .Va req.http.host 
    405 or 
    406 .Va server.ip 
    407 depending on the presence of a Host: header in the request sent by the 
    408 client. 
    409 The object hash may be modified further by 
    410 .Va VCL. 
    411396.It Cm purge.list 
    412397Display the purge list. 
  • bin/varnishtest/tests/c00007.vtc

    rcb257d re20226  
    33test "Test banning a hash" 
    44 
    5 varnish v1 -arg "-b 127.0.0.1:80 -a 127.0.0.1:0" -start -clierr 300 "purge.hash foo" 
     5varnish v1 -arg "-b 127.0.0.1:80 -a 127.0.0.1:0" -start -clierr 101 "purge.hash foo" 
  • bin/varnishtest/tests/v00018.vtc

    r07e9348 re20226  
    104104varnish v1 -vcl { 
    105105        backend b { .host = "127.0.0.1"; } 
    106         sub vcl_recv { purge_hash ("foo"); } 
     106        sub vcl_recv { purge_url ("foo"); } 
    107107} 
    108108 
  • lib/libvcl/vcc_action.c

    r2cc08a re20226  
    459459 
    460460static void 
    461 parse_purge_hash(struct tokenlist *tl) 
    462 { 
    463  
    464         vcc_NextToken(tl); 
    465         Expect(tl, '('); 
    466         vcc_NextToken(tl); 
    467  
    468         Fb(tl, 1, "VRT_purge(sp, \"obj.hash\", \"~\", "); 
    469         if (!vcc_StringVal(tl)) { 
    470                 vcc_ExpectedStringval(tl); 
    471                 return; 
    472         } 
    473         Expect(tl, ')'); 
    474         vcc_NextToken(tl); 
    475         Fb(tl, 0, ", 0);\n"); 
    476 } 
    477  
    478 /*--------------------------------------------------------------------*/ 
    479  
    480 static void 
    481461parse_esi(struct tokenlist *tl) 
    482462{ 
     
    554534        { "panic",              parse_panic }, 
    555535        { "purge",              parse_purge }, 
    556         { "purge_hash",         parse_purge_hash }, 
    557536        { "purge_url",          parse_purge_url }, 
    558537        { "remove",             parse_unset }, /* backward compatibility */ 
  • man/vcl.7so

    r2d29ee8 re20226  
    268268.Fn regsuball 
    269269but this replaces all occurrences. 
    270 .It Fn purge_hash "regex" 
    271 Purge all objects in cache whose hash strings match 
    272 .Fa regex . 
    273270.It Fn purge_url "regex" 
    274271Purge all objects in cache whose URLs match 
Note: See TracChangeset for help on using the changeset viewer.