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 484ff4915 Try to fix backslash handling
484ff4915 is described below

commit 484ff4915f761abc896b8a9ebf2378ed2548df3e
Author: rainerjung <[email protected]>
AuthorDate: Mon Jun 29 21:55:42 2026 +0200

    Try to fix backslash handling
---
 .github/workflows/makefile-mod_jk-win.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/makefile-mod_jk-win.yml 
b/.github/workflows/makefile-mod_jk-win.yml
index 322686b8f..b368596f9 100644
--- a/.github/workflows/makefile-mod_jk-win.yml
+++ b/.github/workflows/makefile-mod_jk-win.yml
@@ -66,11 +66,11 @@ jobs:
             export APACHE2_HOME="$GITHUB_WORKSPACE\ApacheLounge\Apache24"
             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
+            sed -i.orig -e 's:Listsed -i.orig -e 's:Listen 80:Listen 8000:' -e 
's:Define SRVROOT.*:Define SRVROOT "'"$APACHE2_HOME"'":' -e httpd.confen 
80:Listen 8000:' -e 's#Define SRVROOT.*#Define SRVROOT "'$APACHE2_HOME'"#' 
httpd.conf
             echo "Include conf/httpd-jk.conf" >> httpd.conf
-            diff -u httpd.conf.orig httpd.conf
-            diff -u httpd-jk.conf.orig httpd-jk.conf
-            diff -u workers.properties.orig workers.properties
+            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
             cd ..
             bin/httpd.exe -t
             bin/httpd.exe -k install


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to