Skip to content

Commit

Permalink
Merge pull request #4857 from planetf1/issue4745a
Browse files Browse the repository at this point in the history
Release 2.7 - #4745 correct checking of strict.ssl if value configured for clients
  • Loading branch information
planetf1 authored Mar 3, 2021
2 parents d326171 + 1c903ae commit 0deeac0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,6 @@ jobs:
java-version: 11
- name: Checkout repository
uses: actions/checkout@v2
with:
# Must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head of the pull request.
# Only include this option if you are running this workflow on pull requests.
fetch-depth: 2

# If this run was triggered by a pull request event then checkout
# the head of the pull request instead of the merge commit.
# Only include this step if you are running this workflow on pull requests.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void checkServerTrusted(
* Only if the override property strict.ssl is set
*/
public static void noStrictSSLIfConfigured() {
if ("true".equalsIgnoreCase(System.getProperty("strict.ssl")))
if ("false".equalsIgnoreCase(System.getProperty("strict.ssl")))
{
noStrictSSL();
}
Expand Down

0 comments on commit 0deeac0

Please sign in to comment.