[phpMyAdmin Git] [phpmyadmin/docker]

2017-03-06 Thread nijel 
  Branch: refs/tags/4.6.6-2
  Home:   https://github.com/phpmyadmin/docker
___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 214a2b: Rewrite SSL verification code for curl

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 214a2b6b341b14efb6405a78dd7102a8725823ae
  
https://github.com/phpmyadmin/phpmyadmin/commit/214a2b6b341b14efb6405a78dd7102a8725823ae
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Rewrite SSL verification code for curl

It seems that the curl extension is quite tricky what can be set. You
can not set both CURLOPT_CAINFO and CURLOPT_CAPATH. Unfortunately some
systems seem to have built in defaults for one of these which can not be
figured out of PHP. So let's just try the three options which make
sense.

Issue #12846

Signed-off-by: Michal Čihař 


  Commit: 4312b16a549666aad464fd77ca0854a77ac6f117
  
https://github.com/phpmyadmin/phpmyadmin/commit/4312b16a549666aad464fd77ca0854a77ac6f117
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
A libraries/certs/4042bcee.0
R libraries/certs/4042bcee.0
A libraries/certs/6187b673.0
R libraries/certs/6187b673.0

  Log Message:
  ---
  Avoid using symlinks in certificate storage

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/3d24d08e41a0...4312b16a5496___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a6a917: Remove github from tests

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a6a917e2622a7e28a1d63996a305c909d37bc7d7
  
https://github.com/phpmyadmin/phpmyadmin/commit/a6a917e2622a7e28a1d63996a305c909d37bc7d7
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M test/classes/UtilTest.php

  Log Message:
  ---
  Remove github from tests

We no longer access it directly.

Signed-off-by: Michal Čihař 


  Commit: b89f568e1cfd9acc9c21a8a0a6a8c7c21bdd8b2f
  
https://github.com/phpmyadmin/phpmyadmin/commit/b89f568e1cfd9acc9c21a8a0a6a8c7c21bdd8b2f
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Check whether setting options did succeed

Signed-off-by: Michal Čihař 


  Commit: 0a5b9de08421667445024d8c9cc0efd12fe5a052
  
https://github.com/phpmyadmin/phpmyadmin/commit/0a5b9de08421667445024d8c9cc0efd12fe5a052
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Try to debug test failure on Travis

Signed-off-by: Michal Čihař 


  Commit: b71371a9138adc4a97c5346656cf9a854e1f3d63
  
https://github.com/phpmyadmin/phpmyadmin/commit/b71371a9138adc4a97c5346656cf9a854e1f3d63
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php
A libraries/certs/4042bcee.0
A libraries/certs/6187b673.0
A libraries/certs/isrgrootx1.pem
R libraries/isrgrootx1.pem

  Log Message:
  ---
  Move certificates to separate directory

- this makes it easier to manage
- overriding capath seems to have priority

Signed-off-by: Michal Čihař 


  Commit: 3d24d08e41a021bcbbc51464ec670ad7c3a4a173
  
https://github.com/phpmyadmin/phpmyadmin/commit/3d24d08e41a021bcbbc51464ec670ad7c3a4a173
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Show system variables on error

Signed-off-by: Michal Čihař 


  Commit: 214a2b6b341b14efb6405a78dd7102a8725823ae
  
https://github.com/phpmyadmin/phpmyadmin/commit/214a2b6b341b14efb6405a78dd7102a8725823ae
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Rewrite SSL verification code for curl

It seems that the curl extension is quite tricky what can be set. You
can not set both CURLOPT_CAINFO and CURLOPT_CAPATH. Unfortunately some
systems seem to have built in defaults for one of these which can not be
figured out of PHP. So let's just try the three options which make
sense.

Issue #12846

Signed-off-by: Michal Čihař 


  Commit: 4312b16a549666aad464fd77ca0854a77ac6f117
  
https://github.com/phpmyadmin/phpmyadmin/commit/4312b16a549666aad464fd77ca0854a77ac6f117
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
A libraries/certs/4042bcee.0
R libraries/certs/4042bcee.0
A libraries/certs/6187b673.0
R libraries/certs/6187b673.0

  Log Message:
  ---
  Avoid using symlinks in certificate storage

Signed-off-by: Michal Čihař 


  Commit: 2d8b8a8b607b986210a51be040beab189bb31c97
  
