Re: [VOTE] Release Apache Tomcat 7.0.56

2014-10-02 Thread Mladen Turk 

On 09/28/2014 02:34 PM, Violeta Georgieva wrote:

The proposed 7.0.56 release is:
[ ] Broken - do not release
[x] Stable - go ahead and release as 7.0.56 Stable



Tested on Windows and Linux


Regards
--
^TM

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1628896 - in /tomcat/trunk: java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java

2014-10-02 Thread markt 
Author: markt
Date: Thu Oct  2 07:13:10 2014
New Revision: 1628896

URL: http://svn.apache.org/r1628896
Log:
Add Max-Age support to the RFC 6265 cookie processor

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java

tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java?rev=1628896&r1=1628895&r2=1628896&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java 
Thu Oct  2 07:13:10 2014
@@ -87,7 +87,15 @@ public class Rfc6265CookieProcessor impl
 header.append(value);
 }
 
-// TODO add support for the attributes.
+// RFC 6265 prefers Max-Age to Expires so use Max-Age
+int maxAge = cookie.getMaxAge();
+if (maxAge > -1) {
+// Negative Max-Age is equivalent to no Max-Age
+header.append(";Max-Age=");
+header.append(maxAge);
+}
+
+// TODO add support for the remaining attributes.
 return header.toString();
 }
 

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java?rev=1628896&r1=1628895&r2=1628896&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
 Thu Oct  2 07:13:10 2014
@@ -167,7 +167,6 @@ public class TestCookieProcessorGenerati
 doTestAllowSeparators(cookie, "foo=a\\b; Version=1", null);
 }
 
-
 @Test
 public void v1ValueContainsBackslashAndQuote() {
 Cookie cookie = new Cookie("foo", "a\"b\\c");
@@ -176,6 +175,22 @@ public class TestCookieProcessorGenerati
 doTestAllowSeparators(cookie, "foo=a\"b\\c; Version=1", null);
 }
 
+@Test
+public void v1TestMaxAgePositive() {
+doV1TestMaxAge(100, "foo=bar; Version=1; Max-Age=100", 
"foo=bar;Max-Age=100");
+}
+
+@Test
+public void v1TestMaxAgeZero() {
+doV1TestMaxAge(0, "foo=bar; Version=1; Max-Age=0", 
"foo=bar;Max-Age=0");
+}
+
+@Test
+public void v1TestMaxAgeNegative() {
+doV1TestMaxAge(-100, "foo=bar; Version=1", "foo=bar");
+}
+
+
 private void doTest(Cookie cookie, String expected) {
 doTest(cookie, expected, expected);
 }
@@ -222,4 +237,14 @@ public class TestCookieProcessorGenerati
 Assert.assertEquals(expectedRfc6265, 
rfc6265.generateHeader(cookie));
 }
 }
+
+
+private void doV1TestMaxAge(int age, String expectedLegacy, String 
expectedRfc6265) {
+LegacyCookieProcessor legacy = new LegacyCookieProcessor();
+legacy.setAlwaysAddExpires(false);
+Cookie cookie = new Cookie("foo", "bar");
+cookie.setVersion(1);
+cookie.setMaxAge(age);
+doTest(cookie, legacy, expectedLegacy, new Rfc6265CookieProcessor(), 
expectedRfc6265);
+}
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57020] Error while compiling JSPs: "The method getDispatcherType() is undefined for the type HttpServletRequest"

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57020

--- Comment #4 from Pavel Cibulka  ---
I have same problem with package:


javax.servlet.jsp.jstl
jstl-api
1.2-rev-1


javax.servlet
servlet-api


javax.servlet.jsp
jsp-api




I have changed version to 1.2 and it is working fine now.

-- 
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: r1628900 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default

2014-10-02 Thread violetagg 
Author: violetagg
Date: Thu Oct  2 07:37:06 2014
New Revision: 1628900

URL: http://svn.apache.org/r1628900
Log:
Prep for next version

Modified:
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1628900&r1=1628899&r2=1628900&view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Thu Oct  2 07:37:06 2014
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=56
+version.build=57
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1628900&r1=1628899&r2=1628900&view=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Thu Oct  2 07:37:06 
2014
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=7.0.56
+maven.asf.release.deploy.version=7.0.57
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1628936 - in /tomcat/trunk: java/org/apache/tomcat/util/http/LocalStrings.properties java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java test/org/apache/tomcat/util/http/TestCook

2014-10-02 Thread markt 
Author: markt
Date: Thu Oct  2 11:15:04 2014
New Revision: 1628936

URL: http://svn.apache.org/r1628936
Log:
Add support for the remaining attributes to the RFC 6265 cookie generation

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java

tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties?rev=1628936&r1=1628935&r2=1628936&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LocalStrings.properties Thu 
Oct  2 11:15:04 2014
@@ -30,3 +30,7 @@ cookies.invalidSpecial=Cookies: Unknown 
 cookies.fallToDebug=\n Note: further occurrences of Cookie errors will be 
logged at DEBUG level.
 
 headers.maxCountFail=More than the maximum allowed number of headers ([{0}]) 
