gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,053 Commits 12 Branches 481 Tags 2.4 GiB
ac955df90d
Commit Graph

434 Commits

Author SHA1 Message Date
Hugues Peccatte
a1b134c09e Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 22:38:34 +02:00
Michal Čihař
6aa5afce53 Do not try to set port 80 for https requests 
This is usually just a bug in our detection, so let's silently discard
port in this situation.

Fixes #10726

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-11 15:43:29 +02:00
Dan Ungureanu
63b1d1c005 Fixes cURL timeout. 
cURL tries to reverse DNS the server and because it cannot it waits for the timeout.
It depends on machine configuration.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-06 15:00:44 +03:00
Dan Ungureanu
cb9cc68fe9 Fixed more issues. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Michal Čihař
0ef3f23e56 Revert "Do not skip SSL verification" 
This reverts commit 1a316a6986.

Unfortunately this seems to fail on Travis and probably on some users as
well...
 2015-07-02 16:37:02 +02:00
Michal Čihař
1a316a6986 Do not skip SSL verification 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 16:33:32 +02:00
Michal Čihař
5a5ceecee5 Simplify CURL request processing 
We do not have to reinvent wheel by parsing HTTP response, CURL can do
it for us.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 16:29:43 +02:00
Michal Čihař
3ae994d830 Use case insensitive header comparing 
Maybe we should not compare the text part at all, but let's keep it this
way for now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-02 09:32:32 +02:00
Michal Čihař
67c858265d Add error checking 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-22 15:14:48 +02:00
Marc Delisle
9c42b7796d Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-20 09:02:04 -04:00
Marc Delisle
72cb48c89e Fix coding style and doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 13:14:59 -04:00
Marc Delisle
4426af36b1 Merge branch 'QA_4_4' 2015-05-12 11:47:21 -04:00
Tom Sommer
1684a1a56e Fix undefined index 'collation_connection' 
Make sure $GLOBALS[$collation] is set

Signed-off-by: Tom Sommer <mail@tomsommer.dk>

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-12 11:45:50 -04:00
Michal Čihař
3c5df878a7 Merge remote-tracking branch 'origin/QA_4_4' 
Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	libraries/Config.class.php
 2015-05-11 10:03:58 +02:00
Michal Čihař
bdf4612081 Set User-Agent in Util::configureCurl 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-05-11 10:01:47 +02:00
Michal Čihař
f3901b7ef7 Make PMA_Config::checkHTTP honor proxy settings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-05-11 09:59:09 +02:00
Marc Delisle
c0fde0ae7f Refactor checkClient() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-10 07:25:14 -04:00
Marc Delisle
5cb4292e6a 4.4.7-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 10:31:01 -04:00
Marc Delisle
450dc28aed 4.4.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-05 07:21:22 -04:00
Marc Delisle
285e0d9b61 4.4.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-26 06:35:06 -04:00
Marc Delisle
e603b3459a 4.4.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-20 07:39:51 -04:00
Marc Delisle
8384d54fee 4.4.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-13 08:21:27 -04:00
Marc Delisle
4c6181dbf1 Fix some PMD ShortVariable warnings 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-12 07:02:59 -04:00
Kevin Decherf
d1616d20e2 Add option to show/hide git revision on main panel 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2015-04-07 16:12:47 +02:00
Marc Delisle
14941285b9 4.4.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 07:27:13 -04:00
Marc Delisle
624562a9c9 4.4.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-23 12:33:13 -04:00
Marc Delisle
80a9c4518f 4.4.0-beta1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-11 07:40:54 -04:00
Marc Delisle
d3c01d1b45 4.4.0-alpha1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-04 14:46:21 -05:00
Marc Delisle
6487dcb0e7 4.5.0-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-01 09:10:19 -05:00
Marc Delisle
4e8737ff2c Merge branch 'QA_4_3' 2014-12-26 08:29:32 -05:00
Marc Delisle
38bb19ffb6 bug #4655 Undefined index: collation_connection 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-26 08:29:09 -05:00
Marc Delisle
3960df34bc 4.3.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-21 06:31:09 -05:00
Marc Delisle
cca317168b 4.3.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 08:36:42 -05:00
Marc Delisle
2c19d17ce1 4.3.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-08 12:26:01 -05:00
Marc Delisle
496602674c 4.3.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 11:20:54 -05:00
Madhura Jayaratne
45a971a561 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:48:50 +05:30
Madhura Jayaratne
93366c8c24 Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 21:44:53 +05:30
Marc Delisle
3443cc1ca4 4.2.13-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 10:35:46 -05:00
Marc Delisle
5ac08bde49 4.3.0-beta1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-20 08:18:11 -05:00
Madhura Jayaratne
2ffdbf2d7d bug #4597 [security] XSS through pma_fontsize cookie 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 06:40:39 +05:30
Marc Delisle
3d038ced19 4.3.0-alpha1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-14 11:23:46 -05:00
Marc Delisle
88432424e8 4.4.0-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-14 10:58:01 -05:00
Marc Delisle
036549a8de 4.2.12-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-31 12:29:34 -04:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 18:37:49 +01:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Hugues Peccatte
a4546feda1 Fix #4559: don't use multibytes to read hash. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 19:24:00 +02:00
Marc Delisle
4fb60125fb 4.2.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-11 07:49:52 -04:00
Hugues Peccatte
f9cd1a1a22 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 11:31:50 +02:00
Hugues Peccatte
49ababac08 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-04 10:09:06 +02:00