Commit 485b843
committed
Fix SSL CA setup timing and QByteArray decode on macOS
- Decode QByteArray returned by trustedCaCertsPemText() to str before writing
- Always replace the QGIS CA section in cert.pem instead of append-only,
so stale certs from previous sessions are refreshed
- Call setup_qgis_ssl_for_mergin_client() in initGui() where the auth manager
is guaranteed to be ready, and also before each MerginClient creation in
validate_mergin_url() and mergin_server_deprecated_version()1 parent 05de699 commit 485b843
2 files changed
Lines changed: 20 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| 69 | + | |
| 70 | + | |
69 | 71 | | |
70 | 72 | | |
71 | 73 | | |
| |||
119 | 121 | | |
120 | 122 | | |
121 | 123 | | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
122 | 129 | | |
123 | 130 | | |
124 | 131 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
444 | 444 | | |
445 | 445 | | |
446 | 446 | | |
| 447 | + | |
447 | 448 | | |
448 | 449 | | |
449 | 450 | | |
| |||
529 | 530 | | |
530 | 531 | | |
531 | 532 | | |
| 533 | + | |
532 | 534 | | |
533 | 535 | | |
534 | 536 | | |
| |||
567 | 569 | | |
568 | 570 | | |
569 | 571 | | |
570 | | - | |
571 | | - | |
572 | | - | |
573 | | - | |
574 | | - | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
575 | 575 | | |
576 | | - | |
577 | | - | |
578 | | - | |
579 | | - | |
580 | | - | |
581 | | - | |
582 | | - | |
583 | | - | |
| 576 | + | |
584 | 577 | | |
585 | 578 | | |
586 | | - | |
587 | | - | |
588 | 579 | | |
589 | 580 | | |
590 | 581 | | |
| |||
601 | 592 | | |
602 | 593 | | |
603 | 594 | | |
604 | | - | |
605 | | - | |
606 | | - | |
607 | | - | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
608 | 602 | | |
609 | 603 | | |
610 | 604 | | |
| |||
0 commit comments