were detected.
+
+rfc6265CookieProcessor.invalidCharInValue=An invalid character [{0}] was 
present in the Cookie value
+rfc6265CookieProcessor.invalidDomain=An invalid domain [{0}] was specified for 
this cookie
+rfc6265CookieProcessor.invalidPath=An invalid path [{0}] was specified for 
this cookie
\ No newline at end of file

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java?rev=1628936&r1=1628935&r2=1628936&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java 
Thu Oct  2 11:15:04 2014
@@ -18,17 +18,39 @@ package org.apache.tomcat.util.http;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.util.BitSet;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.buf.ByteChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.parser.Cookie;
+import org.apache.tomcat.util.res.StringManager;
 
 public class Rfc6265CookieProcessor implements CookieProcessor {
 
 private static final Log log = 
LogFactory.getLog(Rfc6265CookieProcessor.class);
 
+private static final StringManager sm =
+
StringManager.getManager(Rfc6265CookieProcessor.class.getPackage().getName());
+
+private static final BitSet domainValid = new BitSet(128);
+
+static {
+for (char c = '0'; c < '9'; c++) {
+domainValid.set(c);
+}
+for (char c = 'a'; c < 'z'; c++) {
+domainValid.set(c);
+}
+for (char c = 'A'; c < 'Z'; c++) {
+domainValid.set(c);
+}
+domainValid.set('.');
+domainValid.set('-');
+}
+
+
 @Override
 public Charset getCharset() {
 return StandardCharsets.UTF_8;
@@ -82,7 +104,7 @@ public class Rfc6265CookieProcessor impl
 header.append(cookie.getName());
 header.append('=');
 String value = cookie.getValue();
-if (value != null) {
+if (value != null && value.length() > 0) {
 validateCookieValue(value);
 header.append(value);
 }
@@ -95,16 +117,33 @@ public class Rfc6265CookieProcessor impl
 header.append(maxAge);
 }
 
-// TODO add support for the remaining attributes.
+String domain = cookie.getDomain();
+if (domain != null && domain.length() > 0) {
+validateDomain(domain);
+header.append(";domain=");
+header.append(domain);
+}
+
+String path = cookie.getPath();
+if (path != null && path.length() > 0) {
+validatePath(path);
+header.append(";path=");
+header.append(path);
+}
+
+if (cookie.getSecure()) {
+header.append(";Secure");
+}
+
+if (cookie.isHttpOnly()) {
+header.append(";HttpOnly");
+}
+
 return header.toString();
 }
 
 
 private void validateCookieValue(String value) {
-if (value == null || value.length() == 0) {
-return;
-}
-
 int start = 0;
 int end = value.length();
 
@@ -117,8 +156,53 @@ public class Rfc6265CookieProcessor impl
 for (int i = start; i < end; i++) {
 char c = chars[i];
 if (c < 0x21 || c == 0x22 || c == 0x2c || c == 0x3b || c == 0x5c 
|| c == 0x7f) {
-// TODO i18n
-throw new IllegalArgumentException();
+throw new IllegalArgumentException(s

svn commit: r1628942 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java

2014-10-02 Thread markt 
Author: markt
Date: Thu Oct  2 11:25:27 2014
New Revision: 1628942

URL: http://svn.apache.org/r1628942
Log:
Add a test to confirm UTF-8 cookie values are supported by the RFC 6265 cookie 
processor

Modified:

tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java?rev=1628942&r1=1628941&r2=1628942&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieProcessorGeneration.java
 Thu Oct  2 11:25:27 2014
@@ -176,6 +176,14 @@ public class TestCookieProcessorGenerati
 }
 
 @Test
+public void v1ValueUTF8() {
+String value = "\u2300";
+Cookie cookie = new Cookie("foo", value);
+cookie.setVersion(1);
+doTest(cookie, (String) null, "foo=" + value);
+}
+
+@Test
 public void v1TestMaxAgePositive() {
 doV1TestMaxAge(100, "foo=bar; Version=1; Max-Age=100", 
"foo=bar;Max-Age=100");
 }
@@ -282,17 +290,22 @@ public class TestCookieProcessorGenerati
 private void doTest(Cookie cookie,
 CookieProcessor legacy, String expectedLegacy,
 CookieProcessor rfc6265, String expectedRfc6265) {
-Assert.assertEquals(expectedLegacy, legacy.generateHeader(cookie));
-if (expectedRfc6265 == null) {
+doTest(cookie, legacy, expectedLegacy);
+doTest(cookie, rfc6265, expectedRfc6265);
+}
+
+
+private void doTest(Cookie cookie, CookieProcessor cookieProcessor, String 
expected) {
+if (expected == null) {
 IllegalArgumentException e = null;
 try {
-rfc6265.generateHeader(cookie);
+cookieProcessor.generateHeader(cookie);
 } catch (IllegalArgumentException iae) {
 e = iae;
 }
 Assert.assertNotNull("Failed to throw IAE", e);
 } else {
-Assert.assertEquals(expectedRfc6265, 
rfc6265.generateHeader(cookie));
+Assert.assertEquals(expected, 
cookieProcessor.generateHeader(cookie));
 }
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1628947 - /tomcat/trunk/webapps/docs/changelog.xml

2014-10-02 Thread markt 
Author: markt
Date: Thu Oct  2 11:32:11 2014
New Revision: 1628947

URL: http://svn.apache.org/r1628947
Log:
Update changelog

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=1628947&r1=1628946&r2=1628947&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 11:32:11 2014
@@ -61,6 +61,10 @@
 times such as when using StoreConfig. (markt)
   
   
+56403: Add pluggable password derivation support to the
+Realms via the new CredentialHandler interface. (markt)
+  
+  
 57016: When using the PersistentValve do not
 remove sessions from the store when persisting them. (markt)
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 56403] Support pluggable password-derivation in Realms

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56403

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #13 from Mark Thomas  ---
The proposed patch went through a number of review cycles on the dev list and
was applied to 8.0.x for 8.0.15 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 56393] Implement RFC6265 for Cookie parsing

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56393

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
This has been implemented in 8.0.x for 8.0.15 onwards.

Cookie processing is now pluggable so users with unusual / non-specification
compliant requirements are able to insert their own cookie processor if
required.

-- 
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 55951] HTML5 specifies UTF-8 encoding for cookie values

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=55951

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
This will be available in 8.0.15 onwards via the Rfc6265CookieProcessor.

-- 
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: r1628961 - in /tomcat/maven-plugin/branches/tc8.x: tomcat8-maven-plugin/ tomcat8-war-runner/

2014-10-02 Thread kkolinko 
Author: kkolinko
Date: Thu Oct  2 12:43:30 2014
New Revision: 1628961

URL: http://svn.apache.org/r1628961
Log:
Configure svn:ignore

Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/   (props changed)
tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/   (props changed)

Propchange: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct  2 12:43:30 2014
@@ -0,0 +1,2 @@
+target
+*.iml

Propchange: tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/
--
--- svn:ignore (added)
+++ svn:ignore Thu Oct  2 12:43:30 2014
@@ -0,0 +1,2 @@
+target
+*.iml



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1628962 - /tomcat/maven-plugin/trunk/pom.xml

2014-10-02 Thread kkolinko 
Author: kkolinko
Date: Thu Oct  2 12:47:04 2014
New Revision: 1628962

URL: http://svn.apache.org/r1628962
Log:
Tomcat 7.0.55

Modified:
tomcat/maven-plugin/trunk/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1628962&r1=1628961&r2=1628962&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Thu Oct  2 12:47:04 2014
@@ -73,7 +73,7 @@
 2001
 
 2008
-7.0.54
+7.0.55
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 55951] HTML5 specifies UTF-8 encoding for cookie values

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=55951

Mark Thomas  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

--- Comment #2 from Mark Thomas  ---
Re-opening as the unit test didn't cover the end to end process are there are
still some issues to resolve.

-- 
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: svn commit: r1628603 - in /tomcat/maven-plugin/branches/tc8.x: ./ common-tomcat-maven-plugin/ tomcat-maven-archetype/ tomcat-maven-plugin-it/ tomcat6-maven-plugin/ tomcat7-maven-plugin/ tomcat7-wa

2014-10-02 Thread Konstantin Kolinko 
2014-10-02 4:55 GMT+04:00 Olivier Lamy :
> oh my bad it was just for testing purpose as I have some issues with
> the jsp classloader with the tomcat8 integration. (I will revert that)
> As I have limited time currently, I will appreciate any help :-)
>
> The problem is:
>
(...)
>
> To reproduce:
>
> git clone https://github.com/apache/tomcat-maven-plugin.git
> cd tomcat-maven-plugin
> git checkout tc8.x
> (or get the branch from svn)
>
> mvn clean install -pl :tomcat8-maven-plugin -am -Prun-its
>
> less tomcat8-maven-plugin/target/test-classes/tomcat-run-multi-config/foo.log


It fails to me on some earlier step,

[INFO] --- maven-invoker-plugin:1.8:run (integration-tests-invoker) @
tomcat8-maven-plugin ---
[INFO] Building: simple-war-exec-project\pom.xml
[INFO] run script verify.bsh
[INFO] ..FAILED (44.9 s)
[INFO]   The post-build script returned false.
[INFO] -
[INFO] Build Summary:
[INFO]   Passed: 0, Failed: 1, Errors: 0, Skipped: 0
[INFO] -
[ERROR] The following builds failed:
[ERROR] *  simple-war-exec-project\pom.xml
[INFO] -

In tomcat8-maven-plugin\target\it\simple-war-exec-project\build.log
I see the the following three lines at the end of the file:

[[[
Running post-build script:
<...>\tomcat8-maven-plugin\target\it\simple-war-exec-project\verify.bsh

conf/Catalina/localhost/manager.xml is missing.

Finished post-build script:
<...>\tomcat8-maven-plugin\target\it\simple-war-exec-project\verify.bsh
]]]

So the "verify.bsh" script complained that manager.xml file is missing
and returned false, causing the overall build to fail.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1628978 - /tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java

2014-10-02 Thread markt 
Author: markt
Date: Thu Oct  2 13:57:44 2014
New Revision: 1628978

URL: http://svn.apache.org/r1628978
Log:
Add the ability to control the Charset used for String<->byte conversions. The 
default remains ISO-8859-1 so this should have no functional impact.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1628978&r1=1628977&r2=1628978&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Thu Oct  2 
13:57:44 2014
@@ -18,7 +18,7 @@ package org.apache.tomcat.util.buf;
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.Charset;
 import java.util.Locale;
 
 /**
@@ -201,6 +201,20 @@ public final class MessageBytes implemen
 return strValue;
 }
 
+/**
+ * Get the Charset used for string<->byte conversions.
+ */
+public Charset getCharset() {
+return byteC.getCharset();
+}
+
+/**
+ * Set the Charset used for string<->byte conversions.
+ */
+public void setCharset(Charset charset) {
+byteC.setCharset(charset);
+}
+
 /** Do a char->byte conversion.
  */
 public void toBytes() {
@@ -210,7 +224,7 @@ public final class MessageBytes implemen
 }
 toString();
 type=T_BYTES;
-byte bb[] = strValue.getBytes(StandardCharsets.ISO_8859_1);
+byte bb[] = strValue.getBytes(byteC.getCharset());
 byteC.setBytes(bb, 0, bb.length);
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57049] New: Treat empty jvmRoute the same as "no jvmRoute set"

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57049

