Merge pull request #341 from jajik/playground

jajik · web-flow · commit 1e4d376af7b2 · 2025-07-26T21:40:09.000+02:00
Use port 8090 only instead of two ports (6666, 8000)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -166,7 +166,7 @@ jobs:
           ./buildconf
           ./configure --prefix=/usr/local/apache2 --with-included-apr --enable-proxy-ajp --enable-maintainer-mode \
                       --enable-so --enable-proxy --enable-proxy-http --enable-proxy-wstunned --enable-proxy-hcheck \
-                      --with-port=8000
+                      --with-port=8090
           sudo make
           sudo make install
       - name: Build mod_proxy_cluster and add it to httpd
@@ -217,12 +217,12 @@ jobs:
           cp test\httpd\mod_proxy_cluster.conf ${{ env.HTTPD_DEV_HOME }}\conf\mod_proxy_cluster.conf
           echo "LogLevel debug"                      >> ${{ env.HTTPD_DEV_HOME }}\conf\mod_proxy_cluster.conf
           echo "Include conf/mod_proxy_cluster.conf" >> ${{ env.HTTPD_DEV_HOME }}\conf\httpd.conf
-          (Get-Content ${{ env.HTTPD_DEV_HOME }}\conf\httpd.conf) | %{$_ -replace "Listen 80","Listen 8000"} | Set-Content -Path ${{ env.HTTPD_DEV_HOME }}\conf\httpd.conf
+          (Get-Content ${{ env.HTTPD_DEV_HOME }}\conf\httpd.conf) | %{$_ -replace "Listen 80","#Listen 80"} | Set-Content -Path ${{ env.HTTPD_DEV_HOME }}\conf\httpd.conf
       - name: Run
         run: |
           Start-Process -FilePath ${{ env.HTTPD_DEV_HOME }}\bin\httpd.exe
-          curl --fail --max-time 10 http://localhost:8000
-          curl --fail --max-time 10 http://localhost:6666/mod_cluster_manager
+          curl --fail --max-time 10 http://localhost:8090
+          curl --fail --max-time 10 http://localhost:8090/mod_cluster_manager
       - name: Preserve logs
         uses: actions/upload-artifact@v4
         if: always()
diff --git a/native/scripts/installhome.sh b/native/scripts/installhome.sh
@@ -67,7 +67,7 @@ do
   echo "$file"
   cp -p $file $file.new
   echo "s:${BASEHTTPD}:${RPM_BUILD_ROOT}:" > sed.cmd
-  echo "s/Listen 80.*/Listen 8000/" >> sed.cmd
+  echo "s/Listen 80.*/Listen 8090/" >> sed.cmd
   sed -f sed.cmd $file > $file.new
   mv $file.new $file
   rm -f sed.cmd
diff --git a/test/MODCLUSTER-640/mod_lbmethod_cluster.conf b/test/MODCLUSTER-640/mod_lbmethod_cluster.conf
@@ -14,12 +14,12 @@ ProxyPreserveHost On
 UseNocanon On
 
 <IfModule manager_module>
-  Listen 6666
+  Listen 8090
   ManagerBalancerName mycluster
 
   EnableWsTunnel
   WSUpgradeHeader websocket
- <VirtualHost *:6666>
+ <VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.1
diff --git a/test/MODCLUSTER-640/mod_proxy_cluster.conf b/test/MODCLUSTER-640/mod_proxy_cluster.conf
@@ -17,7 +17,7 @@ ProxyPreserveHost On
 </IfModule>
 
 <IfModule manager_module>
-  Listen 6666
+  Listen 8090
   ManagerBalancerName mycluster
 
 <IfModule !lbmethod_cluster_module>
@@ -27,7 +27,7 @@ ProxyPreserveHost On
 
   EnableWsTunnel
   WSUpgradeHeader websocket
- <VirtualHost *:6666>
+ <VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.1
diff --git a/test/MODCLUSTER-640/testit.sh b/test/MODCLUSTER-640/testit.sh
@@ -29,12 +29,12 @@ docker cp MODCLUSTER-640/webapp1 tomcat2:/usr/local/tomcat/webapps/webapp1
 sleep 12
 
 # test the URL
