1 --- apache-tomcat-6.0.37-src/bin/catalina.sh Wed Jun 12 02:20:24 2013 |
1 Patch origin: in-house |
2 +++ apache-tomcat-6.0.37-src/bin/catalina.sh Wed Jun 12 02:20:24 2013 |
2 Patch status: Solaris-specific; not suitable for upstream |
3 @@ -287,6 +287,7 @@ |
3 |
|
4 Starts Tomcat in desired mode. See: |
|
5 https://tomcat.apache.org/tomcat-6.0-doc/config/systemprops.html |
|
6 |
|
7 --- bin/catalina.sh |
|
8 +++ bin/catalina.sh |
|
9 @@ -285,6 +285,7 @@ |
4 -Dcatalina.base="$CATALINA_BASE" \ |
10 -Dcatalina.base="$CATALINA_BASE" \ |
5 -Dcatalina.home="$CATALINA_HOME" \ |
11 -Dcatalina.home="$CATALINA_HOME" \ |
6 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
12 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
7 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
13 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
8 org.apache.catalina.startup.Bootstrap "$@" start |
14 org.apache.catalina.startup.Bootstrap "$@" start |
9 else |
15 else |
10 exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ |
16 exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ |
11 @@ -295,6 +296,7 @@ |
17 @@ -293,6 +294,7 @@ |
12 -Dcatalina.base="$CATALINA_BASE" \ |
18 -Dcatalina.base="$CATALINA_BASE" \ |
13 -Dcatalina.home="$CATALINA_HOME" \ |
19 -Dcatalina.home="$CATALINA_HOME" \ |
14 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
20 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
15 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
21 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
16 org.apache.catalina.startup.Bootstrap "$@" start |
22 org.apache.catalina.startup.Bootstrap "$@" start |
17 fi |
23 fi |
18 fi |
24 fi |
19 @@ -314,6 +316,7 @@ |
25 @@ -312,6 +314,7 @@ |
20 -Dcatalina.base="$CATALINA_BASE" \ |
26 -Dcatalina.base="$CATALINA_BASE" \ |
21 -Dcatalina.home="$CATALINA_HOME" \ |
27 -Dcatalina.home="$CATALINA_HOME" \ |
22 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
28 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
23 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
29 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
24 org.apache.catalina.startup.Bootstrap "$@" start |
30 org.apache.catalina.startup.Bootstrap "$@" start |
25 else |
31 else |
26 exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ |
32 exec "$_RUNJAVA" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ |
27 @@ -321,6 +324,7 @@ |
33 @@ -319,6 +322,7 @@ |
28 -Dcatalina.base="$CATALINA_BASE" \ |
34 -Dcatalina.base="$CATALINA_BASE" \ |
29 -Dcatalina.home="$CATALINA_HOME" \ |
35 -Dcatalina.home="$CATALINA_HOME" \ |
30 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
36 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
31 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
37 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
32 org.apache.catalina.startup.Bootstrap "$@" start |
38 org.apache.catalina.startup.Bootstrap "$@" start |
33 fi |
39 fi |
34 |
40 |
35 @@ -378,6 +382,7 @@ |
41 @@ -376,6 +380,7 @@ |
36 -Dcatalina.base="$CATALINA_BASE" \ |
42 -Dcatalina.base="$CATALINA_BASE" \ |
37 -Dcatalina.home="$CATALINA_HOME" \ |
43 -Dcatalina.home="$CATALINA_HOME" \ |
38 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
44 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
39 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
45 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
40 org.apache.catalina.startup.Bootstrap "$@" start \ |
46 org.apache.catalina.startup.Bootstrap "$@" start \ |
41 >> "$CATALINA_OUT" 2>&1 & |
47 >> "$CATALINA_OUT" 2>&1 & |
42 |
48 |
43 @@ -387,6 +392,7 @@ |
49 @@ -385,6 +390,7 @@ |
44 -Dcatalina.base="$CATALINA_BASE" \ |
50 -Dcatalina.base="$CATALINA_BASE" \ |
45 -Dcatalina.home="$CATALINA_HOME" \ |
51 -Dcatalina.home="$CATALINA_HOME" \ |
46 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
52 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
47 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
53 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
48 org.apache.catalina.startup.Bootstrap "$@" start \ |
54 org.apache.catalina.startup.Bootstrap "$@" start \ |
49 >> "$CATALINA_OUT" 2>&1 & |
55 >> "$CATALINA_OUT" 2>&1 & |
50 |
56 |
51 @@ -437,6 +443,7 @@ |
57 @@ -435,6 +441,7 @@ |
52 -Dcatalina.base="$CATALINA_BASE" \ |
58 -Dcatalina.base="$CATALINA_BASE" \ |
53 -Dcatalina.home="$CATALINA_HOME" \ |
59 -Dcatalina.home="$CATALINA_HOME" \ |
54 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
60 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
55 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
61 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
56 org.apache.catalina.startup.Bootstrap "$@" stop |
62 org.apache.catalina.startup.Bootstrap "$@" stop |