Bug ID: 57049
   Summary: Treat empty jvmRoute the same as "no jvmRoute set"
   Product: Tomcat 8
   Version: trunk
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: ch...@christopherschultz.net

To facilitate dynamic deployments where a jvmRoute is set e.g. using a system
property, an empty jvmRoute attribute should behave the same as having no
jvmRoute attribute set.

-- 
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

Bugzilla tidying

2014-10-02 Thread Christopher Schultz 
All,

There are a few things I noticed about Bugzilla for Tomcat 8 while
filing a recent bug. I don't have the privileges to make any of these
changes.

1. The description for the Tomcat 8 product is:

"
A Servlet container implementing the Servlet Specification v3.1 and the
Java Server Pages (JSP) Specification TBD, EL specification 3.0 and
WebSocket specification 1.0
"

The JSP spec version should be 2.3 and Websocket should be 1.1.

2. The description for the "Catalina" component is:

"
The Servlet container core including WebSocket support.
"

There is a separate component for Websocket, so that should probably be
removed from the description of "Catalina".

3. The description for the Websocket components is:

"
The Java WebSocket 1.0 (JSR-356) implementation
"

I believe the spec level should be 1.1, yes?

Thanks,
-chris



signature.asc
Description: OpenPGP digital signature

[Bug 57049] Engine jvmRoute documentation should mention the system property that can affect its value

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57049

