-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Remove support for EOL Apache 2.0 and 2.2 in favor of 2.4+ #14664
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| Apache 2.0 Handler | ||
| Ian Holsman, Justin Erenkrantz (based on Apache 2.0 Filter code) | ||
| Apache 2 Handler | ||
| Ian Holsman, Justin Erenkrantz (based on Apache 2 Filter code) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,24 @@ | ||
| // vim:ft=javascript | ||
|
|
||
| ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no'); | ||
| ARG_ENABLE('apache2handler', 'Build Apache 2 handler', 'no'); | ||
| ARG_ENABLE('apache2-4handler', 'Build Apache 2 handler (alias for --enable--apache2handler)', 'no'); | ||
|
|
||
| if (PHP_APACHE2HANDLER != "no") { | ||
| if (PHP_ZTS == "no") { | ||
| WARNING("Apache 2.0 module requires an --enable-zts build of PHP on windows"); | ||
| } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2") && | ||
| CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") && | ||
| CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") && | ||
| CHECK_LIB("libaprutil.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") | ||
| ) { | ||
| SAPI('apache2handler', 'mod_php.c sapi_apache2.c apache_config.c php_functions.c', | ||
| 'php' + PHP_VERSION + 'apache2.dll', | ||
| '/D PHP_APACHE2_EXPORTS /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); | ||
| } else { | ||
| WARNING("Could not find apache2 libraries/headers"); | ||
| } | ||
| if(PHP_APACHE2_4HANDLER != "no" && PHP_APACHE2HANDLER == "no") { | ||
| PHP_APACHE2HANDLER="yes"; | ||
| } | ||
|
|
||
| ARG_ENABLE('apache2-2handler', 'Build Apache 2.2.x handler', 'no'); | ||
|
|
||
| if (PHP_APACHE2_2HANDLER != "no") { | ||
| if (PHP_ZTS == "no") { | ||
| WARNING("Apache 2.2 module requires an --enable-zts build of PHP on windows"); | ||
| } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_2") && | ||
| CHECK_LIB("libhttpd.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") && | ||
| CHECK_LIB("libapr-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") && | ||
| CHECK_LIB("libaprutil-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") | ||
| ) { | ||
| SAPI('apache2_2handler', 'mod_php.c sapi_apache2.c apache_config.c php_functions.c', | ||
| 'php' + PHP_VERSION + 'apache2_2.dll', | ||
| '/D PHP_APACHE2_EXPORTS /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1', | ||
| 'sapi\\apache2_2handler'); | ||
| } else { | ||
| WARNING("Could not find apache2.2 libraries/headers"); | ||
| } | ||
| } | ||
|
|
||
| ARG_ENABLE('apache2-4handler', 'Build Apache 2.4.x handler', 'no'); | ||
| if (PHP_APACHE2_4HANDLER != "no") { | ||
| if (PHP_APACHE2HANDLER != "no") { | ||
| if (PHP_ZTS == "no") { | ||
| WARNING("Apache 2.4 module requires an --enable-zts build of PHP on windows"); | ||
| } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2_4HANDLER", PHP_PHP_BUILD + "\\include\\apache2_4") && | ||
| CHECK_LIB("libhttpd.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4") && | ||
| CHECK_LIB("libapr-1.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4") && | ||
| CHECK_LIB("libaprutil-1.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4") | ||
| WARNING("Apache module requires an --enable-zts build of PHP on windows"); | ||
| } else if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE2HANDLER", PHP_PHP_BUILD + "\\include\\apache2_4") && | ||
| CHECK_LIB("libhttpd.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2_4") && | ||
| CHECK_LIB("libapr-1.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2_4") && | ||
| CHECK_LIB("libaprutil-1.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2_4") | ||
| ) { | ||
| SAPI('apache2_4handler', 'mod_php.c sapi_apache2.c apache_config.c php_functions.c', | ||
| SAPI('apache2handler', 'mod_php.c sapi_apache2.c apache_config.c php_functions.c', | ||
| 'php' + PHP_VERSION + 'apache2_4.dll', | ||
| '/D PHP_APACHE2_EXPORTS /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1', | ||
| 'sapi\\apache2handler'); | ||
| '/D PHP_APACHE2_EXPORTS /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); | ||
| } else { | ||
| WARNING("Could not find apache 2.4 libraries/headers"); | ||
| WARNING("Could not find Apache libraries/headers"); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might not be used in the field anymore. Glad with the changes or we can possibly make it an alias too then removing it for 9.x. wdyt ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here I was thinking like this. That this --enable-apache2handler option is presumable not used anymore around. And this --enable-apache2-2handler is kind of like targeting specifically 2.2 version. With removing it, it makes the user aware that previous setup won't work anymore, if theoretically someone builds Apache 2.2. Now, there is mainly this --enable-apache2-4handler used, which I've added it like this so it is simpler to migrate and still possibly have (but this is not confirmed at all) Apache 2.6 at some point. Yes, I have no ideal solution here. Perhaps we can add it like an alias also... 🤔