diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:41:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:41:24 -0800 |
| commit | e7f7600360e65cb50b10064025e1c11293527342 (patch) | |
| tree | 6789a4003041c72b15b08a846626ab4d3b123774 | |
| parent | Update draft release notes to 1.8.2 (diff) | |
| parent | gitweb: refer to picon/gravatar images over the same scheme (diff) | |
| download | tgif-e7f7600360e65cb50b10064025e1c11293527342.tar.xz | |
Merge branch 'ab/gitweb-use-same-scheme'
Avoid mixed contents on a page coming via http and https when
gitweb is hosted on a https server.
* ab/gitweb-use-same-scheme:
gitweb: refer to picon/gravatar images over the same scheme
| -rwxr-xr-x | gitweb/gitweb.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index c6bafe6ead..1309196d27 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2068,7 +2068,7 @@ sub picon_url { if (!$avatar_cache{$email}) { my ($user, $domain) = split('@', $email); $avatar_cache{$email} = - "http://www.cs.indiana.edu/cgi-pub/kinzler/piconsearch.cgi/" . + "//www.cs.indiana.edu/cgi-pub/kinzler/piconsearch.cgi/" . "$domain/$user/" . "users+domains+unknown/up/single"; } @@ -2083,7 +2083,7 @@ sub gravatar_url { my $email = lc shift; my $size = shift; $avatar_cache{$email} ||= - "http://www.gravatar.com/avatar/" . + "//www.gravatar.com/avatar/" . Digest::MD5::md5_hex($email) . "?s="; return $avatar_cache{$email} . $size; } |