Christopher Schultz  changed:

   What|Removed |Added

  Component|Catalina|Documentation
Summary|Treat empty jvmRoute the|Engine jvmRoute
   |same as "no jvmRoute set"   |documentation should
   ||mention the system property
   ||that can affect its value

--- Comment #1 from Christopher Schultz  ---
Hmm... while looking at the code to propose a patch, I found that the
StandardEngine constructor actually looks for a "jvmRoute" system property.

This enhancement might not need to exist.

I checked, and the jvmRoute system property is properly-documented in the
"System Properties" page of the configuration reference.

It might help to mention this in the  documentation for jvmRoute.
Changing to a documentation bug.

-- 
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 55951] HTML5 specifies UTF-8 encoding for cookie values

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=55951

--- Comment #3 from Konstantin Kolinko  ---
(In reply to Jeremy Boynes from comment #0)
> The HTML5 specification is specifying that cookie values may contain
> characters that are not part of US-ASCII or ISO-8859-1 and that those
> codepoints should be UTF-8 encoded for display.
> 
> http://www.w3.org/html/wg/drafts/html/master/single-page.html#cookie
>

What is the exact wording?

The above link is broken - there is no "cookie" anchor in the current version
of that document. All I see are references to [COOKIES] document (#refsCOOKIES
anchor) = RFC 6265.

http://tools.ietf.org/html/rfc6265


RFC 6265 does not allow non-ascii characters in cookie value in Set-Cookie
header. Citing from its Chapter 4.1.1. Set-Cookie / Syntax,

 set-cookie-header = "Set-Cookie:" SP set-cookie-string
 set-cookie-string = cookie-pair *( ";" SP cookie-av )
 cookie-pair   = cookie-name "=" cookie-value
 cookie-name   = token
 cookie-value  = *cookie-octet / ( DQUOTE *cookie-octet DQUOTE )
 cookie-octet  = %x21 / %x23-2B / %x2D-3A / %x3C-5B / %x5D-7E
   ; US-ASCII characters excluding CTLs,
   ; whitespace DQUOTE, comma, semicolon,
   ; and backslash

The cookie-value is limited to US-ASCII, even when quoted.

At the same time, attributes (cookie-av) do not have such limitation and as
such may be UTF-8:

 path-av   = "Path=" path-value
 path-value= 


For reference, the place where UTF-8 is mentioned in RFC 6265 is in chapter
5.4. The Cookie Header. Citing:

   NOTE: Despite its name, the cookie-string is actually a sequence of
   octets, not a sequence of characters.  To convert the cookie-string
   (or components thereof) into a sequence of characters (e.g., for
   presentation to the user), the user agent might wish to try using the
   UTF-8 character encoding [RFC3629] to decode the octet sequence.
   This decoding might fail, however, because not every sequence of
   octets is valid UTF-8.

-- 
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: Bugzilla tidying

2014-10-02 Thread Mark Thomas 
On 02/10/2014 15:12, Christopher Schultz wrote:
> All,
> 
> There are a few things I noticed about Bugzilla for Tomcat 8 while
> filing a recent bug. I don't have the privileges to make any of these
> changes.

You should have the necessary karma now.

Mark


> 
> 1. The description for the Tomcat 8 product is:
> 
> "
> A Servlet container implementing the Servlet Specification v3.1 and the
> Java Server Pages (JSP) Specification TBD, EL specification 3.0 and
> WebSocket specification 1.0
> "
> 
> The JSP spec version should be 2.3 and Websocket should be 1.1.
> 
> 2. The description for the "Catalina" component is:
> 
> "
> The Servlet container core including WebSocket support.
> "
> 
> There is a separate component for Websocket, so that should probably be
> removed from the description of "Catalina".
> 
> 3. The description for the Websocket components is:
> 
> "
> The Java WebSocket 1.0 (JSR-356) implementation
> "
> 
> I believe the spec level should be 1.1, yes?
> 
> Thanks,
> -chris
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57049] Engine jvmRoute documentation should mention the system property that can affect its value

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57049

--- Comment #2 from Christopher Schultz  ---
Fixed in r1628984. Will be in Tomcat 8.0.15's documentation.

-- 
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: r1628984 - in /tomcat/trunk/webapps/docs: changelog.xml config/engine.xml

2014-10-02 Thread schultz 
Author: schultz
Date: Thu Oct  2 14:36:27 2014
New Revision: 1628984

URL: http://svn.apache.org/r1628984
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57049
Clarified that jvmRoute can be set using Engine.jvmRoute or a system property.

Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/engine.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 14:36:27 2014
@@ -109,7 +109,12 @@
 Correct documentation for ServerCookie.ALLOW_NAME_ONLY
 system property. (kkolinko)
   
-
+  
+57049: Clarified that jvmRoute can be set in
+'s jvmRoute or in a system
+property. (schultz)
+  
+  
   
 
 

Modified: tomcat/trunk/webapps/docs/config/engine.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/engine.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
==
--- tomcat/trunk/webapps/docs/config/engine.xml (original)
+++ tomcat/trunk/webapps/docs/config/engine.xml Thu Oct  2 14:36:27 2014
@@ -93,6 +93,12 @@
 the generated session identifier, therefore allowing the front end
 proxy to always forward a particular session to the same Tomcat
 instance.