-code=$(/usr/bin/curl -o /dev/null -s -m 20 --write-out '%{http_code}' http://localhost:8000/webapp1/index.html)
+code=$(/usr/bin/curl -o /dev/null -s -m 20 --write-out '%{http_code}' http://localhost:8090/webapp1/index.html)
 if [ "${code}" != "200" ]; then
-    echo "nocanon test failed, we get ${code} on http://localhost:8000/webapp1/index.html"
+    echo "nocanon test failed, we get ${code} on http://localhost:8090/webapp1/index.html"
     exit 1
 fi
-curl -v -m 20 "http://localhost:8000/webapp1/jsr%3aroot/toto" | grep "jsr:root"
+curl -v -m 20 "http://localhost:8090/webapp1/jsr%3aroot/toto" | grep "jsr:root"
 if [ $? -eq 0 ]; then
     echo "nocanon test failed, we get \"jsr:root\"!!!"
     exit 1
@@ -49,12 +49,12 @@ docker exec MODCLUSTER-640 /usr/local/apache2/bin/apachectl restart
 tomcat_wait_for_n_nodes 2
 
 # test the URL
-code=$(/usr/bin/curl -o /dev/null -s -m 20 --write-out '%{http_code}' http://localhost:8000/webapp1/index.html)
+code=$(/usr/bin/curl -o /dev/null -s -m 20 --write-out '%{http_code}' http://localhost:8090/webapp1/index.html)
 if [ "${code}" != "200" ]; then
-    echo "nocanon test failed, we get ${code} on http://localhost:8000/webapp1/index.html"
+    echo "nocanon test failed, we get ${code} on http://localhost:8090/webapp1/index.html"
     exit 1
 fi
-curl -v -m 20 "http://localhost:8000/webapp1/jsr%3aroot/toto" | grep "jsr:root"
+curl -v -m 20 "http://localhost:8090/webapp1/jsr%3aroot/toto" | grep "jsr:root"
 if [ $? -ne 0 ]; then
     echo "NO nocanon test failed, we don't get \"jsr:root\"!!!"
     exit 1
@@ -68,12 +68,12 @@ docker exec MODCLUSTER-640 /usr/local/apache2/bin/apachectl restart
 tomcat_wait_for_n_nodes 2
 
 # test the URL
-code=$(/usr/bin/curl -o /dev/null -s -m 20 --write-out '%{http_code}' http://localhost:8000/webapp1/index.html)
+code=$(/usr/bin/curl -o /dev/null -s -m 20 --write-out '%{http_code}' http://localhost:8090/webapp1/index.html)
 if [ "${code}" != "200" ]; then
-    echo "nocanon test failed, we get ${code} on http://localhost:8000/webapp1/index.html"
+    echo "nocanon test failed, we get ${code} on http://localhost:8090/webapp1/index.html"
     exit 1
 fi
-curl -v -m 20 "http://localhost:8000/webapp1/jsr%3aroot/toto" | grep "jsr:root"
+curl -v -m 20 "http://localhost:8090/webapp1/jsr%3aroot/toto" | grep "jsr:root"
 if [ $? -eq 0 ]; then
     echo "nocanon test failed, we get \"jsr:root\"!!!"
     tomcat_all_remove
diff --git a/test/MODCLUSTER-734/mod_lbmethod_cluster.conf b/test/MODCLUSTER-734/mod_lbmethod_cluster.conf
@@ -14,11 +14,11 @@ ModProxyClusterHCTemplate hcmethod=GET hcexpr=in_maint hcuri=/status.jsp
 Maxnode 505
 Maxhost 1010
 Maxcontext 1100
-Listen 6666
+Listen 8090
 ManagerBalancerName mycluster
 ServerName localhost 
 
-<VirtualHost *:6666>
+<VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.
diff --git a/test/MODCLUSTER-734/mod_proxy_cluster.conf b/test/MODCLUSTER-734/mod_proxy_cluster.conf
@@ -11,11 +11,11 @@ ModProxyClusterHCTemplate hcmethod=GET hcexpr=in_maint hcuri=/status.jsp
 Maxnode 505
 Maxhost 1010
 Maxcontext 1100
-Listen 6666
+Listen 8090
 ManagerBalancerName mycluster
 ServerName localhost 
 
-<VirtualHost *:6666>
+<VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.1
diff --git a/test/MODCLUSTER-734/testit.sh b/test/MODCLUSTER-734/testit.sh
@@ -31,7 +31,7 @@ docker cp MODCLUSTER-734/ROOT_OK tomcat2:/usr/local/tomcat/webapps/ROOT
 # and mark the node not OK.
 sleep 15
 
-curl -s -m 20 http://localhost:6666/mod_cluster_manager | grep "Status: NOTOK"
+curl -s -m 20 http://localhost:8090/mod_cluster_manager | grep "Status: NOTOK"
 if [ $? -eq 0 ]; then
     echo "MODCLUSTER-734 Done!"
 else
diff --git a/test/MODCLUSTER-736/testit.sh b/test/MODCLUSTER-736/testit.sh
@@ -89,7 +89,7 @@ singlecycle() {
     i=0
     while true
     do
-        curl -s -m 20 http://localhost:6666/mod_cluster_manager | grep Node | grep tomcat$1 > /dev/null
+        curl -s -m 20 http://localhost:8090/mod_cluster_manager | grep Node | grep tomcat$1 > /dev/null
         if [ $? -eq 0 ]; then
             break
         fi
@@ -106,7 +106,7 @@ singlecycle() {
     i=0
     while true
     do
-        curl -s -m 20 http://localhost:6666/mod_cluster_manager | grep /tomcat$1 > /dev/null
+        curl -s -m 20 http://localhost:8090/mod_cluster_manager | grep /tomcat$1 > /dev/null
         if [ $? -eq 0 ]; then
             break
         fi
@@ -126,7 +126,7 @@ singlecycle() {
     tomcat_shutdown $1 127.0.0.$R || exit 1
     while true
     do
-        curl -s -m 20 http://localhost:6666/mod_cluster_manager | grep Node | grep tomcat$1 > /dev/null
+        curl -s -m 20 http://localhost:8090/mod_cluster_manager | grep Node | grep tomcat$1 > /dev/null
         if [ $? -ne 0 ]; then
             break
         fi
diff --git a/test/MODCLUSTER-755/mod_lbmethod_cluster.conf b/test/MODCLUSTER-755/mod_lbmethod_cluster.conf
@@ -11,11 +11,11 @@ LoadModule watchdog_module         modules/mod_watchdog.so
 Maxnode 505
 Maxhost 1010
 Maxcontext 1100
-Listen 6666
+Listen 8090
 ManagerBalancerName mycluster
 ServerName localhost
 
-<VirtualHost *:6666>
+<VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.1
diff --git a/test/MODCLUSTER-755/mod_proxy_cluster.conf b/test/MODCLUSTER-755/mod_proxy_cluster.conf
@@ -8,11 +8,11 @@ LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
 Maxnode 505
 Maxhost 1010
 Maxcontext 1100
-Listen 6666
+Listen 8090
 ManagerBalancerName mycluster
 ServerName localhost
 
-<VirtualHost *:6666>
+<VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.1
diff --git a/test/MODCLUSTER-755/testit.sh b/test/MODCLUSTER-755/testit.sh
@@ -20,7 +20,7 @@ tomcat_start 1
 
 NODE_COUNT="${NODE_COUNT:-500}"
 APP_COUNT="${APP_COUNT:-2}"
-HTTPD="${HTTPD:-127.0.0.1:6666/}"
+HTTPD="${HTTPD:-127.0.0.1:8090/}"
 USE_MULTI_APP="${USE_MULTI_APP:-false}"
 
 echo "NODE_COUNT: ${NODE_COUNT}"
diff --git a/test/MODCLUSTER-785/mod_lbmethod_cluster.conf b/test/MODCLUSTER-785/mod_lbmethod_cluster.conf
@@ -11,14 +11,14 @@ LoadModule watchdog_module         modules/mod_watchdog.so
 Maxnode 505
 Maxhost 1010
 Maxcontext 1100
-Listen 6666
+Listen 8090
 ManagerBalancerName mycluster
 ServerName localhost
 
 EnableWsTunnel
 WSUpgradeHeader websocket
 
-<VirtualHost *:6666>
+<VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.1
diff --git a/test/MODCLUSTER-785/mod_proxy_cluster.conf b/test/MODCLUSTER-785/mod_proxy_cluster.conf
@@ -8,14 +8,14 @@ LoadModule watchdog_module modules/mod_watchdog.so
 Maxnode 505
 Maxhost 1010
 Maxcontext 1100
-Listen 6666
+Listen 8090
 ManagerBalancerName mycluster
 ServerName localhost
 
 EnableWsTunnel
 WSUpgradeHeader websocket
 
-<VirtualHost *:6666>
+<VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.1
diff --git a/test/MODCLUSTER-785/testit.sh b/test/MODCLUSTER-785/testit.sh
@@ -25,7 +25,7 @@ docker cp MODCLUSTER-785/app tomcat1:/usr/local/tomcat/webapps/app
 
 # check that the app is answering
 sleep 15
-curl -s -m 20 http://localhost:8000/app/status.jsp | grep "785"
+curl -s -m 20 http://localhost:8090/app/status.jsp | grep "785"
 if [ $? -ne 0 ]; then
   echo "MODCLUSTER-785 Failed!"
   exit 1
@@ -36,8 +36,8 @@ tomcat_remove 1
 
 # it return 503
 # make sure we use enough workers
-ab -c 10 -n100 http://localhost:8000/app/
-http_code=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8000/app/)
+ab -c 10 -n100 http://localhost:8090/app/
+http_code=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8090/app/)
 if [ ${http_code} != 503 ]; then
   echo "MODCLUSTER-785 Failed! not 503 but ${http_code}"
   exit 1
@@ -57,12 +57,12 @@ sleep 15
 
 # check that the app is answering
 # does it return 503
-http_code=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8000/app/status.jsp)
+http_code=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8090/app/status.jsp)
 i=0
 while true
 do
   sleep 1
-  http_code=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8000/app/status.jsp)
+  http_code=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8090/app/status.jsp)
   if [ ${http_code} == 200 ]; then
     break
   fi
@@ -86,7 +86,7 @@ i=0
 while true
 do
   sleep 1
-  http_code=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8000/app/status.jsp)
+  http_code=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8090/app/status.jsp)
   if [ ${http_code} == 503 ]; then
     echo "MODCLUSTER-785 Failed! return 503"
     exit 1
diff --git a/test/MODCLUSTER-794/mod_lbmethod_cluster.conf b/test/MODCLUSTER-794/mod_lbmethod_cluster.conf
@@ -10,13 +10,13 @@ LoadModule watchdog_module         modules/mod_watchdog.so
 
 ProxyPreserveHost On
 
-Listen 6666
+Listen 8090
 ServerName localhost
 ManagerBalancerName mycluster
 EnableWsTunnel
 WSUpgradeHeader websocket
 
-<VirtualHost *:6666>
+<VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.
diff --git a/test/MODCLUSTER-794/mod_proxy_cluster.conf b/test/MODCLUSTER-794/mod_proxy_cluster.conf
@@ -12,7 +12,7 @@ LoadModule proxy_cluster_module modules/mod_proxy_cluster.so
 
 ProxyPreserveHost On
 
-Listen 6666
+Listen 8090
 ServerName localhost
 ManagerBalancerName mycluster
 EnableWsTunnel
@@ -23,7 +23,7 @@ WSUpgradeHeader websocket
   EnableOptions On
 </IfModule>
 
-<VirtualHost *:6666>
+<VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.
diff --git a/test/MODCLUSTER-794/testit.sh b/test/MODCLUSTER-794/testit.sh
@@ -16,7 +16,7 @@ done
 sleep 20
 
 for i in $(seq 1 10); do
-    curl -m 10 localhost:6666
+    curl -m 10 localhost:8090
 
     if [ $? -ne 0 ]; then
         echo "curl to server failed"
diff --git a/test/basetests.sh b/test/basetests.sh
@@ -20,12 +20,12 @@ sleep 12
 
 # Basic 200 and 404 tests.
 echo "basic 200 and 404 tests"
-CODE=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8000/testapp/test.jsp)
+CODE=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8090/testapp/test.jsp)
 if [ ${CODE} != "200" ]; then
   echo "Failed can't reach webapp: ${CODE}"
   exit 1
 fi
