{"thread":{"id":"58827","subject":"[PATCH] lib-httpd: extend module location auto-detection","startedAt":"2022-11-21T03:01:43Z","lastAt":"2022-11-21T19:13:23Z","messageCount":2,"participants":["Eric Sunshine via GitGitGadget","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"467649","messageId":"pull.1426.git.1668999695898.gitgitgadget@gmail.com","threadId":"58827","inReplyTo":null,"subject":"[PATCH] lib-httpd: extend module location auto-detection","fromName":"Eric Sunshine via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-11-21T03:01:35Z","receivedAt":"2022-11-21T03:01:43Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"From: Eric Sunshine <sunshine@sunshineco.com>\n\nAlthough it is possible to manually set LIB_HTTPD_PATH and\nLIB_HTTPD_MODULE_PATH to point at the location of `httpd` and its\nmodules, doing so is cumbersome and easily forgotten. To address this,\n0d344738dc (t/lib-http.sh: Restructure finding of default httpd\nlocation, 2010-01-02) enhanced lib-httpd.sh to automatically detect the\nlocation of `httpd` and its modules in order to facilitate out-of-the-\nbox testing on a wider range of platforms. Follow that lead by further\nenhancing it to automatically detect the `httpd` modules on Void Linux,\nas well.\n\nSigned-off-by: Eric Sunshine <sunshine@sunshineco.com>\n---\n    lib-httpd: extend module location auto-detection\n    \n    Make httpd tests work out-of-the-box on Void Linux.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1426%2Fsunshineco%2Fvoid-httpd-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1426/sunshineco/void-httpd-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1426\n\n t/lib-httpd.sh | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/t/lib-httpd.sh b/t/lib-httpd.sh\nindex 1f6b9b08d1d..5be3ee44c25 100644\n--- a/t/lib-httpd.sh\n+++ b/t/lib-httpd.sh\n@@ -65,7 +65,8 @@ done\n for DEFAULT_HTTPD_MODULE_PATH in '/usr/libexec/apache2' \\\n \t\t\t\t '/usr/lib/apache2/modules' \\\n \t\t\t\t '/usr/lib64/httpd/modules' \\\n-\t\t\t\t '/usr/lib/httpd/modules'\n+\t\t\t\t '/usr/lib/httpd/modules' \\\n+\t\t\t\t '/usr/libexec/httpd'\n do\n \tif test -d \"$DEFAULT_HTTPD_MODULE_PATH\"\n \tthen\n\nbase-commit: a0789512c5a4ae7da935cd2e419f253cb3cb4ce7\n-- \ngitgitgadget\n"},{"id":"467713","messageId":"Y3vNvGI4fXun4m5O@coredump.intra.peff.net","threadId":"58827","inReplyTo":"pull.1426.git.1668999695898.gitgitgadget@gmail.com","subject":"Re: [PATCH] lib-httpd: extend module location auto-detection","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2022-11-21T19:13:00Z","receivedAt":"2022-11-21T19:13:23Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Nov 21, 2022 at 03:01:35AM +0000, Eric Sunshine via GitGitGadget wrote:\n\n> From: Eric Sunshine <sunshine@sunshineco.com>\n> \n> Although it is possible to manually set LIB_HTTPD_PATH and\n> LIB_HTTPD_MODULE_PATH to point at the location of `httpd` and its\n> modules, doing so is cumbersome and easily forgotten. To address this,\n> 0d344738dc (t/lib-http.sh: Restructure finding of default httpd\n> location, 2010-01-02) enhanced lib-httpd.sh to automatically detect the\n> location of `httpd` and its modules in order to facilitate out-of-the-\n> box testing on a wider range of platforms. Follow that lead by further\n> enhancing it to automatically detect the `httpd` modules on Void Linux,\n> as well.\n\nYeah, this makes perfect sense. There is really no downside to checking\nin more places. :)\n\n-Peff\n"}]}