+
+Note that the jvmRoute can also be set using the
+jvmRoute system property. The jvmRoute
+set in an  attribute will override
+any jvmRoute system property.
+
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1628985 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/engine.xml

2014-10-02 Thread schultz 
Author: schultz
Date: Thu Oct  2 14:40:39 2014
New Revision: 1628985

URL: http://svn.apache.org/r1628985
Log:
Back-port r1628984 to fix 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57049
Clarify that jvmRoute can be set with either Engine.jvmRoute or a system 
property.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1628984

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=1628985&r1=1628984&r2=1628985&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct  2 14:40:39 2014
@@ -75,7 +75,12 @@
 Correct documentation for ServerCookie.ALLOW_NAME_ONLY
 system property. (kkolinko)
   
-
+  
+57049: Clarified that jvmRoute can be set in
+'s jvmRoute or in a system
+property. (schultz)
+  
+  
   
 
 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml?rev=1628985&r1=1628984&r2=1628985&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/engine.xml Thu Oct  2 14:40:39 2014
@@ -93,6 +93,12 @@
 the generated session identifier, therefore allowing the front end
 proxy to always forward a particular session to the same Tomcat
 instance.
+
+Note that the jvmRoute can also be set using the
+jvmRoute system property. The jvmRoute
+set in an  attribute will override
+any jvmRoute system property.
+
   
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57049] Engine jvmRoute documentation should mention the system property that can affect its value

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57049

Christopher Schultz  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #3 from Christopher Schultz  ---
Fixed in 7.0.x branch in r1628985. Will be in Tomcat 7.0.57's documentation.

-- 
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: svn commit: r1628984 - in /tomcat/trunk/webapps/docs: changelog.xml config/engine.xml

2014-10-02 Thread Martin Grigorov 
Hi,

On Thu, Oct 2, 2014 at 4:36 PM,  wrote:

> Author: schultz
> Date: Thu Oct  2 14:36:27 2014
> New Revision: 1628984
>
> URL: http://svn.apache.org/r1628984
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57049
> Clarified that jvmRoute can be set using Engine.jvmRoute or a system
> property.
>
> Modified:
> tomcat/trunk/webapps/docs/changelog.xml
> tomcat/trunk/webapps/docs/config/engine.xml
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
>
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 14:36:27 2014
> @@ -109,7 +109,12 @@
>  Correct documentation for
> ServerCookie.ALLOW_NAME_ONLY
>  system property. (kkolinko)
>
> -
> +  
> +57049: Clarified that jvmRoute can be set
> in
> +'s jvmRoute or in a system
> +property. (schultz)
> +  
> +  
>
>  
>  
>
> Modified: tomcat/trunk/webapps/docs/config/engine.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/engine.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
>
> ==
> --- tomcat/trunk/webapps/docs/config/engine.xml (original)
> +++ tomcat/trunk/webapps/docs/config/engine.xml Thu Oct  2 14:36:27 2014
> @@ -93,6 +93,12 @@
>  the generated session identifier, therefore allowing the front end
>  proxy to always forward a particular session to the same Tomcat
>  instance.
> +
> +Note that the jvmRoute can also be set using the
> +jvmRoute system property. The
> jvmRoute
> +set in an  attribute will override
> +any jvmRoute system property.
> +
>

This sounds counter intuitive.
Usually manually provided settings, like system properties, have higher
priority than ones provided in configuration files.


>
>
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[Bug 55951] HTML5 specifies UTF-8 encoding for cookie values

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=55951

