Merge lp://staging/~sidnei/charms/precise/squid-reverseproxy/trunk into lp://staging/charms/squid-reverseproxy

Proposed by Sidnei da Silva
Status: Merged
Merged at revision: 45
Proposed branch: lp://staging/~sidnei/charms/precise/squid-reverseproxy/trunk
Merge into: lp://staging/charms/squid-reverseproxy
Diff against target: 405 lines (+193/-5)
6 files modified
README.md (+13/-0)
config.yaml (+33/-3)
hooks/hooks.py (+22/-1)
hooks/tests/test_helpers.py (+93/-1)
hooks/tests/test_nrpe_hooks.py (+22/-0)
templates/main_config.template (+10/-0)
To merge this branch: bzr merge lp://staging/~sidnei/charms/precise/squid-reverseproxy/trunk
Reviewer Review Type Date Requested Status
David Lawson (community) Approve
Review via email: mp+198451@code.staging.launchpad.net

Commit message

- If there's a query string in the check path, use a GET instead of HEAD request
- If cache_size_mb is set to 0, only disable disk cache but still leave memory cache.
- Expose 'via' config setting, default to on.

Description of the change

- If there's a query string in the check path, use a GET instead of HEAD request
- If cache_size_mb is set to 0, only disable disk cache but still leave memory cache.
- Expose 'via' config setting, default to on.

To post a comment you must log in.
44. By Sidnei da Silva

Merge from alexlist's https support branch

45. By Sidnei da Silva

- Merge from trunk

Revision history for this message
David Lawson (deej) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches