[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 786256: Allow www.google.com only in case we are using reC...

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 786256469cea2e27626d205671c40e3f8e1924df https://github.com/phpmyadmin/phpmyadmin/commit/786256469cea2e27626d205671c… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-19 (Wed, 19 Mar 2014) Changed paths: M libraries/Header.class.php Log Message: ----------- Allow www.google.com only in case we are using reCAPTCHA Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5199ad8dc2058a49cc7026dd85953d5193ebadac https://github.com/phpmyadmin/phpmyadmin/commit/5199ad8dc2058a49cc7026dd859… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-19 (Wed, 19 Mar 2014) Changed paths: M libraries/Header.class.php Log Message: ----------- Add Content-Security-Policy header This is standard and obsoletes X-Content-Security-Policy and X-Webkit-CSP, but we still keep the old ones to provide headers for old browsers. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 8316786c95ed354fa700377063e6f79ff193d551 https://github.com/phpmyadmin/phpmyadmin/commit/8316786c95ed354fa700377063e… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-03-19 (Wed, 19 Mar 2014) Changed paths: M libraries/Header.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6b3db1deb3ff...8316786c95ed