--- Comment #4 from Mark Thomas  ---
(In reply to Konstantin Kolinko from comment #3)
> The cookie-value is limited to US-ASCII, even when quoted.
Agreed.

> At the same time, attributes (cookie-av) do not have such limitation and as
> such may be UTF-8:
> 
>  path-av   = "Path=" path-value
>  path-value= 

Nope. CHAR is limited to USASCII. See the definition in section 2.2 of RFC
6265.

-- 
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: Bugzilla tidying

2014-10-02 Thread Christopher Schultz 
Mark,

On 10/2/14 10:35 AM, Mark Thomas wrote:
> On 02/10/2014 15:12, Christopher Schultz wrote:
>> All,
>>
>> There are a few things I noticed about Bugzilla for Tomcat 8 while
>> filing a recent bug. I don't have the privileges to make any of these
>> changes.
> 
> You should have the necessary karma now.

Thanks!

>> 1. The description for the Tomcat 8 product is:
>>
>> "
>> A Servlet container implementing the Servlet Specification v3.1 and the
>> Java Server Pages (JSP) Specification TBD, EL specification 3.0 and
>> WebSocket specification 1.0
>> "
>>
>> The JSP spec version should be 2.3 and Websocket should be 1.1.

Fixed. JSP spec version now says 2.3 and Websocket spec version says 1.1.

>> 2. The description for the "Catalina" component is:
>>
>> "
>> The Servlet container core including WebSocket support.
>> "
>>
>> There is a separate component for Websocket, so that should probably be
>> removed from the description of "Catalina".

Fixed. Catalina is core.

>> 3. The description for the Websocket components is:
>>
>> "
>> The Java WebSocket 1.0 (JSR-356) implementation
>> "
>>
>> I believe the spec level should be 1.1, yes?

Fixed. Evidently, both WebSocket 1.0 and 1.1 are covered by JSR-356.

-chris



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r1628984 - in /tomcat/trunk/webapps/docs: changelog.xml config/engine.xml

2014-10-02 Thread Mark Thomas 
On 02/10/2014 15:41, Martin Grigorov wrote:
> Hi,
> 
> On Thu, Oct 2, 2014 at 4:36 PM,  wrote:
> 
>> Author: schultz
>> Date: Thu Oct  2 14:36:27 2014
>> New Revision: 1628984
>>
>> URL: http://svn.apache.org/r1628984
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57049
>> Clarified that jvmRoute can be set using Engine.jvmRoute or a system
>> property.
>>
>> Modified:
>> tomcat/trunk/webapps/docs/changelog.xml
>> tomcat/trunk/webapps/docs/config/engine.xml
>>
>> Modified: tomcat/trunk/webapps/docs/changelog.xml
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
>>
>> ==
>> --- tomcat/trunk/webapps/docs/changelog.xml (original)
>> +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 14:36:27 2014
>> @@ -109,7 +109,12 @@
>>  Correct documentation for
>> ServerCookie.ALLOW_NAME_ONLY
>>  system property. (kkolinko)
>>
>> -
>> +  
>> +57049: Clarified that jvmRoute can be set
>> in
>> +'s jvmRoute or in a system
>> +property. (schultz)
>> +  
>> +  
>>
>>  
>>  
>>
>> Modified: tomcat/trunk/webapps/docs/config/engine.xml
>> URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/engine.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
>>
>> ==
>> --- tomcat/trunk/webapps/docs/config/engine.xml (original)
>> +++ tomcat/trunk/webapps/docs/config/engine.xml Thu Oct  2 14:36:27 2014
>> @@ -93,6 +93,12 @@
>>  the generated session identifier, therefore allowing the front end
>>  proxy to always forward a particular session to the same Tomcat
>>  instance.
>> +
>> +Note that the jvmRoute can also be set using the
>> +jvmRoute system property. The
>> jvmRoute
>> +set in an  attribute will override
>> +any jvmRoute system property.
>> +
>>
> 
> This sounds counter intuitive.
> Usually manually provided settings, like system properties, have higher
> priority than ones provided in configuration files.

Not in Tomcat they don't.

System properties are often introduced to provide configuration options
where there isn't an obvious / easy element on which to place a
configuration attribute.

At some point in the future, things are refactored making it possible to
have per element configuration. At this point the system property
becomes the default and the element level always overrides it.

The ideal solution would be to never use system properties in the first
place.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1628987 - /tomcat/trunk/webapps/docs/changelog.xml

2014-10-02 Thread markt 
Author: markt
Date: Thu Oct  2 14:57:29 2014
New Revision: 1628987

URL: http://svn.apache.org/r1628987
Log:
Update

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=1628987&r1=1628986&r2=1628987&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 14:57:29 2014
@@ -48,6 +48,12 @@
   
 
   
+56393: Add support for RFC6265 cookie parsing and 
generation.
+This is currently disabled by default and may be enabled via the
+CookieProcessor element of a Context.
+(markt)
+  
+  
 56394: Introduce new configuration element CookieProcessor 
in
 Context to allow context-specific configuration of cookie processing
 options. Attributes of Context element that were added in Tomcat 8.0.13



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in ASF Buildbot on tomcat-trunk

2014-10-02 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/509

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1628936
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 55951] HTML5 specifies UTF-8 encoding for cookie values

2014-10-02 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=55951

--- Comment #5 from Mark Thomas  ---
Here is a patch that adds support for sending HTTP headers in character sets
other than ISO-8859-1 and then uses that support for sending Set-Cookie
headers.

Both AJP and HTTP needed changes SPDY didn't as it already used the approach
the patch uses.

I still have some work to do to restore the filtering of CTLs.

http://people.apache.org/~markt/patches/2014-10-02-bug55951-tc8-v1.patch

-- 
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: r1629038 - in /tomcat/trunk: java/org/apache/catalina/webresources/StandardRoot.java webapps/docs/changelog.xml

2014-10-02 Thread markt 
Author: markt
Date: Thu Oct  2 18:46:24 2014
New Revision: 1629038

URL: http://svn.apache.org/r1629038
Log:
Use the whole relative docBase when constructing the absolute form.

