AK+LibHTTP: Revert prior change to percent encode plus signs

A change was made prior to percent encode plus signs in order to fix an issue with the Google cookie consent page. Unforunately, this was treating a symptom of a problem and not the root cause and is incorrect behavior.
cubiclove · Apr 8, 2022 · 832920c · 832920c
1 parent a2d89f1
commit 832920c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/AK/URL.cpp b/AK/URL.cpp
@@ -395,19 +395,19 @@ constexpr bool code_point_is_in_percent_encode_set(u32 code_point, URL::PercentE
  }
 }
 
-void URL::append_percent_encoded_if_necessary(StringBuilder& builder, u32 code_point, URL::PercentEncodeSet set, StringView reserved_chars)
+void URL::append_percent_encoded_if_necessary(StringBuilder& builder, u32 code_point, URL::PercentEncodeSet set)
 {
- if (code_point_is_in_percent_encode_set(code_point, set) || (!reserved_chars.is_null() && reserved_chars.contains(code_point)))
+ if (code_point_is_in_percent_encode_set(code_point, set))
  append_percent_encoded(builder, code_point);
  else
  builder.append_code_point(code_point);
 }
 
-String URL::percent_encode(StringView input, URL::PercentEncodeSet set, StringView reserved_chars)
+String URL::percent_encode(StringView input, URL::PercentEncodeSet set)
 {
  StringBuilder builder;
  for (auto code_point : Utf8View(input)) {
- append_percent_encoded_if_necessary(builder, code_point, set, reserved_chars);
+ append_percent_encoded_if_necessary(builder, code_point, set);
  }
  return builder.to_string();
 }

diff --git a/AK/URL.h b/AK/URL.h
@@ -104,7 +104,7 @@ class URL {
  static u16 default_port_for_scheme(StringView);
  static bool is_special_scheme(StringView);
 
- static String percent_encode(StringView input, PercentEncodeSet set = PercentEncodeSet::Userinfo, StringView reserved_chars = {});
+ static String percent_encode(StringView input, PercentEncodeSet set = PercentEncodeSet::Userinfo);
  static String percent_decode(StringView input);
 
  bool operator==(URL const& other) const { return equals(other, ExcludeFragment::No); }
@@ -122,7 +122,7 @@ class URL {
  bool compute_validity() const;
  String serialize_data_url() const;
 
- static void append_percent_encoded_if_necessary(StringBuilder&, u32 code_point, PercentEncodeSet set = PercentEncodeSet::Userinfo, StringView reserved_chars = {});
+ static void append_percent_encoded_if_necessary(StringBuilder&, u32 code_point, PercentEncodeSet set = PercentEncodeSet::Userinfo);
  static void append_percent_encoded(StringBuilder&, u32 code_point);
 
  bool m_valid { false };

diff --git a/Userland/Libraries/LibHTTP/HttpRequest.cpp b/Userland/Libraries/LibHTTP/HttpRequest.cpp
@@ -37,7 +37,7 @@ ByteBuffer HttpRequest::to_raw_request() const
  builder.append(URL::percent_encode(m_url.path(), URL::PercentEncodeSet::EncodeURI));
  if (!m_url.query().is_empty()) {
  builder.append('?');
- builder.append(URL::percent_encode(m_url.query(), URL::PercentEncodeSet::EncodeURI, "+"sv));
+ builder.append(URL::percent_encode(m_url.query(), URL::PercentEncodeSet::EncodeURI));
  }
  builder.append(" HTTP/1.1\r\nHost: ");
  builder.append(m_url.host());