Skip to content
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

ext/curl: Cleanup config.w32 to remove superfluous checks and outdated comments #13684

Merged
merged 1 commit into from
Mar 12, 2024

Conversation

Ayesh
Copy link
Member

@Ayesh Ayesh commented Mar 12, 2024

  • Remove a check for an always-true curl version check
  • Remove a TODO comment for curl_version_info check that should be always available since libcurl 7.10

…ted comments

 - Remove a check for an always-true curl version check
 - Remove a `TODO` comment for curl_version_info check that should be always available since libcurl 7.10
Copy link
Member

@petk petk left a comment

Choose a reason for hiding this comment

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

That version_info check is probably meant to check whether to link with OpenSSL 1.1 for the crypto locking callbacks. But that is not problematic on Windows anyway, so looks good to go. Thanks @Ayesh

@petk petk merged commit 94a12d5 into php:master Mar 12, 2024
10 checks passed
@Ayesh Ayesh deleted the curl-win-build-cleanup branch March 12, 2024 16:57
@Ayesh
Copy link
Member Author

Ayesh commented Mar 12, 2024

Thank you for reviewing and merging this @Girgias @petk.

Comment on lines -24 to -27
(ver_num <= parseInt("0x073b00") || ver_num > parseInt("0x073b00") &&
CHECK_LIB("normaliz.lib", "curl", PHP_CURL) &&
CHECK_LIB("libssh2.lib", "curl", PHP_CURL) &&
CHECK_LIB("nghttp2.lib", "curl", PHP_CURL))
Copy link
Member

Choose a reason for hiding this comment

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

That was supposed to be:

		(ver_num <= parseInt("0x073b00")) || (ver_num > parseInt("0x073b00") &&
			CHECK_LIB("normaliz.lib", "curl", PHP_CURL) &&
			CHECK_LIB("libssh2.lib", "curl", PHP_CURL) &&
			CHECK_LIB("nghttp2.lib", "curl", PHP_CURL))

But see #16787 for why I agree that dropping the check is fine.

Copy link
Member

Choose a reason for hiding this comment

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

I see. Ok. Yes, there was also a comment about this change on the initial commit but never got addressed back then in 2018. Then fine to be removed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants