Skip to content

Commit a549ca3

Browse files
authored
Merge branch 'main' into renovate/project.apache-httpclient-5.version
2 parents 39a775b + 4fc3e3a commit a549ca3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ jobs:
6767

6868
# Upload the results to GitHub's code scanning dashboard.
6969
- name: "Upload to code-scanning"
70-
uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
70+
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
7171
with:
7272
sarif_file: results.sarif

google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class PercentEscaper extends UnicodeEscaper {
6161
* specified in RFC 3986. Note that some of these characters do need to be escaped when used in
6262
* other parts of the URI.
6363
*/
64-
public static final String SAFEPATHCHARS_URLENCODER = "-_.!~*'()@:$&,;=+";
64+
public static final String SAFEPATHCHARS_URLENCODER = "-_.!~*'()@:$&,;=";
6565

6666
/**
6767
* A string of characters that do not need to be encoded when used in URI Templates reserved
@@ -72,7 +72,7 @@ public class PercentEscaper extends UnicodeEscaper {
7272
* href="https://www.rfc-editor.org/rfc/rfc6570#section-3.2.3">RFC 6570 - section 3.2.3</a>.
7373
*/
7474
public static final String SAFE_PLUS_RESERVED_CHARS_URLENCODER =
75-
SAFEPATHCHARS_URLENCODER + "/?#[]";
75+
SAFEPATHCHARS_URLENCODER + "+/?#[]";
7676

7777
/**
7878
* A string of characters that do not need to be encoded when used in URI user info part, as

google-http-client/src/test/java/com/google/api/client/http/UrlEncodedContentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void testWriteTo() throws IOException {
6262
subtestWriteTo(
6363
"multi=a&multi=b&multi=c", ArrayMap.of("multi", new String[] {"a", "b", "c"}), true);
6464
subtestWriteTo("username=un&password=password123;%7B%7D", params, true);
65-
subtestWriteTo("additionkey=add+tion", ArrayMap.of("additionkey", "add+tion"), true);
65+
subtestWriteTo("additionkey=add%2Btion", ArrayMap.of("additionkey", "add+tion"), true);
6666
}
6767

6868
private void subtestWriteTo(String expected, Object data, boolean useEscapeUriPathEncoding)

0 commit comments

Comments
 (0)