Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: d8937d883427e4fce99855c1c0a795c7c0a5d776
https://github.com/phpmyadmin/phpmyadmin/commit/d8937d883427e4fce99855c1c0a…
Author: Dan Ungureanu <udan1107(a)gmail.com>
Date: 2015-08-11 (Tue, 11 Aug 2015)
Changed paths:
M libraries/sql-parser/src/Components/ExpressionArray.php
M libraries/sql-parser/src/Context.php
M libraries/sql-parser/src/Parser.php
A libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Query.php
M libraries/sql-parser/src/Utils/Table.php
Log Message:
-----------
Updated sql-parser to udan11/sql-parser@aef354a430d329edcbf12843f8047ef27cb9470c.
Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com>
Commit: 5024548a7788e65b79bc7d8c75fb75da627d52e1
https://github.com/phpmyadmin/phpmyadmin/commit/5024548a7788e65b79bc7d8c75f…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-08-11 (Tue, 11 Aug 2015)
Changed paths:
M libraries/sql-parser/src/Components/ExpressionArray.php
M libraries/sql-parser/src/Context.php
M libraries/sql-parser/src/Parser.php
A libraries/sql-parser/src/Utils/BufferedQuery.php
M libraries/sql-parser/src/Utils/Query.php
M libraries/sql-parser/src/Utils/Table.php
Log Message:
-----------
Merge pull request #11388 from udan11/update
Fix #11383
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f5d41a1e6dab...5024548a7788
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 6aa5afce530f1a02f7010acebaf3530f94ed3b21
https://github.com/phpmyadmin/phpmyadmin/commit/6aa5afce530f1a02f7010acebaf…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2015-08-11 (Tue, 11 Aug 2015)
Changed paths:
M ChangeLog
M libraries/Config.class.php
Log Message:
-----------
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(a)cihar.com>