Mercurial Mercurial > upstream > oracle > userland-gate / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/tomcat/patches/tomcat_strict_servlet.patch
author Petr Nyc <Petr.Nyc@Oracle.COM>
Thu, 30 Jul 2015 00:50:41 -0700
branchs11u2-sru12-backport
changeset 4716 848b9fd94ea8
parent 4146 097063f324c0
child 5535 ae5bc52953a4
permissions -rw-r--r--
Added tag S11.2SRU12.7, 0.175.2.12.0.7.0 for changeset f4f8ecbc1995

Patch origin: in-house
Patch status: Solaris-specific; not suitable for upstream

Starts Tomcat in desired mode. See:
https://tomcat.apache.org/tomcat-6.0-doc/config/systemprops.html

--- bin/catalina.sh
+++ bin/catalina.sh
@@ -285,6 +285,7 @@
         -Dcatalina.base="$CATALINA_BASE" \
         -Dcatalina.home="$CATALINA_HOME" \
         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+        -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
         org.apache.catalina.startup.Bootstrap "$@" start
     else
       exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
@@ -293,6 +294,7 @@
         -Dcatalina.base="$CATALINA_BASE" \
         -Dcatalina.home="$CATALINA_HOME" \
         -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+        -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
         org.apache.catalina.startup.Bootstrap "$@" start
     fi
   fi
@@ -312,6 +314,7 @@
       -Dcatalina.base="$CATALINA_BASE" \
       -Dcatalina.home="$CATALINA_HOME" \
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
       org.apache.catalina.startup.Bootstrap "$@" start
   else
     exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
@@ -319,6 +322,7 @@
       -Dcatalina.base="$CATALINA_BASE" \
       -Dcatalina.home="$CATALINA_HOME" \
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
       org.apache.catalina.startup.Bootstrap "$@" start
   fi
 
@@ -376,6 +380,7 @@
       -Dcatalina.base="$CATALINA_BASE" \
       -Dcatalina.home="$CATALINA_HOME" \
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
       org.apache.catalina.startup.Bootstrap "$@" start \
       >> "$CATALINA_OUT" 2>&1 &
 
@@ -385,6 +390,7 @@
       -Dcatalina.base="$CATALINA_BASE" \
       -Dcatalina.home="$CATALINA_HOME" \
       -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+      -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
       org.apache.catalina.startup.Bootstrap "$@" start \
       >> "$CATALINA_OUT" 2>&1 &
 
@@ -435,6 +441,7 @@
     -Dcatalina.base="$CATALINA_BASE" \
     -Dcatalina.home="$CATALINA_HOME" \
     -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+    -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \
     org.apache.catalina.startup.Bootstrap "$@" stop
 
   if [ ! -z "$CATALINA_PID" ]; then
upstream/oracle/userland-gate