Modified:
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1629038&r1=1629037&r2=1629038&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu 
Oct  2 18:46:24 2014
@@ -655,7 +655,7 @@ public class StandardRoot extends Lifecy
 
 File f = new File(docBase);
 if (!f.isAbsolute()) {
-f = new File(((Host)context.getParent()).getAppBaseFile(), 
f.getName());
+f = new File(((Host)context.getParent()).getAppBaseFile(), 
f.getPath());
 }
 if (f.isDirectory()) {
 main = new DirResourceSet(this, "/", f.getAbsolutePath(), "/");

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1629038&r1=1629037&r2=1629038&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 18:46:24 2014
@@ -104,6 +104,10 @@
 Correct a couple of NPEs in the JNDI Realm that could be triggered with
 when not specifying a roleBase and enabling roleSearchAsUser. (markt)
   
+  
+Correctly handle relative values for the docBase attribute of a 
Context.
+(markt)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1628984 - in /tomcat/trunk/webapps/docs: changelog.xml config/engine.xml

2014-10-02 Thread Christopher Schultz 
Mark,

On 10/2/14 10:54 AM, Mark Thomas wrote:
> On 02/10/2014 15:41, Martin Grigorov wrote:
>> Hi,
>>
>> On Thu, Oct 2, 2014 at 4:36 PM,  wrote:
>>
>>> Author: schultz
>>> Date: Thu Oct  2 14:36:27 2014
>>> New Revision: 1628984
>>>
>>> URL: http://svn.apache.org/r1628984
>>> Log:
>>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57049
>>> Clarified that jvmRoute can be set using Engine.jvmRoute or a system
>>> property.
>>>
>>> Modified:
>>> tomcat/trunk/webapps/docs/changelog.xml
>>> tomcat/trunk/webapps/docs/config/engine.xml
>>>
>>> Modified: tomcat/trunk/webapps/docs/changelog.xml
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
>>>
>>> ==
>>> --- tomcat/trunk/webapps/docs/changelog.xml (original)
>>> +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 14:36:27 2014
>>> @@ -109,7 +109,12 @@
>>>  Correct documentation for
>>> ServerCookie.ALLOW_NAME_ONLY
>>>  system property. (kkolinko)
>>>
>>> -
>>> +  
>>> +57049: Clarified that jvmRoute can be set
>>> in
>>> +'s jvmRoute or in a system
>>> +property. (schultz)
>>> +  
>>> +  
>>>
>>>  
>>>  
>>>
>>> Modified: tomcat/trunk/webapps/docs/config/engine.xml
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/engine.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
>>>
>>> ==
>>> --- tomcat/trunk/webapps/docs/config/engine.xml (original)
>>> +++ tomcat/trunk/webapps/docs/config/engine.xml Thu Oct  2 14:36:27 2014
>>> @@ -93,6 +93,12 @@
>>>  the generated session identifier, therefore allowing the front end
>>>  proxy to always forward a particular session to the same Tomcat
>>>  instance.
>>> +
>>> +Note that the jvmRoute can also be set using the
>>> +jvmRoute system property. The
>>> jvmRoute
>>> +set in an  attribute will override
>>> +any jvmRoute system property.
>>> +
>>>
>>
>> This sounds counter intuitive.
>> Usually manually provided settings, like system properties, have higher
>> priority than ones provided in configuration files.
> 
> Not in Tomcat they don't.
> 
> System properties are often introduced to provide configuration options
> where there isn't an obvious / easy element on which to place a
> configuration attribute.
> 
> At some point in the future, things are refactored making it possible to
> have per element configuration. At this point the system property
> becomes the default and the element level always overrides it.
> 
> The ideal solution would be to never use system properties in the first
> place.

+1

Also, I disagree with Martin's initial assertion. Instead, the more
fine-grained configuration should override the more coarse-grained
configuration.

-chris



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r1628984 - in /tomcat/trunk/webapps/docs: changelog.xml config/engine.xml

2014-10-02 Thread Martin Grigorov 
On Thu, Oct 2, 2014 at 9:14 PM, Christopher Schultz <
ch...@christopherschultz.net> wrote:

> Mark,
>
> On 10/2/14 10:54 AM, Mark Thomas wrote:
> > On 02/10/2014 15:41, Martin Grigorov wrote:
> >> Hi,
> >>
> >> On Thu, Oct 2, 2014 at 4:36 PM,  wrote:
> >>
> >>> Author: schultz
> >>> Date: Thu Oct  2 14:36:27 2014
> >>> New Revision: 1628984
> >>>
> >>> URL: http://svn.apache.org/r1628984
> >>> Log:
> >>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57049
> >>> Clarified that jvmRoute can be set using Engine.jvmRoute or a system
> >>> property.
> >>>
> >>> Modified:
> >>> tomcat/trunk/webapps/docs/changelog.xml
> >>> tomcat/trunk/webapps/docs/config/engine.xml
> >>>
> >>> Modified: tomcat/trunk/webapps/docs/changelog.xml
> >>> URL:
> >>>
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
> >>>
> >>>
> ==
> >>> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> >>> +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 14:36:27 2014
> >>> @@ -109,7 +109,12 @@
> >>>  Correct documentation for
> >>> ServerCookie.ALLOW_NAME_ONLY
> >>>  system property. (kkolinko)
> >>>
> >>> -
> >>> +  
> >>> +57049: Clarified that jvmRoute can be
> set
> >>> in
> >>> +'s jvmRoute or in a
> system
> >>> +property. (schultz)
> >>> +  
> >>> +  
> >>>
> >>>  
> >>>  
> >>>
> >>> Modified: tomcat/trunk/webapps/docs/config/engine.xml
> >>> URL:
> >>>
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/engine.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
> >>>
> >>>
> ==
> >>> --- tomcat/trunk/webapps/docs/config/engine.xml (original)
> >>> +++ tomcat/trunk/webapps/docs/config/engine.xml Thu Oct  2 14:36:27
> 2014
> >>> @@ -93,6 +93,12 @@
> >>>  the generated session identifier, therefore allowing the
> front end
> >>>  proxy to always forward a particular session to the same
> Tomcat
> >>>  instance.
> >>> +
> >>> +Note that the jvmRoute can also be set using
> the
> >>> +jvmRoute system property. The
> >>> jvmRoute
> >>> +set in an  attribute will
> override
> >>> +any jvmRoute system property.
> >>> +
> >>>
> >>
> >> This sounds counter intuitive.
> >> Usually manually provided settings, like system properties, have higher
> >> priority than ones provided in configuration files.
> >
> > Not in Tomcat they don't.
> >
> > System properties are often introduced to provide configuration options
> > where there isn't an obvious / easy element on which to place a
> > configuration attribute.
> >
> > At some point in the future, things are refactored making it possible to
> > have per element configuration. At this point the system property
> > becomes the default and the element level always overrides it.
> >
> > The ideal solution would be to never use system properties in the first
> > place.
>
> +1
>
> Also, I disagree with Martin's initial assertion. Instead, the more
> fine-grained configuration should override the more coarse-grained
> configuration.
>

Just saying how the other 99% of the software (I have worked with!) works.
Just put yourself in DevOps shoes - it is much easier for them to use
CATALINA_OPTS to tune something for some specific case than patch a .xml
file.

But since this is the Tomcat's convention then everything is fine.


>
> -chris
>
>

Re: svn commit: r1628984 - in /tomcat/trunk/webapps/docs: changelog.xml config/engine.xml

2014-10-02 Thread Christopher Schultz 
Martin,

On 10/2/14 3:23 PM, Martin Grigorov wrote:
> On Thu, Oct 2, 2014 at 9:14 PM, Christopher Schultz <
> ch...@christopherschultz.net> wrote:
> 
>> Mark,
>>
>> On 10/2/14 10:54 AM, Mark Thomas wrote:
>>> On 02/10/2014 15:41, Martin Grigorov wrote:
 Hi,

 On Thu, Oct 2, 2014 at 4:36 PM,  wrote:

> Author: schultz
> Date: Thu Oct  2 14:36:27 2014
> New Revision: 1628984
>
> URL: http://svn.apache.org/r1628984
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57049
> Clarified that jvmRoute can be set using Engine.jvmRoute or a system
> property.
>
> Modified:
> tomcat/trunk/webapps/docs/changelog.xml
> tomcat/trunk/webapps/docs/config/engine.xml
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL:
>
>> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
>
>
>> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 14:36:27 2014
> @@ -109,7 +109,12 @@
>  Correct documentation for
> ServerCookie.ALLOW_NAME_ONLY
>  system property. (kkolinko)
>
> -
> +  
> +57049: Clarified that jvmRoute can be
>> set
> in
> +'s jvmRoute or in a
>> system
> +property. (schultz)
> +  
> +  
>
>  
>  
>
> Modified: tomcat/trunk/webapps/docs/config/engine.xml
> URL:
>
>> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/engine.xml?rev=1628984&r1=1628983&r2=1628984&view=diff
>
>
>> ==
> --- tomcat/trunk/webapps/docs/config/engine.xml (original)
> +++ tomcat/trunk/webapps/docs/config/engine.xml Thu Oct  2 14:36:27
>> 2014
> @@ -93,6 +93,12 @@
>  the generated session identifier, therefore allowing the
>> front end
>  proxy to always forward a particular session to the same
>> Tomcat
>  instance.
> +
> +Note that the jvmRoute can also be set using
>> the
> +jvmRoute system property. The
> jvmRoute
> +set in an  attribute will
>> override
> +any jvmRoute system property.
> +
>

 This sounds counter intuitive.
 Usually manually provided settings, like system properties, have higher
 priority than ones provided in configuration files.
>>>
>>> Not in Tomcat they don't.
>>>
>>> System properties are often introduced to provide configuration options
>>> where there isn't an obvious / easy element on which to place a
>>> configuration attribute.
>>>
>>> At some point in the future, things are refactored making it possible to
>>> have per element configuration. At this point the system property
>>> becomes the default and the element level always overrides it.
>>>
>>> The ideal solution would be to never use system properties in the first
>>> place.
>>
>> +1
>>
>> Also, I disagree with Martin's initial assertion. Instead, the more
>> fine-grained configuration should override the more coarse-grained
>> configuration.
>>
> 
> Just saying how the other 99% of the software (I have worked with!) works.

Example?

> Just put yourself in DevOps shoes - it is much easier for them to use
> CATALINA_OPTS to tune something for some specific case than patch a .xml
> file.

(nb: I think you just mean "Ops". DevOps are just developers that have
been forced to also do operations. Or operations staff who know how to
do some programming. The fact that the employer calls the staff position
"DevOps" doesn't mean that it's a job. The "operations" staff is in
charge of what we are discussing. The fact that the ops staff also has
dev responsibilities is irrelevant. Sorry, I just don't really like the
term DevOps, mostly because of the implication that it's possible to
have someone equally good at both jobs yet still have their equal-level
of capability worth paying for.)

Anyway, you can still set a system property. But if you want, you can be
*more specific* and in fact override the system property.

> But since this is the Tomcat's convention then everything is fine.

The problem is that each  might want to have a different
jvmRoute. If you only have one system property, then it affects them
all. Yes, multiple system properties could be used, but (ugh).

-chris



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r1628947 - /tomcat/trunk/webapps/docs/changelog.xml

2014-10-02 Thread Christopher Schultz 
Mark,

On 10/2/14 7:32 AM, ma...@apache.org wrote:
> Author: markt
> Date: Thu Oct  2 11:32:11 2014
> New Revision: 1628947
> 
> URL: http://svn.apache.org/r1628947
> Log:
> Update changelog
> 
> 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=1628947&r1=1628946&r2=1628947&view=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 11:32:11 2014
> @@ -61,6 +61,10 @@
>  times such as when using StoreConfig. (markt)
>
>
> +56403: Add pluggable password derivation support to the
> +Realms via the new CredentialHandler interface. (markt)
> +  

What, no love?

;)

