Skip to content

deps: update ada to v2.5.1 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ada_url/ada.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* auto-generated on 2023-05-25 16:09:25 -0400. Do not edit! */
/* auto-generated on 2023-06-03 12:40:57 -0400. Do not edit! */
/* begin file src/ada.cpp */
#include "ada.h"
/* begin file src/checkers.cpp */
19 changes: 14 additions & 5 deletions ada_url/ada.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* auto-generated on 2023-05-25 16:09:25 -0400. Do not edit! */
/* auto-generated on 2023-06-03 12:40:57 -0400. Do not edit! */
/* begin file include/ada.h */
/**
* @file ada.h
@@ -5544,7 +5544,11 @@ ada_really_inline size_t url::parse_port(std::string_view view,
}
ada_log("parse_port: is_valid = ", is_valid);
if (is_valid) {
port = (r.ec == std::errc() && scheme_default_port() != parsed_port)
// scheme_default_port can return 0, and we should allow 0 as a base port.
auto default_port = scheme_default_port();
bool is_port_valid = (default_port == 0 && parsed_port == 0) ||
(default_port != parsed_port);
port = (r.ec == std::errc() && is_port_valid)
? std::optional<uint16_t>(parsed_port)
: std::nullopt;
}
@@ -6428,7 +6432,12 @@ ada_really_inline size_t url_aggregator::parse_port(
}
ada_log("parse_port: is_valid = ", is_valid);
if (is_valid) {
if (r.ec == std::errc() && scheme_default_port() != parsed_port) {
ada_log("parse_port", r.ec == std::errc());
// scheme_default_port can return 0, and we should allow 0 as a base port.
auto default_port = scheme_default_port();
bool is_port_valid = (default_port == 0 && parsed_port == 0) ||
(default_port != parsed_port);
if (r.ec == std::errc() && is_port_valid) {
update_base_port(parsed_port);
} else {
clear_port();
@@ -6485,14 +6494,14 @@ inline std::ostream &operator<<(std::ostream &out,
#ifndef ADA_ADA_VERSION_H
#define ADA_ADA_VERSION_H

#define ADA_VERSION "2.5.0"
#define ADA_VERSION "2.5.1"

namespace ada {

enum {
ADA_VERSION_MAJOR = 2,
ADA_VERSION_MINOR = 5,
ADA_VERSION_REVISION = 0,
ADA_VERSION_REVISION = 1,
};

} // namespace ada