svn commit: r1835107 - in /tomcat/trunk: bin/catalina.sh bin/ciphers.sh bin/configtest.sh bin/daemon.sh bin/digest.sh bin/makebase.sh bin/setclasspath.sh bin/shutdown.sh bin/startup.sh bin/tool-wrappe
Author: markt Date: Thu Jul 5 08:43:58 2018 New Revision: 1835107 URL: http://svn.apache.org/viewvc?rev=1835107&view=rev Log: Revert r1835090 Modified: tomcat/trunk/bin/catalina.sh tomcat/trunk/bin/ciphers.sh tomcat/trunk/bin/configtest.sh tomcat/trunk/bin/daemon.sh tomcat/trunk/bin/digest.sh tomcat/trunk/bin/makebase.sh tomcat/trunk/bin/setclasspath.sh tomcat/trunk/bin/shutdown.sh tomcat/trunk/bin/startup.sh tomcat/trunk/bin/tool-wrapper.sh tomcat/trunk/bin/version.sh tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1835107&r1=1835106&r2=1835107&view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Thu Jul 5 08:43:58 2018 @@ -112,7 +112,7 @@ cygwin=false darwin=false os400=false hpux=false -case "$(uname)" in +case "`uname`" in CYGWIN*) cygwin=true;; Darwin*) darwin=true;; OS400*) os400=true;; @@ -123,20 +123,20 @@ esac PRG="$0" while [ -h "$PRG" ]; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then PRG="$link" else -PRG=$(dirname "$PRG")/"$link" +PRG=`dirname "$PRG"`/"$link" fi done # Get standard environment variables -PRGDIR=$(dirname "$PRG") +PRGDIR=`dirname "$PRG"` # Only set CATALINA_HOME if not already set -[ -z "$CATALINA_HOME" ] && CATALINA_HOME=$(cd "$PRGDIR/.." >/dev/null; pwd) +[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` # Copy CATALINA_BASE from CATALINA_HOME if not already set [ -z "$CATALINA_BASE" ] && CATALINA_BASE="$CATALINA_HOME" @@ -153,11 +153,11 @@ fi # For Cygwin, ensure paths are in UNIX format before anything is touched if $cygwin; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$JRE_HOME" ] && JRE_HOME=$(cygpath --unix "$JRE_HOME") - [ -n "$CATALINA_HOME" ] && CATALINA_HOME=$(cygpath --unix "$CATALINA_HOME") - [ -n "$CATALINA_BASE" ] && CATALINA_BASE=$(cygpath --unix "$CATALINA_BASE") - [ -n "$CLASSPATH" ] && CLASSPATH=$(cygpath --path --unix "$CLASSPATH") + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"` + [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"` + [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"` + [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"` fi # Ensure that neither CATALINA_HOME nor CATALINA_BASE contains a colon @@ -228,19 +228,19 @@ fi # Bugzilla 37848: When no TTY is available, don't output to console have_tty=0 -if [ "$(tty)" != "not a tty" ]; then +if [ "`tty`" != "not a tty" ]; then have_tty=1 fi # For Cygwin, switch paths to Windows format before running java if $cygwin; then - JAVA_HOME=$(cygpath --absolute --windows "$JAVA_HOME") - JRE_HOME=$(cygpath --absolute --windows "$JRE_HOME") - CATALINA_HOME=$(cygpath --absolute --windows "$CATALINA_HOME") - CATALINA_BASE=$(cygpath --absolute --windows "$CATALINA_BASE") - CATALINA_TMPDIR=$(cygpath --absolute --windows "$CATALINA_TMPDIR") - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$JAVA_ENDORSED_DIRS" ] && JAVA_ENDORSED_DIRS=$(cygpath --path --windows "$JAVA_ENDORSED_DIRS") + JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"` + JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"` + CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"` + CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"` + CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"` + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$JAVA_ENDORSED_DIRS" ] && JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"` fi if [ -z "$JSSE_OPTS" ] ; then @@ -285,7 +285,7 @@ if [ -d "$CATALINA_HOME/endorsed" ]; the fi # Make the umask available when using the org.apache.catalina.security.SecurityListener -JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=$(umask)" +JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.security.SecurityListener.UMASK=`umask`" if [ -z "$USE_NOHUP" ]; then if $hpux; then @@ -407,7 +407,7 @@ elif [ "$1" = "start" ] ; then if [ -s "$CATALINA_PID" ]; then echo "Existing PID file found during start." if [ -r "$CATALINA_PID" ]; then - PID=$(cat "$CATALINA_PID") + PID=`cat "$CATALINA_PID"` ps -p $PID >/dev/null 2>&1 if [ $? -eq 0 ] ; then echo "Tomcat appears to still be running with PID $PID. Start aborted." @@ -500,7 +500,7 @@ elif [ "$1" = "stop" ] ; then if [ ! -z "$CATALINA_PID" ]; then if [ -f "$CATALINA_PID" ]; then if [ -s "$CATALINA_PID" ]; then -kill -0 $(cat
svn commit: r1835108 - /tomcat/trunk/bin/makebase.sh
Author: markt
Date: Thu Jul 5 08:50:32 2018
New Revision: 1835108
URL: http://svn.apache.org/viewvc?rev=1835108&view=rev
Log:
Use `...` rather than $(...) for consistency with other scripts and broadest
compatibility.
Modified:
tomcat/trunk/bin/makebase.sh
Modified: tomcat/trunk/bin/makebase.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1835108&r1=1835107&r2=1835108&view=diff
==
--- tomcat/trunk/bin/makebase.sh (original)
+++ tomcat/trunk/bin/makebase.sh Thu Jul 5 08:50:32 2018
@@ -58,7 +58,7 @@ if [ -d ${BASE_TGT} ]; then
echo "Target directory exists"
# exit if target directory is not empty
-[ "$(ls -A ${BASE_TGT})" ] && \
+[ "`ls -A ${BASE_TGT}`" ] && \
echo "Target directory is not empty" && \
exit 1
else
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835111 - in /tomcat/trunk/bin: daemon.sh setclasspath.sh
Author: markt Date: Thu Jul 5 09:06:44 2018 New Revision: 1835111 URL: http://svn.apache.org/viewvc?rev=1835111&view=rev Log: Replace [ a -a b ] with [ a ] && [ b ] as recommended by shellcheck.net Modified: tomcat/trunk/bin/daemon.sh tomcat/trunk/bin/setclasspath.sh Modified: tomcat/trunk/bin/daemon.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1835111&r1=1835110&r2=1835111&view=diff == --- tomcat/trunk/bin/daemon.sh (original) +++ tomcat/trunk/bin/daemon.sh Thu Jul 5 09:06:44 2018 @@ -168,7 +168,7 @@ if [ "$cygwin" = "false" ]; then MAX_FD_LIMIT=`ulimit -H -n` if [ "$?" -eq 0 ]; then # Darwin does not allow RLIMIT_INFINITY on file soft limit -if [ "$darwin" = "true" -a "$MAX_FD_LIMIT" = "unlimited" ]; then +if [ "$darwin" = "true" ] && [ "$MAX_FD_LIMIT" = "unlimited" ]; then MAX_FD_LIMIT=`/usr/sbin/sysctl -n kern.maxfilesperproc` fi test ".$MAX_FD" = ".maximum" && MAX_FD="$MAX_FD_LIMIT" Modified: tomcat/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=1835111&r1=1835110&r2=1835111&view=diff == --- tomcat/trunk/bin/setclasspath.sh (original) +++ tomcat/trunk/bin/setclasspath.sh Thu Jul 5 09:06:44 2018 @@ -22,7 +22,7 @@ # - # Make sure prerequisite environment variables are set -if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then +if [ -z "$JAVA_HOME" ] && [ -z "$JRE_HOME" ]; then if $darwin; then # Bugzilla 54390 if [ -x '/usr/libexec/java_home' ] ; then @@ -44,13 +44,13 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ] fi fi fi - if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then + if [ -z "$JAVA_HOME" ] && [ -z "$JRE_HOME" ]; then echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" echo "At least one of these environment variable is needed to run this program" exit 1 fi fi -if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then +if [ -z "$JAVA_HOME" ] && [ "$1" = "debug" ]; then echo "JAVA_HOME should point to a JDK in order to run in debug mode." exit 1 fi - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835112 - /tomcat/trunk/bin/setclasspath.sh
Author: markt Date: Thu Jul 5 09:09:08 2018 New Revision: 1835112 URL: http://svn.apache.org/viewvc?rev=1835112&view=rev Log: Replace [ a -o b ] with [ a ] || [ b ] as recommended by shellcheck.net Modified: tomcat/trunk/bin/setclasspath.sh Modified: tomcat/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=1835112&r1=1835111&r2=1835112&view=diff == --- tomcat/trunk/bin/setclasspath.sh (original) +++ tomcat/trunk/bin/setclasspath.sh Thu Jul 5 09:09:08 2018 @@ -61,14 +61,14 @@ fi # If we're running under jdb, we need a full jdk. if [ "$1" = "debug" ] ; then if [ "$os400" = "true" ]; then -if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then +if [ ! -x "$JAVA_HOME"/bin/java ] || [ ! -x "$JAVA_HOME"/bin/javac ]; then echo "The JAVA_HOME environment variable is not defined correctly" echo "This environment variable is needed to run this program" echo "NB: JAVA_HOME should point to a JDK not a JRE" exit 1 fi else -if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/jdb -o ! -x "$JAVA_HOME"/bin/javac ]; then +if [ ! -x "$JAVA_HOME"/bin/java ] || [ ! -x "$JAVA_HOME"/bin/jdb ] || [ ! -x "$JAVA_HOME"/bin/javac ]; then echo "The JAVA_HOME environment variable is not defined correctly" echo "This environment variable is needed to run this program" echo "NB: JAVA_HOME should point to a JDK not a JRE" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835114 - in /tomcat/trunk/bin: daemon.sh makebase.sh
Author: markt
Date: Thu Jul 5 09:31:55 2018
New Revision: 1835114
URL: http://svn.apache.org/viewvc?rev=1835114&view=rev
Log:
Remove unnecessary use of ${...} for consistency with other scripts.
Modified:
tomcat/trunk/bin/daemon.sh
tomcat/trunk/bin/makebase.sh
Modified: tomcat/trunk/bin/daemon.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1835114&r1=1835113&r2=1835114&view=diff
==
--- tomcat/trunk/bin/daemon.sh (original)
+++ tomcat/trunk/bin/daemon.sh Thu Jul 5 09:31:55 2018
@@ -134,7 +134,7 @@ elif [ -r "$CATALINA_HOME/bin/setenv.sh"
fi
# Add on extra jar files to CLASSPATH
-test ".$CLASSPATH" != . && CLASSPATH="${CLASSPATH}:"
+test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:"
CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar"
test ".$CATALINA_OUT" = . &&
CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out"
Modified: tomcat/trunk/bin/makebase.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1835114&r1=1835113&r2=1835114&view=diff
==
--- tomcat/trunk/bin/makebase.sh (original)
+++ tomcat/trunk/bin/makebase.sh Thu Jul 5 09:31:55 2018
@@ -47,37 +47,37 @@ PRGDIR=`dirname "$PRG"`
# first arg is the target directory
BASE_TGT=$1
-if [ -z ${BASE_TGT} ]; then
+if [ -z $BASE_TGT ]; then
# target directory not provided; exit
echo "Usage: makebase "
exit 1
fi
-if [ -d ${BASE_TGT} ]; then
+if [ -d $BASE_TGT ]; then
# target directory exists
echo "Target directory exists"
# exit if target directory is not empty
-[ "`ls -A ${BASE_TGT}`" ] && \
+[ "`ls -A $BASE_TGT`" ] && \
echo "Target directory is not empty" && \
exit 1
else
# create the target directory
-mkdir -p ${BASE_TGT}
+mkdir -p $BASE_TGT
fi
for dir in bin lib logs temp webapps work;
do
# create empty directories
-mkdir "${BASE_TGT}/${dir}"
+mkdir "$BASE_TGT/$dir"
done
# copy conf directory recursively and preserve permissions
-cp -a "${CATALINA_HOME}/conf" "${BASE_TGT}/"
+cp -a "$CATALINA_HOME/conf" "$BASE_TGT/"
# copy setenv.sh if exists
-[ -f "${CATALINA_HOME}/bin/setenv.sh" ] && \
-cp "${CATALINA_HOME}/bin/setenv.sh" "${BASE_TGT}/bin/"
+[ -f "$CATALINA_HOME/bin/setenv.sh" ] && \
+cp "$CATALINA_HOME/bin/setenv.sh" "$BASE_TGT/bin/"
echo "Created CATALINA_BASE directory at $BASE_TGT"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835115 - /tomcat/trunk/bin/catalina.sh
Author: markt Date: Thu Jul 5 09:46:24 2018 New Revision: 1835115 URL: http://svn.apache.org/viewvc?rev=1835115&view=rev Log: Make clear this is a string assignment (shellcheck.net) Modified: tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1835115&r1=1835114&r2=1835115&view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Thu Jul 5 09:46:24 2018 @@ -296,7 +296,7 @@ if [ -z "$USE_NOHUP" ]; then fi unset _NOHUP if [ "$USE_NOHUP" = "true" ]; then -_NOHUP=nohup +_NOHUP="nohup" fi # Add the JAVA 9 specific start-up parameters required by Tomcat - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62523] New: Concurrent stress test websocket server by jmeter, occur:java.io.IOException: java.io.IOException: Broken pipe
https://bz.apache.org/bugzilla/show_bug.cgi?id=62523 Bug ID: 62523 Summary: Concurrent stress test websocket server by jmeter, occur:java.io.IOException: java.io.IOException: Broken pipe Product: Tomcat 9 Version: 9.0.10 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: WebSocket Assignee: dev@tomcat.apache.org Reporter: daipeng@163.com Target Milestone: - Created attachment 36008 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36008&action=edit websocket handler process environment: 1:tomcat version:9.0.10 2:spring-websocket:4.0.0-releases 3:jmeter:4.0.0 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62523] Concurrent stress test websocket server by jmeter, occur:java.io.IOException: java.io.IOException: Broken pipe
https://bz.apache.org/bugzilla/show_bug.cgi?id=62523 --- Comment #1 from sosojustdo --- Created attachment 36009 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36009&action=edit websocket init process -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62523] Concurrent stress test websocket server by jmeter, occur:java.io.IOException: java.io.IOException: Broken pipe
https://bz.apache.org/bugzilla/show_bug.cgi?id=62523 --- Comment #2 from sosojustdo --- Created attachment 36010 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36010&action=edit websocket config -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62523] Concurrent stress test websocket server by jmeter, occur:java.io.IOException: java.io.IOException: Broken pipe
https://bz.apache.org/bugzilla/show_bug.cgi?id=62523 --- Comment #3 from sosojustdo --- Created attachment 36011 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36011&action=edit websocket handler interceptor -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835119 - /tomcat/trunk/bin/daemon.sh
Author: markt Date: Thu Jul 5 10:55:02 2018 New Revision: 1835119 URL: http://svn.apache.org/viewvc?rev=1835119&view=rev Log: Make code to find CATALINA_HOME consistent with other scripts. Add "..." when using variables that may contain spaces Modified: tomcat/trunk/bin/daemon.sh Modified: tomcat/trunk/bin/daemon.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1835119&r1=1835118&r2=1835119&view=diff == --- tomcat/trunk/bin/daemon.sh (original) +++ tomcat/trunk/bin/daemon.sh Thu Jul 5 10:55:02 2018 @@ -18,20 +18,22 @@ # - # Commons Daemon wrapper script. # - -# + # resolve links - $0 may be a softlink -ARG0="$0" -while [ -h "$ARG0" ]; do - ls=`ls -ld "$ARG0"` +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` link=`expr "$ls" : '.*-> \(.*\)$'` if expr "$link" : '/.*' > /dev/null; then -ARG0="$link" +PRG="$link" else -ARG0="`dirname $ARG0`/$link" +PRG=`dirname "$PRG"`/"$link" fi done -DIRNAME="`dirname $ARG0`" -PROGRAM="`basename $ARG0`" + +DIRNAME="`dirname "$PRG"`" +PROGRAM="`basename "$PRG"`" while [ ".$1" != . ] do case "$1" in @@ -100,10 +102,10 @@ if [ -z "$JAVA_HOME" ]; then if expr "$link" : '/.*' > /dev/null; then JAVA_BIN="$link" else -JAVA_BIN="`dirname $JAVA_BIN`/$link" +JAVA_BIN="`dirname "$JAVA_BIN"`/$link" fi done -test -x "$JAVA_BIN" && JAVA_HOME="`dirname $JAVA_BIN`" +test -x "$JAVA_BIN" && JAVA_HOME="`dirname "$JAVA_BIN"`" test ".$JAVA_HOME" != . && JAVA_HOME=`cd "$JAVA_HOME/.." >/dev/null; pwd` else JAVA_BIN="$JAVA_HOME/bin/java" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835120 - /tomcat/trunk/bin/makebase.sh
Author: markt Date: Thu Jul 5 10:57:34 2018 New Revision: 1835120 URL: http://svn.apache.org/viewvc?rev=1835120&view=rev Log: Add "..." when using variables that may contain spaces Modified: tomcat/trunk/bin/makebase.sh Modified: tomcat/trunk/bin/makebase.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.sh?rev=1835120&r1=1835119&r2=1835120&view=diff == --- tomcat/trunk/bin/makebase.sh (original) +++ tomcat/trunk/bin/makebase.sh Thu Jul 5 10:57:34 2018 @@ -47,23 +47,23 @@ PRGDIR=`dirname "$PRG"` # first arg is the target directory BASE_TGT=$1 -if [ -z $BASE_TGT ]; then +if [ -z "$BASE_TGT" ]; then # target directory not provided; exit echo "Usage: makebase " exit 1 fi -if [ -d $BASE_TGT ]; then +if [ -d "$BASE_TGT" ]; then # target directory exists echo "Target directory exists" # exit if target directory is not empty -[ "`ls -A $BASE_TGT`" ] && \ +[ "`ls -A "$BASE_TGT"`" ] && \ echo "Target directory is not empty" && \ exit 1 else # create the target directory -mkdir -p $BASE_TGT +mkdir -p "$BASE_TGT" fi for dir in bin lib logs temp webapps work; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835121 - /tomcat/trunk/bin/setclasspath.sh
Author: markt Date: Thu Jul 5 10:59:46 2018 New Revision: 1835121 URL: http://svn.apache.org/viewvc?rev=1835121&view=rev Log: Add "..." when using variables that may contain spaces Modified: tomcat/trunk/bin/setclasspath.sh Modified: tomcat/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=1835121&r1=1835120&r2=1835121&view=diff == --- tomcat/trunk/bin/setclasspath.sh (original) +++ tomcat/trunk/bin/setclasspath.sh Thu Jul 5 10:59:46 2018 @@ -34,8 +34,8 @@ if [ -z "$JAVA_HOME" ] && [ -z "$JRE_HOM else JAVA_PATH=`which java 2>/dev/null` if [ "x$JAVA_PATH" != "x" ]; then - JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null` - JRE_HOME=`dirname $JAVA_PATH 2>/dev/null` + JAVA_PATH=`dirname "$JAVA_PATH" 2>/dev/null` + JRE_HOME=`dirname "$JAVA_PATH" 2>/dev/null` fi if [ "x$JRE_HOME" = "x" ]; then # XXX: Should we try other locations? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835123 - /tomcat/trunk/bin/makebase.bat
Author: markt Date: Thu Jul 5 11:19:43 2018 New Revision: 1835123 URL: http://svn.apache.org/viewvc?rev=1835123&view=rev Log: Add "..." when using variables that may contain spaces Modified: tomcat/trunk/bin/makebase.bat Modified: tomcat/trunk/bin/makebase.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1835123&r1=1835122&r2=1835123&view=diff == --- tomcat/trunk/bin/makebase.bat (original) +++ tomcat/trunk/bin/makebase.bat Thu Jul 5 11:19:43 2018 @@ -45,13 +45,13 @@ goto EOF rem first arg is the target directory set BASE_TGT=%1 -if %BASE_TGT%.==. ( +if "%BASE_TGT%."==. ( rem target directory not provided; exit echo Usage: makebase ^ goto :EOF ) -if exist %BASE_TGT% ( +if exist "%BASE_TGT%" ( rem target directory exists echo Target directory exists @@ -62,7 +62,7 @@ if exist %BASE_TGT% ( ) ) else ( rem create the target directory -mkdir %BASE_TGT% +mkdir "%BASE_TGT%" ) rem create empty directories @@ -71,12 +71,12 @@ for %%d in (bin, lib, logs, temp, webapp ) rem copy conf directory -robocopy %CATALINA_HOME%\conf %BASE_TGT%\conf > nul +robocopy "%CATALINA_HOME%\conf" "%BASE_TGT%\conf" > nul rem copy setenv.bat if exists -robocopy %CATALINA_HOME%\bin %BASE_TGT%\bin setenv.bat > nul +robocopy "%CATALINA_HOME%\bin" "%BASE_TGT%\bin" setenv.bat > nul -echo Created CATALINA_BASE directory at %BASE_TGT% +echo Created CATALINA_BASE directory at "%BASE_TGT%" echo Attention: The ports in conf\server.xml might be bound by a echodifferent instance. Please review your config files - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.0.53
На пт, 29.06.2018 г. в 19:42 ч. Violeta Georgieva написа: > > The proposed Apache Tomcat 8.0.53 release is now available for voting. > > NOTE: This is the last release! > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.53/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1189/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_53/ > > The proposed 8.0.53 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.0.53 +1 Regards, Violeta
svn commit: r1835126 - /tomcat/trunk/bin/makebase.bat
Author: markt Date: Thu Jul 5 11:32:12 2018 New Revision: 1835126 URL: http://svn.apache.org/viewvc?rev=1835126&view=rev Log: Revert r1835123. It doesn't resolve the issue. Restore original while an alternative fix is worked on. Modified: tomcat/trunk/bin/makebase.bat Modified: tomcat/trunk/bin/makebase.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1835126&r1=1835125&r2=1835126&view=diff == --- tomcat/trunk/bin/makebase.bat (original) +++ tomcat/trunk/bin/makebase.bat Thu Jul 5 11:32:12 2018 @@ -45,13 +45,13 @@ goto EOF rem first arg is the target directory set BASE_TGT=%1 -if "%BASE_TGT%."==. ( +if %BASE_TGT%.==. ( rem target directory not provided; exit echo Usage: makebase ^ goto :EOF ) -if exist "%BASE_TGT%" ( +if exist %BASE_TGT% ( rem target directory exists echo Target directory exists @@ -62,7 +62,7 @@ if exist "%BASE_TGT%" ( ) ) else ( rem create the target directory -mkdir "%BASE_TGT%" +mkdir %BASE_TGT% ) rem create empty directories @@ -71,12 +71,12 @@ for %%d in (bin, lib, logs, temp, webapp ) rem copy conf directory -robocopy "%CATALINA_HOME%\conf" "%BASE_TGT%\conf" > nul +robocopy %CATALINA_HOME%\conf %BASE_TGT%\conf > nul rem copy setenv.bat if exists -robocopy "%CATALINA_HOME%\bin" "%BASE_TGT%\bin" setenv.bat > nul +robocopy %CATALINA_HOME%\bin %BASE_TGT%\bin setenv.bat > nul -echo Created CATALINA_BASE directory at "%BASE_TGT%" +echo Created CATALINA_BASE directory at %BASE_TGT% echo Attention: The ports in conf\server.xml might be bound by a echodifferent instance. Please review your config files - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [RESULT][VOTE] Release Apache Tomcat 8.0.53
Hi, На пт, 29.06.2018 г. в 19:42 ч. Violeta Georgieva написа: > > The proposed Apache Tomcat 8.0.53 release is now available for voting. > > NOTE: This is the last release! > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.53/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1189/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_53/ > > The proposed 8.0.53 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 8.0.53 +1 (binding):markt, remm, csutherl, violetagg No other voters were cast. The vote has passed. I'll do the release shortly and announce it once the mirrors catch up. Regards, Violeta
svn commit: r27922 - /dev/tomcat/tomcat-8/v8.0.53/ /release/tomcat/tomcat-8/v8.0.53/
Author: violetagg Date: Thu Jul 5 11:40:02 2018 New Revision: 27922 Log: Release Tomcat 8.0.53 Added: release/tomcat/tomcat-8/v8.0.53/ - copied from r27921, dev/tomcat/tomcat-8/v8.0.53/ Removed: dev/tomcat/tomcat-8/v8.0.53/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.90
On Mon, Jul 2, 2018 at 7:36 PM Violeta Georgieva wrote: > The proposed Apache Tomcat 7.0.90 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.90/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1190/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_90/ > > The proposed 7.0.90 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.90 Stable > Rémy
svn commit: r1835128 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Thu Jul 5 11:46:18 2018 New Revision: 1835128 URL: http://svn.apache.org/viewvc?rev=1835128&view=rev Log: Update the release date for 8.0.53 Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1835128&r1=1835127&r2=1835128&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Jul 5 11:46:18 2018 @@ -46,7 +46,7 @@ --> - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835131 - /tomcat/trunk/bin/makebase.bat
Author: markt
Date: Thu Jul 5 12:09:53 2018
New Revision: 1835131
URL: http://svn.apache.org/viewvc?rev=1835131&view=rev
Log:
Get batch file working when creating an instance with a space in the name.
The "s used on the command line are included in the value so remove them from
the script else sequences of "" cause all sorts of bugs.
Modified:
tomcat/trunk/bin/makebase.bat
Modified: tomcat/trunk/bin/makebase.bat
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/makebase.bat?rev=1835131&r1=1835130&r2=1835131&view=diff
==
--- tomcat/trunk/bin/makebase.bat (original)
+++ tomcat/trunk/bin/makebase.bat Thu Jul 5 12:09:53 2018
@@ -56,7 +56,7 @@ if exist %BASE_TGT% (
echo Target directory exists
rem exit if target directory is not empty
-for /F %%i in ('dir /b "%BASE_TGT%\*.*"') do (
+for /F %%i in ('dir /b %BASE_TGT%\*.*') do (
echo Target directory is not empty
goto :EOF
)
@@ -67,7 +67,7 @@ if exist %BASE_TGT% (
rem create empty directories
for %%d in (bin, lib, logs, temp, webapps, work) do (
-mkdir "%BASE_TGT%\%%d"
+mkdir %BASE_TGT%\%%d
)
rem copy conf directory
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62523] Concurrent stress test websocket server by jmeter, occur:java.io.IOException: java.io.IOException: Broken pipe
https://bz.apache.org/bugzilla/show_bug.cgi?id=62523 Mark Thomas changed: What|Removed |Added OS||All --- Comment #4 from Mark Thomas --- No stack trace from the error, no JMeter config and a test case that has a whole bunch of dependencies that have not been provided. This is heading towards being closed as INVALID. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62523] Concurrent stress test websocket server by jmeter, occur:java.io.IOException: java.io.IOException: Broken pipe
https://bz.apache.org/bugzilla/show_bug.cgi?id=62523 --- Comment #5 from sosojustdo --- java.io.IOException: java.io.IOException: Broken pipe at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendMessageBlock(WsRemoteEndpointImplBase.java:315) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendMessageBlock(WsRemoteEndpointImplBase.java:250) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendPartialString(WsRemoteEndpointImplBase.java:223) at org.apache.tomcat.websocket.WsRemoteEndpointBasic.sendText(WsRemoteEndpointBasic.java:49) at org.springframework.web.socket.adapter.standard.StandardWebSocketSession.sendTextMessage(StandardWebSocketSession.java:137) at org.springframework.web.socket.adapter.AbstractWebSocketSession.sendMessage(AbstractWebSocketSession.java:100) at com.cloudyoung.wx.comet.server.SystemWebSocketHandler.sendMessageToUser(SystemWebSocketHandler.java:233) at com.cloudyoung.wx.comet.service.impl.WxWebsocketMessageServiceImpl.sendDialogueMessage(WxWebsocketMessageServiceImpl.java:45) at com.cloudyoung.wx.comet.server.SystemWebSocketHandler.handleMessage(SystemWebSocketHandler.java:95) at org.springframework.web.socket.handler.WebSocketHandlerDecorator.handleMessage(WebSocketHandlerDecorator.java:59) at org.springframework.web.socket.handler.LoggingWebSocketHandlerDecorator.handleMessage(LoggingWebSocketHandlerDecorator.java:55) at org.springframework.web.socket.handler.ExceptionWebSocketHandlerDecorator.handleMessage(ExceptionWebSocketHandlerDecorator.java:69) at org.springframework.web.socket.adapter.standard.StandardWebSocketHandlerAdapter.handleTextMessage(StandardWebSocketHandlerAdapter.java:112) at org.springframework.web.socket.adapter.standard.StandardWebSocketHandlerAdapter.access$000(StandardWebSocketHandlerAdapter.java:42) at org.springframework.web.socket.adapter.standard.StandardWebSocketHandlerAdapter$3.onMessage(StandardWebSocketHandlerAdapter.java:82) at org.springframework.web.socket.adapter.standard.StandardWebSocketHandlerAdapter$3.onMessage(StandardWebSocketHandlerAdapter.java:79) at org.apache.tomcat.websocket.WsFrameBase.sendMessageText(WsFrameBase.java:395) at org.apache.tomcat.websocket.server.WsFrameServer.sendMessageText(WsFrameServer.java:119) at org.apache.tomcat.websocket.WsFrameBase.processDataText(WsFrameBase.java:495) at org.apache.tomcat.websocket.WsFrameBase.processData(WsFrameBase.java:294) at org.apache.tomcat.websocket.WsFrameBase.processInputBuffer(WsFrameBase.java:133) at org.apache.tomcat.websocket.server.WsFrameServer.onDataAvailable(WsFrameServer.java:82) at org.apache.tomcat.websocket.server.WsFrameServer.doOnDataAvailable(WsFrameServer.java:171) at org.apache.tomcat.websocket.server.WsFrameServer.notifyDataAvailable(WsFrameServer.java:151) at org.apache.tomcat.websocket.server.WsHttpUpgradeHandler.upgradeDispatch(WsHttpUpgradeHandler.java:148) at org.apache.coyote.http11.upgrade.UpgradeProcessorInternal.dispatch(UpgradeProcessorInternal.java:54) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62507] Insufficient control over keystore loading to support DKS-keystores
https://bz.apache.org/bugzilla/show_bug.cgi?id=62507 --- Comment #5 from Mark Thomas --- I've disabled in-memory keystores for DKS in trunk. If you could test again and let me know how you get on... -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62523] Concurrent stress test websocket server by jmeter, occur:java.io.IOException: java.io.IOException: Broken pipe
https://bz.apache.org/bugzilla/show_bug.cgi?id=62523
--- Comment #6 from sosojustdo ---
(In reply to Mark Thomas from comment #4)
> No stack trace from the error, no JMeter config and a test case that has a
> whole bunch of dependencies that have not been provided. This is heading
> towards being closed as INVALID.
Thanks you Mark Thomas reply!
一：Jmeter Thread Group config info:
1：thread num: 50
2：Ramp-Up Period(in seconds)：1
3：loop num：forever
4：Jmeter connection timeout 5000 seconds; response timeout:2 seconds
二：stack trace info:
20:24:06 [Thread-336] DEBUG
org.springframework.web.socket.server.support.DefaultHandshakeHandler -
Requested sub-protocol(s): [], WebSocketHandler supported sub-protocol(s): [],
configured sub-protocol(s): []
20:24:06 [Thread-304] DEBUG
org.springframework.web.socket.handler.LoggingWebSocketHandlerDecorator -
Transport error for WebSocket session id=d6c4: java.io.IOException:
java.io.IOException: Broken pipe
20:24:06 [Thread-336] DEBUG
org.springframework.web.socket.server.support.DefaultHandshakeHandler -
Selected sub-protocol: 'null'
20:24:06 [Thread-336] DEBUG
org.springframework.web.socket.server.support.DefaultHandshakeHandler -
Requested extension(s): [], supported extension(s): []
20:24:06 [Thread-304] INFO
com.cloudyoung.wx.comet.server.SystemWebSocketHandler -
{"createTime":"2018-07-05 20:24:06","inputParam":"appId:wxdc55ca89d7d4d1b8,
module:WX_WEBSOCKET_DIALOGUE_MODULE","level":"Info","message":"handleTransportError_invoke_method","methodName":"handleTransportError()->123:
","platform":"WX","serviceName":"com.cloudyoung.wx.comet.server.SystemWebSocketHandler"}
20:24:06 [Thread-336] DEBUG
org.springframework.web.socket.server.support.DefaultHandshakeHandler -
Upgrading request, sub-protocol=null, extensions=[]
20:24:06 [Thread-304] DEBUG
org.springframework.web.socket.handler.LoggingWebSocketHandlerDecorator -
Connection closed for WebSocket session id=d6c4, CloseStatus [code=1006,
reason=Broken pipe]
java.io.IOException: java.io.IOException: Broken pipe
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendMessageBlock(WsRemoteEndpointImplBase.java:315)
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendMessageBlock(WsRemoteEndpointImplBase.java:250)
at
org.apache.tomcat.websocket.WsRemoteEndpointImplBase.sendPartialString(WsRemoteEndpointImplBase.java:223)
at
org.apache.tomcat.websocket.WsRemoteEndpointBasic.sendText(WsRemoteEndpointBasic.java:49)
at
org.springframework.web.socket.adapter.standard.StandardWebSocketSession.sendTextMessage(StandardWebSocketSession.java:137)
at
org.springframework.web.socket.adapter.AbstractWebSocketSession.sendMessage(AbstractWebSocketSession.java:100)
at
com.cloudyoung.wx.comet.server.SystemWebSocketHandler.sendMessageToUser(SystemWebSocketHandler.java:233)
at
com.cloudyoung.wx.comet.service.impl.WxWebsocketMessageServiceImpl.sendDialogueMessage(WxWebsocketMessageServiceImpl.java:45)
at
com.cloudyoung.wx.comet.server.SystemWebSocketHandler.handleMessage(SystemWebSocketHandler.java:95)
at
org.springframework.web.socket.handler.WebSocketHandlerDecorator.handleMessage(WebSocketHandlerDecorator.java:59)
at
org.springframework.web.socket.handler.LoggingWebSocketHandlerDecorator.handleMessage(LoggingWebSocketHandlerDecorator.java:55)
at
org.springframework.web.socket.handler.ExceptionWebSocketHandlerDecorator.handleMessage(ExceptionWebSocketHandlerDecorator.java:69)
at
org.springframework.web.socket.adapter.standard.StandardWebSocketHandlerAdapter.handleTextMessage(StandardWebSocketHandlerAdapter.java:112)
at
org.springframework.web.socket.adapter.standard.StandardWebSocketHandlerAdapter.access$000(StandardWebSocketHandlerAdapter.java:42)
at
org.springframework.web.socket.adapter.standard.StandardWebSocketHandlerAdapter$3.onMessage(StandardWebSocketHandlerAdapter.java:82)
at
org.springframework.web.socket.adapter.standard.StandardWebSocketHandlerAdapter$3.onMessage(StandardWebSocketHandlerAdapter.java:79)
at
org.apache.tomcat.websocket.WsFrameBase.sendMessageText(WsFrameBase.java:395)
at
org.apache.tomcat.websocket.server.WsFrameServer.sendMessageText(WsFrameServer.java:119)
at
org.apache.tomcat.websocket.WsFrameBase.processDataText(WsFrameBase.java:495)
at
org.apache.tomcat.websocket.WsFrameBase.processData(WsFrameBase.java:294)
at
org.apache.tomcat.websocket.WsFrameBase.processInputBuffer(WsFrameBase.java:133)
at
org.apache.tomcat.websocket.server.WsFrameServer.onDataAvailable(WsFrameServer.java:82)
at
org.apache.tomcat.websocket.server.WsFrameServer.doOnDataAvailable(WsFrameServer.java:171)
at
org.apache.tomcat.websocket.server.WsFrameServer.notifyDataAvailable(WsFrameServer.java:151)
at
org.apache.tomcat.websocket.server.WsHttpUpgradeHandler.upgradeDispatch(WsHttpUpgradeHandler.java:148)
at
org.apache.coyote
[Bug 62507] Insufficient control over keystore loading to support DKS-keystores
https://bz.apache.org/bugzilla/show_bug.cgi?id=62507 --- Comment #6 from Andy Wilkinson --- Thanks, Mark. It looks good to me now. I've got embedded Tomcat using a JKS KeyStore that's been loaded via an entry in a DKS KeyStore. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62515] Tomcat should perform a graceful shutdown
https://bz.apache.org/bugzilla/show_bug.cgi?id=62515 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- There are a couple of points it is worth clarifying before starting a discussion on any potential changes. Currently, the point where the socket is bound and unbound is controlled by bindOnInit. By default, the socket is bound when the connector is initialised and unbound when it is destroyed. On stop, the connector is first paused. Any new connections from that point will sit in the TCP backlog. Shutdown continues with the web applications being stopped followed by the host and engine. Then the connectors are stopped. Everything is then destroyed (same order). The connections in the backlog will be dropped when the server socket is unbound. The behaviour reported in the description is consistent with the current implementation. Effectively, what is being requested is that the server socket is unbound earlier in the process. Some investigation is required to see what might be possible. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plans for AJP
Hi Rainer, chiming in late... SSL support on the connector between loadbalancer and Tomcat is something that is requested from time to time. Usually from over-conscious security types. We are using mod_jk today, because of: 1) we always used it. It works 2) it supports stickiness 3) the "jkmanager" interface 4) recently we started using JK_STICKY_IGNORE together with "mod_rewrite" to remove some balancing artifacts caused by clients remembering the session cookie When being forced to move to another connector (e.g. mod_proxy_http+mod_proxy_balancer), I would be most upset if there were no alternative to "jkmanager". We use it a lot to manage the restart of worker Tomcats. But then, given the proposed schedule, I will likely be retired before our software is moving to Tomcat-9 :-) Thanks Martin On Wed, Jun 27, 2018 at 6:50 PM, Rainer Jung wrote: > Hi there, > > BZ56402 is an AJP feature request and Remy postet > > "IMO, with each day that passes, this enhancement becomes more unrealistic > and > less useful. I think the decision must now be made to either start it > immediately (with a volunteer ) or pass on it and freeze AJP for good." > > and Chris postet: > > "It might be time to let AJP die." > > Maybe a dev list discussion about plans for AJP should happen. I heard > several people interested in getting TLS support for mod_jk. Whenever I was > thinking about it, I refrained from starting to work on it, because > > - good TLS support is a lot of work and I'm not sure how good mod_jk could > reuse mod_ssl like mod_proxy does. mod_jk uses common source code for IIS > and Apache httpd with only a thin wrapper for the individual web servers. > Therefore it is not easy to integrate the details of comunication, which > happens in the common source code part, with mod_ssl. > > - even if it would be done with lots of efforts, it would probably take > quite some time to become robust and I think there's not enough interest > and available work time to support that new and complex code for a longer > time. > > Since encryption would be most of the most useful features and IMHO we > won't get there, I suggest we discuss deprecation and EOL dates for AJP - > meaning mod_jk and AJP connectors. > > There's no need to rush, but there could be a clear statement, that no > feature improvements will be done and users should plan for moving to > mod_proxy_http (or other http/https) clients. > > I think it would be better to invest time in improving mod_proxy where it > still might lack. For instance adding custom headers to transport > communication info from the proxy to the backend like AJP does and which > could be noticed by our Tomcat http connectors and/or support for the PROXY > protocol. > > So what do people think about: > > 1) adding a statement to the mod_jk docs, that we don't plan any feature > enhancements and suggest users to migrate to mod_proxy_http and the TC HTTP > connectors (but what about IIS? I think there are reverse proxy modules > there as well?) > > 2) Adding a similar statement to the connector docs for AJP to TC 7-9. > > 3) Deprecating AJP in TC 9 and removing in TC 10 > > Regards, > > Rainer > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- -- Martin Knoblauch email: k n o b i AT knobisoft DOT de www: http://www.knobisoft.de
Re: [VOTE] Release Apache Tomcat 7.0.90
2018-07-02 20:36 GMT+03:00 Violeta Georgieva : > The proposed Apache Tomcat 7.0.90 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.90/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1190/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_90/ > > The proposed 7.0.90 release is: > [ ] Broken - do not release > [x] Stable - go ahead and release as 7.0.90 Stable Tests - OK (Java 6/7/8, 32-bit JDKs on Windows 10) Smoke testing - Ok. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
CorsFilter's Vary: Origin still a bit broken, can poison a cache to deny access
Hello. Due to external input and internal development I recently had to work with CORS and the Tomcat CorsFilter and encountered the issues https://bz.apache.org/bugzilla/show_bug.cgi?id=61101 - CorsFilter should add Vary header to response https://bz.apache.org/bugzilla/show_bug.cgi?id=62343 - CORS security: reflecting any origin header value when configured to * is dangerous It seems these issues have been fixed and we told our customer to update to the latest release (contains at least fix for 61101) to get the “Vary: Origin” header of which absence they complained about. But we were still getting complaints from the customer, and looking at the source code it seems “Vary: Origin” is only set if the request contains an origin header. I don’t believe this is sufficient. The spec states: 6.4 Implementation Considerations This section is non-normative. Resources that wish to enable themselves to be shared with multiple Origins but do not respond uniformly with "*" must in practice generate the Access-Control-Allow-Origin header dynamically in response to every request they wish to allow. As a consequence, authors of such resources should send a Vary: Origin HTTP header or provide other appropriate control directives to prevent caching of such responses, which may be inaccurate if re-used across-origins. So if the same resource is accessed without origin (CORSRequestType.NOT_CORS) or origin is local (also CORSRequestType.NOT_CORS, i.e. the origin is discarded right now and no Vary: Origin set) and later with non-local origin, a caching layer in between can still be confused. Even worse, there are user agents (Edge, older Firefox) that do html form posts w/o origin header at all and thus could be actively used to poison the cache (aside from doing worse to the servlet handling the call): https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10482384/ A confused/poisoned cache will return the local origin response to all callers thus effectively denying any non-local client access since the access control headers will be missing. This has affected people before: - https://bugs.chromium.org/p/chromium/issues/detail?id=409090 - https://stackoverflow.com/questions/44800431/caching-effect-on-cors-no-access-control-allow-origin-header-is-present-on-th I believe that for all URLs the CorsFilter matches, any unique Origin header’s value is a variant, since the returned access control headers differ. But also its absence is a variant (allowed headers are missing altogether) and thus warrants a “Vary: Origin”. I.e. always set this header unless it’s an invalid CORS request. I had to write a little filter that is configured next to the CorsFilter and checks for the missing “Vary: Origin” header to add it when being called by CorsFilter in the filter chain. That aside, setting “Vary: Origin” is of course very bad for caching. But then the CorsFilter should probably only be mapped to APIs called remotely. As improvement, since with Bug 62343 allowed.origins = ‘*’ will always set Access-Control-Allow-Origin to '*', if any origin is allowed the filter could help caching by: - always setting the access control response headers, i.e. even if not a CORS request (should not have negative effects) - not setting “Vary: Origin” This would probably greatly improve caching for public APIs that do not rely on credentials. Kind of discussed here: https://bugs.eclipse.org/bugs/show_bug.cgi?id=443530 A single allowed origin is similar, but alas Access-Control-Allow-Origin headers will differ for this origin and the local origin (set to allowed host / missing) and thus cannot be improved the same way. Sincerely, Gunnar Brand -- Gunnar Brand | Softwareentwickler interface projects GmbH | www.intergator.de Zwinglistraße 11/13 | 01277 Dresden | Deutschland Tel: +49-351-31809-41 | Fax: +49-351-31809-33 Folgen Sie intergator auf: Twitter : https://twitter.com/intergator xing: https://www.xing.com/companies/interfaceprojectsgmbh LinkedIn: http://www.linkedin.com/company/interface-projects-gmbh YouTube : http://www.youtube.com/user/TheEnterpriseSearch?feature=watch Facebook: https://www.facebook.com/intergator/ RSS : https://www.intergator.de/feed/ Geschäftsführer: Dr. Uwe Crenze, Eduard Daoud Amtsgericht Dresden HRB 8740 Haftungsausschluss / Disclaimer http://www.intergator.de/email-disclaimer.shtml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plans for AJP
Hi Martin, Am 05.07.2018 um 17:40 schrieb Martin Knoblauch: Hi Rainer, chiming in late... SSL support on the connector between loadbalancer and Tomcat is something that is requested from time to time. Usually from over-conscious security types. We are using mod_jk today, because of: 1) we always used it. It works 2) it supports stickiness 3) the "jkmanager" interface 4) recently we started using JK_STICKY_IGNORE together with "mod_rewrite" to remove some balancing artifacts caused by clients remembering the session cookie When being forced to move to another connector (e.g. mod_proxy_http+mod_proxy_balancer), I would be most upset if there were no alternative to "jkmanager". We use it a lot to manage the restart of worker Tomcats. But then, given the proposed schedule, I will likely be retired before our software is moving to Tomcat-9 :-) thanks for your feedback and past contributions to mod_jk. Maybe you find some time to look at mod_proxy_http, mod_proxy_balancer and its balancer manager GUI. Some tings are better there, some things not as good. It would be interesting to get feedback over time, what is missing most in the mod_proxy world. We might be able to help getting things improved there. Thanks and regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62515] Tomcat should perform a graceful shutdown
https://bz.apache.org/bugzilla/show_bug.cgi?id=62515 --- Comment #2 from Mark Thomas --- Created attachment 36012 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36012&action=edit First attempt at a patch The attached patch attempts to address this problem by closing the server socket at the start of the service stop() sequence if bindOnInit is set to false. Local testing has been positive. Feedback welcome. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62523] Concurrent stress test websocket server by jmeter, occur:java.io.IOException: java.io.IOException: Broken pipe
https://bz.apache.org/bugzilla/show_bug.cgi?id=62523 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #7 from Mark Thomas --- The exception is tellign you that the client dropped the connection. You need to investigate the JMeter end of this test. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835193 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Jul 5 21:28:17 2018 New Revision: 1835193 URL: http://svn.apache.org/viewvc?rev=1835193&view=rev Log: Latest fix confirmed to be working correctly. Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1835193&r1=1835192&r2=1835193&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 5 21:28:17 2018 @@ -79,6 +79,10 @@ the NIO connector. Based on a patch submitted by Thomas Meyer with testing and suggestions by Coty Sutherland. (remm) + +62507: Ensure that JSSE based TLS connectors work correctly +with a DKS keystore. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835194 - /tomcat/trunk/webapps/docs/config/http.xml
Author: markt Date: Thu Jul 5 21:33:41 2018 New Revision: 1835194 URL: http://svn.apache.org/viewvc?rev=1835194&view=rev Log: DKS docs Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1835194&r1=1835193&r2=1835194&view=diff == --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Thu Jul 5 21:33:41 2018 @@ -1468,8 +1468,10 @@ that is running Tomcat. If your keystoreType doesn't need a file use "" (empty string) or NONE for this parameter. Relative paths will be resolved against - $CATALINA_BASE. A URL may also be used for this attribute. - + $CATALINA_BASE. A URI may also be used for this attribute. + When using a domain keystore (keystoreType of + DKS), this parameter should be the URI to the domain + keystore. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62515] Tomcat should perform a graceful shutdown
https://bz.apache.org/bugzilla/show_bug.cgi?id=62515 --- Comment #3 from Remy Maucherat --- +1 Maybe you can avoid the bindoninit get property hack by having AbstractEndpoint.closeServerSocket call an abstract doCloseServerSocket method only if bindoninit is false. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1835197 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/compat/ java/org/apache/tomcat/util/file/ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ webapps
Author: markt Date: Thu Jul 5 22:00:11 2018 New Revision: 1835197 URL: http://svn.apache.org/viewvc?rev=1835197&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62507 Add support for DKS keystores when running on Java 8 or later. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 5 22:00:11 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,176
[Bug 62507] Insufficient control over keystore loading to support DKS-keystores
https://bz.apache.org/bugzilla/show_bug.cgi?id=62507 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #7 from Mark Thomas --- Thanks for the testing. I've back-ported it to 8.5.x as well although I had to use reflection as DKS requires Java 8 (and 8.5.x is Java 7 or later). Fixed in: - trunk for 9.0.11 onwards - 8.5.x for 8.5.33 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62515] Tomcat should perform a graceful shutdown
https://bz.apache.org/bugzilla/show_bug.cgi?id=62515 --- Comment #4 from Mark Thomas --- Good idea. I'll take a look at that and see what can be done. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.90
На пн, 2.07.2018 г. в 20:36 ч. Violeta Georgieva написа: > > The proposed Apache Tomcat 7.0.90 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.90/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1190/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_90/ > > The proposed 7.0.90 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 7.0.90 Stable +1 Regards, Violeta
Re: [RESULT][VOTE] Release Apache Tomcat 7.0.90
Hi, На пн, 2.07.2018 г. в 20:36 ч. Violeta Georgieva написа: > > The proposed Apache Tomcat 7.0.90 release is now available for voting. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.90/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1190/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_90/ > > The proposed 7.0.90 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 7.0.90 Stable +1 (binding):huxing, markt, remm, kkolinko, violetagg No other voters were cast. The vote has passed. I'll do the release shortly and announce it once the mirrors catch up. Regards, Violeta
svn commit: r1835204 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Fri Jul 6 05:53:37 2018 New Revision: 1835204 URL: http://svn.apache.org/viewvc?rev=1835204&view=rev Log: Update the release date for 7.0.90 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1835204&r1=1835203&r2=1835204&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Jul 6 05:53:37 2018 @@ -75,7 +75,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r27936 - /dev/tomcat/tomcat-7/v7.0.90/ /release/tomcat/tomcat-7/v7.0.90/
Author: violetagg Date: Fri Jul 6 05:58:30 2018 New Revision: 27936 Log: Release Tomcat 7.0.90 Added: release/tomcat/tomcat-7/v7.0.90/ - copied from r27935, dev/tomcat/tomcat-7/v7.0.90/ Removed: dev/tomcat/tomcat-7/v7.0.90/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r27937 - /release/tomcat/tomcat-8/v8.0.52/
Author: violetagg Date: Fri Jul 6 05:59:47 2018 New Revision: 27937 Log: Remove 8.0.52 Removed: release/tomcat/tomcat-8/v8.0.52/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