-chris

> +  
>  57016: When using the PersistentValve do not
>  remove sessions from the store when persisting them. (markt)
>
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r1628947 - /tomcat/trunk/webapps/docs/changelog.xml

2014-10-02 Thread Mark Thomas 
On 02/10/2014 22:21, Christopher Schultz wrote:
> Mark,
> 
> On 10/2/14 7:32 AM, ma...@apache.org wrote:
>> Author: markt
>> Date: Thu Oct  2 11:32:11 2014
>> New Revision: 1628947
>>
>> URL: http://svn.apache.org/r1628947
>> Log:
>> Update changelog
>>
>> 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=1628947&r1=1628946&r2=1628947&view=diff
>> ==
>> --- tomcat/trunk/webapps/docs/changelog.xml (original)
>> +++ tomcat/trunk/webapps/docs/changelog.xml Thu Oct  2 11:32:11 2014
>> @@ -61,6 +61,10 @@
>>  times such as when using StoreConfig. (markt)
>>
>>
>> +56403: Add pluggable password derivation support to the
>> +Realms via the new CredentialHandler interface. (markt)
>> +  
> 
> What, no love?
> 
> ;)

Nope. I just stole some of your ideas and all of the credit :)

You should definitely be listed on that one. Feel free to add yourself.
I have e-mail but not IDE access right or I'd do it myself.

Mark

> 
> -chris
> 
>> +  
>>  57016: When using the PersistentValve do not
>>  remove sessions from the store when persisting them. (markt)
>>
>>
>>
>>
>> -
>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>> For additional commands, e-mail: dev-h...@tomcat.apache.org
>>
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org