-CODE=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8000/testapp/toto.jsp)
+CODE=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8090/testapp/toto.jsp)
 if [ ${CODE} != "404" ]; then
   echo "Failed should get 404"
   exit 1
diff --git a/test/curlloop.sh b/test/curlloop.sh
@@ -11,7 +11,7 @@ done
 while true
 do
   found=0
-  http_code=$(curl -s -m 10 -o /dev/null -w "%{http_code}" http://localhost:8000/testapp/test.jsp)
+  http_code=$(curl -s -m 10 -o /dev/null -w "%{http_code}" http://localhost:8090/testapp/test.jsp)
   for var in "$@"
   do 
     if [ "${http_code}" -eq "${var}" ]; then
diff --git a/test/hangingtests.sh b/test/hangingtests.sh
@@ -43,7 +43,7 @@ echo "hanging a tomcat checking it is removed after a while no requests"
 tomcat_start_two
 sleep 10
 tomcat_wait_for_n_nodes 2 || exit 1
-# curlloop.sh checks for http://localhost:8000/testapp/test.jsp
+# curlloop.sh checks for http://localhost:8090/testapp/test.jsp
 docker cp testapp tomcat1:/usr/local/tomcat/webapps
 docker cp testapp tomcat2:/usr/local/tomcat/webapps
 
diff --git a/test/httpd/Containerfile b/test/httpd/Containerfile
@@ -21,10 +21,11 @@ RUN ./configure --enable-proxy \
                 --enable-proxy-http \
                 --enable-proxy-ajp \
                 --enable-proxy-wstunnel \
-                --enable-proxy-hcheck \
-                --with-port=8000
+                --enable-proxy-hcheck
 RUN make
 RUN make install
+# we don't need any other listeners except the ones we define in our config files
+RUN sed -i 's/\(Listen 80\)/#\1/' /usr/local/apache2/conf/httpd.conf
 
 # httpd is installed in /usr/local/apache2/bin/
 # build and install mod_proxy_cluster *.so files.
diff --git a/test/httpd/mod_lbmethod_cluster.conf b/test/httpd/mod_lbmethod_cluster.conf
@@ -10,12 +10,12 @@ LoadModule watchdog_module         modules/mod_watchdog.so
 
 ProxyPreserveHost On
 
-Listen 6666
+Listen 8090
 ServerName localhost
 ManagerBalancerName mycluster
 WSUpgradeHeader websocket
 
-<VirtualHost *:6666>
+<VirtualHost *:8090>
   EnableMCMPReceive
   <Location />
     Require ip 127.0.0.
diff --git a/test/httpd/mod_proxy_cluster.conf b/test/httpd/mod_proxy_cluster.conf
diff --git a/test/includes/common.sh b/test/includes/common.sh
diff --git a/test/includes/miniserver.py b/test/includes/miniserver.py
diff --git a/test/includes/src/main/gvy/org/jboss/modcluster/Main.gvy b/test/includes/src/main/gvy/org/jboss/modcluster/Main.gvy
diff --git a/test/includes/src/main/gvy/org/jboss/modcluster/WebHTTPTest.gvy b/test/includes/src/main/gvy/org/jboss/modcluster/WebHTTPTest.gvy
diff --git a/test/maintests.sh b/test/maintests.sh
diff --git a/test/tomcat/Containerfile b/test/tomcat/Containerfile
diff --git a/test/tomcat/README.md b/test/tomcat/README.md
diff --git a/test/tomcat/start.sh b/test/tomcat/start.sh
diff --git a/test/websocket/mod_proxy_cluster.conf b/test/websocket/mod_proxy_cluster.conf
