This is an automated email from the ASF dual-hosted git repository.
rainerjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 540e51fb2 Suppress diff return code
540e51fb2 is described below
commit 540e51fb2c066317773decd05bff7a90df5b826a
Author: rainerjung <[email protected]>
AuthorDate: Mon Jun 29 22:38:24 2026 +0200
Suppress diff return code
---
.github/workflows/makefile-mod_jk-win.yml | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/makefile-mod_jk-win.yml
b/.github/workflows/makefile-mod_jk-win.yml
index 602561346..2b83c26e5 100644
--- a/.github/workflows/makefile-mod_jk-win.yml
+++ b/.github/workflows/makefile-mod_jk-win.yml
@@ -60,21 +60,27 @@ jobs:
- name: install mod_jk
shell: bash
run: |
+ # Install module and default config
cp -p native/apache-2.0/${{ matrix.winver }}_${{ matrix.cpu
}}_DLL_RELEASE/mod_jk.so ${APACHE2_HOME_BASH}/modules/
cp -p conf/* ${APACHE2_HOME_BASH}/conf/
+ # Adjust config
cd ${APACHE2_HOME_BASH}/conf/
export APACHE2_HOME="$GITHUB_WORKSPACE\ApacheLounge\Apache24"
+ # Replace backslashes by forward slashes
APACHE2_HOME="${APACHE2_HOME//\\//}"
sed -i.orig -e 's# worker.node1.port=8109#
worker.node1.port=8009#' -e
's#worker.node2.activation=A#worker.node2.activation=S#' workers.properties
sed -i.orig -e 's:# *JkMountFile
conf/extra/uriworkermap.properties:JkMountFile
conf/extra/uriworkermap.properties:' httpd-jk.conf
sed -i.orig -e 's:Listen 80:Listen 8000:' -e 's#Define
SRVROOT.*#Define SRVROOT "'"$APACHE2_HOME"'"#' httpd.conf
echo "Include conf/httpd-jk.conf" >> httpd.conf
- diff -w -u httpd.conf.orig httpd.conf
- diff -w -u httpd-jk.conf.orig httpd-jk.conf
- diff -w -u workers.properties.orig workers.properties
+ # Show patched config changes (debug)
+ diff -w -u httpd.conf.orig httpd.conf || :
+ diff -w -u httpd-jk.conf.orig httpd-jk.conf || :
+ diff -w -u workers.properties.orig workers.properties || :
+ # Install and start httpd service
cd ..
bin/httpd.exe -t
bin/httpd.exe -k install
bin/httpd.exe -k start
+ # Check jk-status for magic string
curl http://localhost:8000/jk-status > jk-status.out
grep -q 'JK Status Manager for localhost:8000' jk-status.out
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
