Commit
23dd12711fcba5f3898cd93d8c5e1aa8daaa7509
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
[varnish] do not return() from our custom VCL
This lets the default VCL logic do its job
|
| @@ -3,13 +3,11 @@ sub vcl_recv { |
| @@ -3,13 +3,11 @@ sub vcl_recv { |
|
3
| if (req.http.Cookie) { |
3
| if (req.http.Cookie) { |
|
4
| # We only care about the "_noosfero_session.*" cookie, used for |
4
| # We only care about the "_noosfero_session.*" cookie, used for |
|
5
| # authentication. |
5
| # authentication. |
|
6
| - if (req.http.Cookie ~ "_noosfero_session.*" ) { |
| |
|
7
| - return (pass); |
6
| + if (req.http.Cookie !~ "_noosfero_session.*" ) { |
|
| |
7
| + # strip all cookies |
|
| |
8
| + unset req.http.Cookie; |
|
8
| } |
9
| } |
|
9
| - # Else strip all cookies |
| |
|
10
| - unset req.http.Cookie; |
| |
|
11
| } |
10
| } |
|
12
| - } |
| |
|
13
| } |
11
| } |
|
14
| |
12
| |
|
15
| sub vcl_error { |
13
| sub vcl_error { |
|
| @@ -0,0 +1,9 @@ |
| @@ -0,0 +1,9 @@ |
|
| |
1
| +require 'test/unit' |
|
| |
2
| + |
|
| |
3
| +class VarnishConfTest < Test::Unit::TestCase |
|
| |
4
| + |
|
| |
5
| + def test_not_use_return_in_varnish_noosfero |
|
| |
6
| + assert !system('grep "return.*pass" etc/noosfero/varnish-noosfero.vcl') |
|
| |
7
| + end |
|
| |
8
| + |
|
| |
9
| +end |