https://github.com/phpmyadmin/phpmyadmin/commit/2d8b8a8b607b986210a51be040beab189bb31c97
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php
A libraries/certs/4042bcee.0
A libraries/certs/6187b673.0
A libraries/certs/isrgrootx1.pem
R libraries/isrgrootx1.pem
M test/classes/UtilTest.php

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/6ca6685ee0ba...2d8b8a8b607b___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3d24d0: Show system variables on error

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3d24d08e41a021bcbbc51464ec670ad7c3a4a173
  
https://github.com/phpmyadmin/phpmyadmin/commit/3d24d08e41a021bcbbc51464ec670ad7c3a4a173
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Show system variables on error

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b71371: Move certificates to separate directory

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b71371a9138adc4a97c5346656cf9a854e1f3d63
  
https://github.com/phpmyadmin/phpmyadmin/commit/b71371a9138adc4a97c5346656cf9a854e1f3d63
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php
A libraries/certs/4042bcee.0
A libraries/certs/6187b673.0
A libraries/certs/isrgrootx1.pem
R libraries/isrgrootx1.pem

  Log Message:
  ---
  Move certificates to separate directory

- this makes it easier to manage
- overriding capath seems to have priority

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a6a917: Remove github from tests

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a6a917e2622a7e28a1d63996a305c909d37bc7d7
  
https://github.com/phpmyadmin/phpmyadmin/commit/a6a917e2622a7e28a1d63996a305c909d37bc7d7
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M test/classes/UtilTest.php

  Log Message:
  ---
  Remove github from tests

We no longer access it directly.

Signed-off-by: Michal Čihař 


  Commit: b89f568e1cfd9acc9c21a8a0a6a8c7c21bdd8b2f
  
https://github.com/phpmyadmin/phpmyadmin/commit/b89f568e1cfd9acc9c21a8a0a6a8c7c21bdd8b2f
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Check whether setting options did succeed

Signed-off-by: Michal Čihař 


  Commit: 0a5b9de08421667445024d8c9cc0efd12fe5a052
  
https://github.com/phpmyadmin/phpmyadmin/commit/0a5b9de08421667445024d8c9cc0efd12fe5a052
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Try to debug test failure on Travis

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/47863a25b521...0a5b9de08421___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 04c66a: Translated using Weblate (French)

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 04c66a6fbef46a0cdef8f2d74a0ef90affbc2f1c
  
https://github.com/phpmyadmin/phpmyadmin/commit/04c66a6fbef46a0cdef8f2d74a0ef90affbc2f1c
  Author: tmtisfree 
  Date:   2017-03-05 (Sun, 05 Mar 2017)

  Changed paths:
M po/fr.po

  Log Message:
  ---
  Translated using Weblate (French)

Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]


  Commit: c1348b957ace89aa5f2da05ceef5350b630e376a
  
https://github.com/phpmyadmin/phpmyadmin/commit/c1348b957ace89aa5f2da05ceef5350b630e376a
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M po/cs.po

  Log Message:
  ---
  Translated using Weblate (Czech)

Currently translated at 93.6% (2990 of 3192 strings)

[CI skip]


  Commit: 39f4b3dd408ca9a6739a99cdc739ce0cd5f5acc4
  
https://github.com/phpmyadmin/phpmyadmin/commit/39f4b3dd408ca9a6739a99cdc739ce0cd5f5acc4
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Config.php

  Log Message:
  ---
  Use our CDN for fetching git commit information

We can avoid GitHub rate limiting this way as we do the requests from
the website backend and they are cached by CDN.

Signed-off-by: Michal Čihař 


  Commit: 3edb0d5df0be4cb96f16d741a2252abec6553264
  
https://github.com/phpmyadmin/phpmyadmin/commit/3edb0d5df0be4cb96f16d741a2252abec6553264
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Fold configureCurl into httpRequestCurl

There is no longer need to have it separate.

Signed-off-by: Michal Čihař 


  Commit: 47863a25b521f59c0bbb1b8908cfb28269f012d4
  
https://github.com/phpmyadmin/phpmyadmin/commit/47863a25b521f59c0bbb1b8908cfb28269f012d4
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M ChangeLog
M libraries/Util.php
A libraries/isrgrootx1.pem

  Log Message:
  ---
  Bundle ISRG Root X1 SSL certificate and use it for verification

