ma1 pushed to branch tor-browser-115.22.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits:
-
8e51811f
by Ray Kraesig at 2025-03-31T22:42:56+02:00
-
b26d6ce0
by Dana Keeler at 2025-03-31T22:43:05+02:00
3 changed files:
- modules/libpref/init/StaticPrefList.yaml
- security/manager/ssl/SSLServerCertVerification.cpp
- widget/windows/nsFilePicker.cpp
Changes:
... | ... | @@ -15792,6 +15792,17 @@ |
15792 | 15792 | value: 0
|
15793 | 15793 | mirror: always
|
15794 | 15794 | |
15795 | +# Whether to follow `.lnk` (etc.) shortcuts in the Windows file-open dialog.
|
|
15796 | +#
|
|
15797 | +# Valid values:
|
|
15798 | +# * 0: never
|
|
15799 | +# * 1: always
|
|
15800 | +# * 2: auto
|
|
15801 | +- name: widget.windows.follow_shortcuts_on_file_open
|
|
15802 | + type: RelaxedAtomicInt32
|
|
15803 | + value: 2
|
|
15804 | + mirror: always
|
|
15805 | + |
|
15795 | 15806 | # The number of messages of each type to keep for display in
|
15796 | 15807 | # about:windows-messages
|
15797 | 15808 | - name: widget.windows.messages_to_log
|
... | ... | @@ -1211,6 +1211,9 @@ SSLServerCertVerificationResult::Run() { |
1211 | 1211 | }
|
1212 | 1212 | |
1213 | 1213 | mSocketControl->SetCertVerificationResult(mFinalError);
|
1214 | + // Release this reference to the socket control so that it will be freed on
|
|
1215 | + // the socket thread.
|
|
1216 | + mSocketControl = nullptr;
|
|
1214 | 1217 | return NS_OK;
|
1215 | 1218 | }
|
1216 | 1219 |
... | ... | @@ -181,19 +181,29 @@ bool nsFilePicker::ShowFilePicker(const nsString& aInitialDir) { |
181 | 181 | |
182 | 182 | // mode specific
|
183 | 183 | switch (mMode) {
|
184 | + case modeOpenMultiple:
|
|
185 | + fos |= FOS_ALLOWMULTISELECT;
|
|
186 | + [[fallthrough]];
|
|
187 | + |
|
184 | 188 | case modeOpen:
|
185 | 189 | fos |= FOS_FILEMUSTEXIST;
|
186 | - break;
|
|
187 | - |
|
188 | - case modeOpenMultiple:
|
|
189 | - fos |= FOS_FILEMUSTEXIST | FOS_ALLOWMULTISELECT;
|
|
190 | + switch (mozilla::StaticPrefs::
|
|
191 | + widget_windows_follow_shortcuts_on_file_open()) {
|
|
192 | + case 1:
|
|
193 | + break;
|
|
194 | + default:
|
|
195 | + fos |= FOS_NODEREFERENCELINKS;
|
|
196 | + }
|
|
190 | 197 | break;
|
191 | 198 | |
192 | 199 | case modeSave:
|
193 | 200 | fos |= FOS_NOREADONLYRETURN;
|
194 | - // Don't follow shortcuts when saving a shortcut, this can be used
|
|
195 | - // to trick users (bug 271732)
|
|
196 | - if (IsDefaultPathLink()) fos |= FOS_NODEREFERENCELINKS;
|
|
201 | + // Don't follow shortcuts when saving a shortcut; this can be used to
|
|
202 | + // trick users (bug 271732). _Do_ follow shortcuts when not saving a
|
|
203 | + // shortcut (bug 283730).
|
|
204 | + if (IsDefaultPathLink()) {
|
|
205 | + fos |= FOS_NODEREFERENCELINKS;
|
|
206 | + }
|
|
197 | 207 | break;
|
198 | 208 | |
199 | 209 | case modeGetFolder:
|