webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity

Merge branch 'QA_4_4'

Browse Source
This commit is contained in:
Madhura Jayaratne
2015-05-14 07:10:10 +05:30
parent e6f868441a 85f62badea
commit bdf66cd772
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -46,6 +46,7 @@ phpMyAdmin - ChangeLog
- bug Undefined index collation_connection
- bug Error when the reporting server is down
- bug Escape database and table names for partition maintenance
- bug Invalid value for CURLOPT_SSL_VERIFYPEER
4.4.6.1 (2015-05-13)
- bug #4899 [security] CSRF vulnerability in setup

2
libraries/plugins/auth/swekey/swekey.php
View File

@@ -222,7 +222,7 @@ function Swekey_HttpGet($url, &$response_code)
}
curl_setopt($sess, CURLOPT_SSL_VERIFYHOST, '2');
curl_setopt($sess, CURLOPT_SSL_VERIFYPEER, '2');
curl_setopt($sess, CURLOPT_SSL_VERIFYPEER, '1');
curl_setopt($sess, CURLOPT_CONNECTTIMEOUT, '20');
curl_setopt($sess, CURLOPT_TIMEOUT, '20');
} else {