This way we avoid problems with misconfigured curl in some PHP
installations (WAMP), which has no trust certificates.

Fixes #12846

Signed-off-by: Michal Čihař 


  Commit: a011f987ee70ee3281b5625621eb85c8a6c206d0
  
https://github.com/phpmyadmin/phpmyadmin/commit/a011f987ee70ee3281b5625621eb85c8a6c206d0
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_7'


  Commit: 6ca6685ee0ba8fd3f1cc353cbfe92cfee57df3ea
  
https://github.com/phpmyadmin/phpmyadmin/commit/6ca6685ee0ba8fd3f1cc353cbfe92cfee57df3ea
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M ChangeLog
M libraries/Config.php
M libraries/Util.php
A libraries/isrgrootx1.pem

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/43148087bf50...6ca6685ee0ba___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 39f4b3: Use our CDN for fetching git commit information

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 39f4b3dd408ca9a6739a99cdc739ce0cd5f5acc4
  
https://github.com/phpmyadmin/phpmyadmin/commit/39f4b3dd408ca9a6739a99cdc739ce0cd5f5acc4
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Config.php

  Log Message:
  ---
  Use our CDN for fetching git commit information

We can avoid GitHub rate limiting this way as we do the requests from
the website backend and they are cached by CDN.

Signed-off-by: Michal Čihař 


  Commit: 3edb0d5df0be4cb96f16d741a2252abec6553264
  
https://github.com/phpmyadmin/phpmyadmin/commit/3edb0d5df0be4cb96f16d741a2252abec6553264
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M libraries/Util.php

  Log Message:
  ---
  Fold configureCurl into httpRequestCurl

There is no longer need to have it separate.

Signed-off-by: Michal Čihař 


  Commit: 47863a25b521f59c0bbb1b8908cfb28269f012d4
  
https://github.com/phpmyadmin/phpmyadmin/commit/47863a25b521f59c0bbb1b8908cfb28269f012d4
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M ChangeLog
M libraries/Util.php
A libraries/isrgrootx1.pem

  Log Message:
  ---
  Bundle ISRG Root X1 SSL certificate and use it for verification

This way we avoid problems with misconfigured curl in some PHP
installations (WAMP), which has no trust certificates.

Fixes #12846

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/c1348b957ace...47863a25b521___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 431480: Translated using Weblate (Czech)

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 43148087bf5091bc13c67faa5b3f5c4ab782f47c
  
https://github.com/phpmyadmin/phpmyadmin/commit/43148087bf5091bc13c67faa5b3f5c4ab782f47c
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M po/cs.po

  Log Message:
  ---
  Translated using Weblate (Czech)

Currently translated at 93.5% (2987 of 3194 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c1348b: Translated using Weblate (Czech)

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c1348b957ace89aa5f2da05ceef5350b630e376a
  
https://github.com/phpmyadmin/phpmyadmin/commit/c1348b957ace89aa5f2da05ceef5350b630e376a
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M po/cs.po

  Log Message:
  ---
  Translated using Weblate (Czech)

Currently translated at 93.6% (2990 of 3192 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/website] a07155: Allow to use authentication against github

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: a0715519f5d7a13bc3eae95e3f14822ecc87f264
  
https://github.com/phpmyadmin/website/commit/a0715519f5d7a13bc3eae95e3f14822ecc87f264
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M pmaweb/settings.py
M pmaweb/views.py

  Log Message:
  ---
  Allow to use authentication against github

This way we have higher rate limits.

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/website] 3e99e2: Add GitHub API proxy for commit and tree

2017-03-06 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: 3e99e20b0e109774c2ecbd047d9f5591517bf352
  
https://github.com/phpmyadmin/website/commit/3e99e20b0e109774c2ecbd047d9f5591517bf352
  Author: Michal Čihař 
  Date:   2017-03-06 (Mon, 06 Mar 2017)

  Changed paths:
M pmaweb/urls.py
M pmaweb/views.py

  Log Message:
  ---
  Add GitHub API proxy for commit and tree

- this way we reduce pressure we put on GitHub
- we also avoid their rate limiting
- all requests from phpMyAdmin will go to single web with single SSL
  certificate, see https://github.com/phpmyadmin/phpmyadmin/issues/12846

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git