Attachment #24869 for bug #48543

View | Details | Raw Unified | Return to bug 48543
Collapse All | Expand All




 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     * Return specified property value.
     */
    public static String getProperty(String name) {

        return properties.getProperty(name);

    }

            try {
                File home = new File(getCatalinaBase());
                File conf = new File(home, "conf");
                String configFilename = getConfigFilename();
                File properties = new File(conf, configFilename);
                is = new FileInputStream(properties);
            } catch (Throwable t) {
                // Ignore

        return System.getProperty("catalina.home",
                                  System.getProperty("user.dir"));
    }


    /**
     * Get the value of the catalina.base environment variable.
     */

        return System.getProperty("catalina.config");
    }

    /**
     * Get the value of the configuration filename.
     */
    private static String getConfigFilename() {
        return System.getProperty("catalina.config.filename", "catalina.properties");
    }
}




      </li>
      <li>every request that is associated with a session will cause the
      session's last accessed time to be updated regardless of whether or not
      the request explicitly accesses the session. (SRV.7.6)
      </li>
      <li>
        cookies will be parsed strictly, by default v0 cookies will not work with any invalid characters.
        <br/>If set to false, any v0 cookie with invalid character will be switched to a v1 cookie and
        the value will be quoted.
      </li>
      <li>

      one active request will always be considered valid. If not specified, the
      default value of <code>false</code> will be used.</p>
    </property>

    <property
    name="org.apache.tomcat.util.http. ServerCookie.ALLOW_EQUALS_IN_VALUE">
      <p>If this is <code>true</code> Tomcat will allow <code>=</code>

      <p>An alternative name for the single sign on session cookie. Defaults to
      <code>JSESSIONIDSSO</code>.</p>
    </property>

  </properties>

</section>

      <p>The URL for the catalina.properties configuration file.</p>
    </property>

    <property name="catalina.config.filename">
      <p>Overrides the default name of "catalina.properties" with the name
      specified here.</p>
    </property>

    <property name="tomcat.util.buf.StringCache.byte.enabled">
      <p>If <code>true</code>, the String cache is enabled for
      <code>ByteChunk</code>. If not specified, the default value of

Return to bug 48543

Lines 5-13 Link Here

(-)java/org/apache/catalina/startup/CatalinaProperties.java (-7 / +13 lines)
5	* The ASF licenses this file to You under the Apache License, Version 2.0	5	* The ASF licenses this file to You under the Apache License, Version 2.0
6	* (the "License"); you may not use this file except in compliance with	6	* (the "License"); you may not use this file except in compliance with
7	* the License. You may obtain a copy of the License at	7	* the License. You may obtain a copy of the License at
8	*	8	*
9	* http://www.apache.org/licenses/LICENSE-2.0	9	* http://www.apache.org/licenses/LICENSE-2.0
10	*	10	*
11	* Unless required by applicable law or agreed to in writing, software	11	* Unless required by applicable law or agreed to in writing, software
12	* distributed under the License is distributed on an "AS IS" BASIS,	12	* distributed under the License is distributed on an "AS IS" BASIS,
13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Lines 58-64 Link Here
58	* Return specified property value.	58	* Return specified property value.
59	*/	59	*/
60	public static String getProperty(String name) {	60	public static String getProperty(String name) {
61		61
62	return properties.getProperty(name);	62	return properties.getProperty(name);
63		63
64	}	64	}
Lines 98-104 Link Here
98	try {	98	try {
99	File home = new File(getCatalinaBase());	99	File home = new File(getCatalinaBase());
100	File conf = new File(home, "conf");	100	File conf = new File(home, "conf");
101	File properties = new File(conf, "catalina.properties");	101	String configFilename = getConfigFilename();
		102	File properties = new File(conf, configFilename);
102	is = new FileInputStream(properties);	103	is = new FileInputStream(properties);
103	} catch (Throwable t) {	104	} catch (Throwable t) {
104	// Ignore	105	// Ignore
Lines 151-158 Link Here
151	return System.getProperty("catalina.home",	152	return System.getProperty("catalina.home",
152	System.getProperty("user.dir"));	153	System.getProperty("user.dir"));
153	}	154	}
154		155
155		156
156	/**	157	/**
157	* Get the value of the catalina.base environment variable.	158	* Get the value of the catalina.base environment variable.
158	*/	159	*/
Lines 168-172 Link Here
168	return System.getProperty("catalina.config");	169	return System.getProperty("catalina.config");
169	}	170	}
170		171
171		172	/**
		173	* Get the value of the configuration filename.
		174	*/
		175	private static String getConfigFilename() {
		176	return System.getProperty("catalina.config.filename", "catalina.properties");
		177	}
172	}	178	}

Lines 222-232 Link Here

(-)webapps/docs/config/systemprops.xml (-4 / +9 lines)
222	</li>	222	</li>
223	<li>every request that is associated with a session will cause the	223	<li>every request that is associated with a session will cause the
224	session's last accessed time to be updated regardless of whether or not	224	session's last accessed time to be updated regardless of whether or not
225	the request explicitly accesses the session. (SRV.7.6)	225	the request explicitly accesses the session. (SRV.7.6)
226	</li>	226	</li>
227	<li>	227	<li>
228	cookies will be parsed strictly, by default v0 cookies will not work with any invalid characters.	228	cookies will be parsed strictly, by default v0 cookies will not work with any invalid characters.
229	<br/>If set to false, any v0 cookie with invalid character will be switched to a v1 cookie and	229	<br/>If set to false, any v0 cookie with invalid character will be switched to a v1 cookie and
230	the value will be quoted.	230	the value will be quoted.
231	</li>	231	</li>
232	<li>	232	<li>
Lines 246-252 Link Here
246	one active request will always be considered valid. If not specified, the	246	one active request will always be considered valid. If not specified, the
247	default value of <code>false</code> will be used.</p>	247	default value of <code>false</code> will be used.</p>
248	</property>	248	</property>
249		249
250	<property	250	<property
251	name="org.apache.tomcat.util.http. ServerCookie.ALLOW_EQUALS_IN_VALUE">	251	name="org.apache.tomcat.util.http. ServerCookie.ALLOW_EQUALS_IN_VALUE">
252	<p>If this is <code>true</code> Tomcat will allow <code>=</code>	252	<p>If this is <code>true</code> Tomcat will allow <code>=</code>
Lines 293-299 Link Here
293	<p>An alternative name for the single sign on session cookie. Defaults to	293	<p>An alternative name for the single sign on session cookie. Defaults to
294	<code>JSESSIONIDSSO</code>.</p>	294	<code>JSESSIONIDSSO</code>.</p>
295	</property>	295	</property>
296		296
297	</properties>	297	</properties>
298		298
299	</section>	299	</section>
Lines 333-338 Link Here
333	<p>The URL for the catalina.properties configuration file.</p>	333	<p>The URL for the catalina.properties configuration file.</p>
334	</property>	334	</property>
335		335
		336	<property name="catalina.config.filename">
		337	<p>Overrides the default name of "catalina.properties" with the name
		338	specified here.</p>
		339	</property>
		340
336	<property name="tomcat.util.buf.StringCache.byte.enabled">	341	<property name="tomcat.util.buf.StringCache.byte.enabled">
337	<p>If <code>true</code>, the String cache is enabled for	342	<p>If <code>true</code>, the String cache is enabled for
338	<code>ByteChunk</code>. If not specified, the default value of	343	<code>ByteChunk</code>. If not specified, the default value of