|
1 --- apache-tomcat-6.0.20-src/bin/catalina.sh.orig 2009-03-30 14:34:02.000000000 -0700 |
|
2 +++ apache-tomcat-6.0.20-src/bin/catalina.sh 2009-03-30 14:40:38.000000000 -0700 |
|
3 @@ -233,6 +233,7 @@ |
|
4 -Dcatalina.base="$CATALINA_BASE" \ |
|
5 -Dcatalina.home="$CATALINA_HOME" \ |
|
6 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
7 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
8 org.apache.catalina.startup.Bootstrap "$@" start |
|
9 else |
|
10 exec "$_RUNJDB" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \ |
|
11 @@ -241,6 +242,7 @@ |
|
12 -Dcatalina.base="$CATALINA_BASE" \ |
|
13 -Dcatalina.home="$CATALINA_HOME" \ |
|
14 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
15 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
16 org.apache.catalina.startup.Bootstrap "$@" start |
|
17 fi |
|
18 fi |
|
19 @@ -258,6 +260,7 @@ |
|
20 -Dcatalina.base="$CATALINA_BASE" \ |
|
21 -Dcatalina.home="$CATALINA_HOME" \ |
|
22 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
23 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
24 org.apache.catalina.startup.Bootstrap "$@" start |
|
25 else |
|
26 exec "$_RUNJAVA" $JAVA_OPTS "$LOGGING_CONFIG" $CATALINA_OPTS \ |
|
27 @@ -265,6 +268,7 @@ |
|
28 -Dcatalina.base="$CATALINA_BASE" \ |
|
29 -Dcatalina.home="$CATALINA_HOME" \ |
|
30 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
31 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
32 org.apache.catalina.startup.Bootstrap "$@" start |
|
33 fi |
|
34 |
|
35 @@ -282,6 +286,7 @@ |
|
36 -Dcatalina.base="$CATALINA_BASE" \ |
|
37 -Dcatalina.home="$CATALINA_HOME" \ |
|
38 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
39 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
40 org.apache.catalina.startup.Bootstrap "$@" start \ |
|
41 >> "$CATALINA_BASE"/logs/catalina.out 2>&1 & |
|
42 |
|
43 @@ -294,6 +299,7 @@ |
|
44 -Dcatalina.base="$CATALINA_BASE" \ |
|
45 -Dcatalina.home="$CATALINA_HOME" \ |
|
46 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
47 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
48 org.apache.catalina.startup.Bootstrap "$@" start \ |
|
49 >> "$CATALINA_BASE"/logs/catalina.out 2>&1 & |
|
50 |
|
51 @@ -316,6 +322,7 @@ |
|
52 -Dcatalina.base="$CATALINA_BASE" \ |
|
53 -Dcatalina.home="$CATALINA_HOME" \ |
|
54 -Djava.io.tmpdir="$CATALINA_TMPDIR" \ |
|
55 + -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true \ |
|
56 org.apache.catalina.startup.Bootstrap "$@" stop |
|
57 |
|
58 if [ $FORCE -eq 1 ]; then |