Skip to content

Update OpenSSL and FreeTDS #585

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.

Sign up for GitHub

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 3 commits into from
May 28, 2025
Merged

Update OpenSSL and FreeTDS #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09a443a
Update OpenSSL to v3.5.0
andyundso May 24, 2025
c733747
Update freetds to v1.5.1
andyundso May 24, 2025
9d2fa9c
Adjust expected error message
andyundso May 25, 2025
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## (unreleased)

* Use freetds v1.5.1 and OpenSSL v3.5.0 for Windows and Linux builds.

## 3.2.1

* Ensure the native Gem loads on Windows. Fixes #581.
Expand Down
4 changes: 2 additions & 2 deletions ext/tiny_tds/extconsts.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ICONV_VERSION = ENV["TINYTDS_ICONV_VERSION"] || "1.18"
ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"

OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.4.1"
OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.5.0"
OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"

FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.4.26"
FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.5.1"
FREETDS_SOURCE_URI = "http://www.freetds.org/files/stable/freetds-#{FREETDS_VERSION}.tar.bz2"
2 changes: 1 addition & 1 deletion test/thread_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class ThreadTest < TinyTds::TestCase
result = client.execute "waitfor delay '00:00:#{delay}'; select db_name()"
result.each { |r| puts r }
rescue TinyTds::Error => e
if e.message == "Adaptive Server connection timed out"
if e.message.include?("connection timed out")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the new error message?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is TDS server timeout on Windows, but still Adaptive Server on Linux.

exception = true
end
end
Expand Down