← Back to branch summary

~clint-fewbar/ubuntu/precise/squid3/ignore-sighup-early

« back to all changes in this revision

Viewing changes to src/cache_cf.cc

  • Committer: Bazaar Package Importer
  • Author(s): Luigi Gangitano
  • Date: 2008-07-21 09:20:31 UTC
  • mfrom: (1.1.7 upstream) (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080721092031-bj8vog645lw6487u
Tags: 3.0.STABLE8-1
* Urgency high to meet freeze deadline

* New upstream release

* debian/patches/10-mgr_active_requests
  - Added upstream patch fixing delay_pool reporting in cachemgr.cgi

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cache_cf.cc
1723
1723
            p->options.carp = 1;
1724
1724
 
1725
1725
#endif
 
1726
        } else if (!strcasecmp(token, "userhash")) {
 
1727
            if (p->type != PEER_PARENT)
 
1728
                fatalf("parse_peer: non-parent userhash peer %s/%d\n", p->host, p->http_port);
 
1729
 
 
1730
            p->options.userhash = 1;
 
1731
 
 
1732
        } else if (!strcasecmp(token, "sourcehash")) {
 
1733
            if (p->type != PEER_PARENT)
 
1734
                fatalf("parse_peer: non-parent sourcehash peer %s/%d\n", p->host, p->http_port);
 
1735
 
 
1736
            p->options.sourcehash = 1;
 
1737
 
1726
1738
#if DELAY_POOLS
1727
1739
 
1728
1740
        } else if (!strcasecmp(token, "no-delay")) {
1831
1843
    *head = p;
1832
1844
 
1833
1845
    Config.npeers++;
1834
 
 
1835
 
    peerClearRR(p);
 
1846
    peerClearRRStart();
1836
1847
}
1837
1848
 
1838
1849
static void