diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2014-07-04 09:49:58 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2014-07-04 09:49:58 +0100 |
| commit | 4eaee83ce8ed509100470ab7f347987a5c3e71e6 (patch) | |
| tree | d9a6af765af748d64ad615d89ca0a4b2b2e05edf /perllib/FixMyStreet/App.pm | |
| parent | 7c6e96534f0b307fa47294ca21c699f1ba09d3de (diff) | |
| parent | 198b2a3dc0d4eff3887e90cb176ca91c32ca0341 (diff) | |
Merge branch 'use-https-urls-for-uk'
Diffstat (limited to 'perllib/FixMyStreet/App.pm')
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 0d3b024a8..7922dfea1 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -94,8 +94,11 @@ __PACKAGE__->setup(); # tell the code we're secure if we are. after 'prepare_headers' => sub { my $self = shift; - $self->req->secure( 1 ) if $self->config->{BASE_URL} eq 'https://www.zueriwieneu.ch'; - $self->req->secure( 1 ) if $self->config->{BASE_URL} eq 'http://www.fixmystreet.com' && $self->req->headers->header('Host') eq 'fix.bromley.gov.uk'; + my $base_url = $self->config->{BASE_URL}; + my $host = $self->req->headers->header('Host'); + $self->req->secure( 1 ) if $base_url eq 'https://www.zueriwieneu.ch'; + $self->req->secure( 1 ) if $base_url eq 'https://www.fixmystreet.com' + && ( $host eq 'fix.bromley.gov.uk' || $host eq 'www.fixmystreet.com' ); }; # set up DB handle for old code |