Re: Tomcat build error
On 06/03/2010 22:05, Bharath Vasudevan wrote: > BUILD FAILED > java.lang.NoClassDefFoundError: gnu/classpath/Configuration Don't use gnu - download a Sun JDK. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919961 - in /tomcat/trunk/test: org/apache/el/ org/apache/jasper/compiler/ webapp-3.0/ webapp/
Author: markt
Date: Sun Mar 7 10:16:38 2010
New Revision: 919961
URL: http://svn.apache.org/viewvc?rev=919961&view=rev
Log:
Rename webapp to allow tetsing with webapps with different servlet spec
versions in web.xml
Added:
tomcat/trunk/test/webapp-3.0/
- copied from r919952, tomcat/trunk/test/webapp/
Removed:
tomcat/trunk/test/webapp/
Modified:
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=919961&r1=919960&r2=919961&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Sun Mar 7 10:16:38 2010
@@ -33,7 +33,7 @@
public void testBug36923() throws Exception {
Tomcat tomcat = getTomcatInstance();
-File appDir = new File("test/webapp");
+File appDir = new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -49,7 +49,7 @@
public void testBug42565() throws Exception {
Tomcat tomcat = getTomcatInstance();
-File appDir = new File("test/webapp");
+File appDir = new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -81,7 +81,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -100,7 +100,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -135,7 +135,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -235,7 +235,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -253,7 +253,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -269,7 +269,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -297,7 +297,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -313,7 +313,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -346,7 +346,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
@@ -373,7 +373,7 @@
Tomcat tomcat = getTomcatInstance();
File appDir =
-new File("test/webapp");
+new File("test/webapp-3.0");
// app dir is relative to server home
tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.
Re: svn commit: r919914 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/jasper/compiler/ test/webapp/
On 07/03/2010 02:43, kkoli...@apache.org wrote:
> Author: kkolinko
> Date: Sun Mar 7 02:43:12 2010
> New Revision: 919914
>
> URL: http://svn.apache.org/viewvc?rev=919914&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
> Fix remaining issues in BZ48668
> The idea behind this change is to make ELParser aware about
> isDeferredAsLiteral option.
> Before this change ELParser was used to parse an attribute regardless of
> isELIgnored or isDeferredSyntaxAllowedAsLiteral values. With this change we
> do not use ELParser when isELIgnored is true and ELParser does not parse '#{'
> in expressions when isDeferredSyntaxAllowedAsLiteral is true.
> It simplified the code in many places.
> Also, servlet specification version from web.xml and JSP specification
> version from TLD file are now taken into account when determining the default
> values for isELIgnored and isDeferredSyntaxAllowedAsLiteral. As far as I
> understand the code, previously only isELIgnored was determined by the
> servlet specification version.
I am now seeing a number of JSP 2.2 TCK failures. I suspect this change
and/or r919851 since the failures are in this area but I need to do some
more investigation.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919914 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/jasper/compiler/ test/webapp/
On 07/03/2010 10:19, Mark Thomas wrote:
> On 07/03/2010 02:43, kkoli...@apache.org wrote:
>> Author: kkolinko
>> Date: Sun Mar 7 02:43:12 2010
>> New Revision: 919914
>>
>> URL: http://svn.apache.org/viewvc?rev=919914&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
>> Fix remaining issues in BZ48668
>> The idea behind this change is to make ELParser aware about
>> isDeferredAsLiteral option.
>> Before this change ELParser was used to parse an attribute regardless of
>> isELIgnored or isDeferredSyntaxAllowedAsLiteral values. With this change we
>> do not use ELParser when isELIgnored is true and ELParser does not parse
>> '#{' in expressions when isDeferredSyntaxAllowedAsLiteral is true.
>> It simplified the code in many places.
>> Also, servlet specification version from web.xml and JSP specification
>> version from TLD file are now taken into account when determining the
>> default values for isELIgnored and isDeferredSyntaxAllowedAsLiteral. As far
>> as I understand the code, previously only isELIgnored was determined by the
>> servlet specification version.
>
> I am now seeing a number of JSP 2.2 TCK failures. I suspect this change
> and/or r919851 since the failures are in this area but I need to do some
> more investigation.
It looks like these changes have exposed some bugs in my web.xml
parse/merge changes for Tomcat 7. I'll get those fixed and see what
impact that has.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919966 - in /tomcat/trunk/test: org/apache/jasper/compiler/TestJspConfig.java webapp-2.3/ webapp-2.3/WEB-INF/ webapp-2.3/WEB-INF/web.xml webapp-2.3/no-el.jsp
Author: markt
Date: Sun Mar 7 11:09:09 2010
New Revision: 919966
URL: http://svn.apache.org/viewvc?rev=919966&view=rev
Log:
Add a test the EL doesn't work if the web-app is a 2.3 web-app
Added:
tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (with
props)
tomcat/trunk/test/webapp-2.3/
tomcat/trunk/test/webapp-2.3/WEB-INF/
tomcat/trunk/test/webapp-2.3/WEB-INF/web.xml (with props)
tomcat/trunk/test/webapp-2.3/no-el.jsp (with props)
Added: tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=919966&view=auto
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (added)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Sun Mar 7
11:09:09 2010
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jasper.compiler;
+
+import java.io.File;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestJspConfig extends TomcatBaseTest {
+
+public void testServlet23NoEL() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir =
+new File("test/webapp-2.3");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/no-el.jsp");
+
+String result = res.toString();
+
+assertTrue(result.indexOf("00-${'hello world'}") > 0);
+}
+
+}
Propchange: tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
--
svn:eol-style = native
Added: tomcat/trunk/test/webapp-2.3/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.3/WEB-INF/web.xml?rev=919966&view=auto
==
--- tomcat/trunk/test/webapp-2.3/WEB-INF/web.xml (added)
+++ tomcat/trunk/test/webapp-2.3/WEB-INF/web.xml Sun Mar 7 11:09:09 2010
@@ -0,0 +1,32 @@
+
+
+http://java.sun.com/dtd/web-app_2_3.dtd";>
+
+ Tomcat Servlet 2.3 Tests
+
+Provides a web application used by the Tomcat unit tests to ensure that
+Tomcat meets the requirements of the current JSP and Servlet specification
+for web applications that declare that they follow version 2.3 of the
+Servlet specification and version 1.2 of the JSP specification. This
+typically means ensuring that features introduced in later versions of the
+specification do not change the behaviour of applications that declared an
+earlier version of the specification.
+
+
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp-2.3/WEB-INF/web.xml
--
svn:eol-style = native
Added: tomcat/trunk/test/webapp-2.3/no-el.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.3/no-el.jsp?rev=919966&view=auto
==
--- tomcat/trunk/test/webapp-2.3/no-el.jsp (added)
+++ tomcat/trunk/test/webapp-2.3/no-el.jsp Sun Mar 7 11:09:09 2010
@@ -0,0 +1,21 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License f
svn commit: r919968 - /tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java
Author: markt
Date: Sun Mar 7 11:27:20 2010
New Revision: 919968
URL: http://svn.apache.org/viewvc?rev=919968&view=rev
Log:
Check all versions are correctly parsed
Modified:
tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java
Modified: tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java?rev=919968&r1=919967&r2=919968&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java (original)
+++ tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java Sun Mar 7
11:27:20 2010
@@ -71,7 +71,37 @@
assertEquals(500, webxml.getMinorVersion());
}
-public void testParsePublicIdVersion() {
+public void testParsePublicIdVersion22() {
+
+WebXml webxml = new WebXml();
+
+webxml.setPublicId(
+org.apache.catalina.startup.Constants.WebDtdPublicId_22);
+assertEquals(2, webxml.getMajorVersion());
+assertEquals(2, webxml.getMinorVersion());
+}
+
+public void testParsePublicIdVersion23() {
+
+WebXml webxml = new WebXml();
+
+webxml.setPublicId(
+org.apache.catalina.startup.Constants.WebDtdPublicId_23);
+assertEquals(2, webxml.getMajorVersion());
+assertEquals(3, webxml.getMinorVersion());
+}
+
+public void testParsePublicIdVersion24() {
+
+WebXml webxml = new WebXml();
+
+webxml.setPublicId(
+org.apache.catalina.startup.Constants.WebSchemaPublicId_24);
+assertEquals(2, webxml.getMajorVersion());
+assertEquals(4, webxml.getMinorVersion());
+}
+
+public void testParsePublicIdVersion25() {
WebXml webxml = new WebXml();
@@ -80,4 +110,14 @@
assertEquals(2, webxml.getMajorVersion());
assertEquals(5, webxml.getMinorVersion());
}
+
+public void testParsePublicIdVersion30() {
+
+WebXml webxml = new WebXml();
+
+webxml.setPublicId(
+org.apache.catalina.startup.Constants.WebSchemaPublicId_30);
+assertEquals(3, webxml.getMajorVersion());
+assertEquals(0, webxml.getMinorVersion());
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919969 - in /tomcat/trunk: build.xml test/org/apache/TestAll.java
Author: markt Date: Sun Mar 7 11:31:00 2010 New Revision: 919969 URL: http://svn.apache.org/viewvc?rev=919969&view=rev Log: Remove the TestAll suite. Ant doesn't use it, IDEs don't need it and it is often out of sync with the tests Removed: tomcat/trunk/test/org/apache/TestAll.java Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=919969&r1=919968&r2=919969&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Sun Mar 7 11:31:00 2010 @@ -879,8 +879,6 @@ - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919973 - /tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java
Author: markt
Date: Sun Mar 7 11:39:39 2010
New Revision: 919973
URL: http://svn.apache.org/viewvc?rev=919973&view=rev
Log:
Ensure result of getVersion() is consistent with getMajorVersion() and
getMinorVersion()
With the current code this fails. Patch to fix this to follow.
Modified:
tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java
Modified: tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java?rev=919973&r1=919972&r2=919973&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java (original)
+++ tomcat/trunk/test/org/apache/catalina/deploy/TestWebXml.java Sun Mar 7
11:39:39 2010
@@ -79,6 +79,7 @@
org.apache.catalina.startup.Constants.WebDtdPublicId_22);
assertEquals(2, webxml.getMajorVersion());
assertEquals(2, webxml.getMinorVersion());
+assertEquals("2.2", webxml.getVersion());
}
public void testParsePublicIdVersion23() {
@@ -89,6 +90,7 @@
org.apache.catalina.startup.Constants.WebDtdPublicId_23);
assertEquals(2, webxml.getMajorVersion());
assertEquals(3, webxml.getMinorVersion());
+assertEquals("2.3", webxml.getVersion());
}
public void testParsePublicIdVersion24() {
@@ -99,6 +101,7 @@
org.apache.catalina.startup.Constants.WebSchemaPublicId_24);
assertEquals(2, webxml.getMajorVersion());
assertEquals(4, webxml.getMinorVersion());
+assertEquals("2.4", webxml.getVersion());
}
public void testParsePublicIdVersion25() {
@@ -109,6 +112,7 @@
org.apache.catalina.startup.Constants.WebSchemaPublicId_25);
assertEquals(2, webxml.getMajorVersion());
assertEquals(5, webxml.getMinorVersion());
+assertEquals("2.5", webxml.getVersion());
}
public void testParsePublicIdVersion30() {
@@ -119,5 +123,6 @@
org.apache.catalina.startup.Constants.WebSchemaPublicId_30);
assertEquals(3, webxml.getMajorVersion());
assertEquals(0, webxml.getMinorVersion());
+assertEquals("3.0", webxml.getVersion());
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919974 - /tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Author: markt
Date: Sun Mar 7 11:41:27 2010
New Revision: 919974
URL: http://svn.apache.org/viewvc?rev=919974&view=rev
Log:
Make getVersion(), getMagorVersion() and getMinorVersion() return consistent
values
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=919974&r1=919973&r2=919974&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Sun Mar 7
11:41:27 2010
@@ -112,8 +112,13 @@
// Common elements and attributes
// Required attribute of web-app element
-private String version = null;
-public String getVersion() { return version; }
+public String getVersion() {
+StringBuilder sb = new StringBuilder(3);
+sb.append(majorVersion);
+sb.append('.');
+sb.append(minorVersion);
+return sb.toString();
+}
/**
* Set the version for this web.xml file
* @param version Values of null will be ignored
@@ -121,7 +126,6 @@
public void setVersion(String version) {
if (version == null) return;
-this.version = version;
// Update major and minor version
// Expected format is n.n - allow for any number of digits just in case
String major = null;
@@ -571,12 +575,7 @@
sb.append(" xsi:schemaLocation=");
sb.append("\"http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\"\n";);
sb.append(" version=\"");
-if (version != null) {
-sb.append(version);
-} else {
-// Should be non-null but in case it isn't assume 3.0
-sb.append("3.0");
-}
+sb.append(getVersion());
sb.append("\"\n");
sb.append(" metadata-complete=\"true\">\n\n");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919979 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Mar 7 12:37:09 2010 New Revision: 919979 URL: http://svn.apache.org/viewvc?rev=919979&view=rev Log: vote and proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=919979&r1=919978&r2=919979&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Mar 7 12:37:09 2010 @@ -29,7 +29,7 @@ Warn if the user tries to set an invalid property. Port of http://svn.apache.org/viewvc?view=rev&revision=565464 http://people.apache.org/~markt/patches/2009-07-02-bug38743.patch - +1: markt + +1: markt, kkolinko 0: fhanik - big step for an old branch, could be risky, I'd wait until after next release if we consider it -1: @@ -99,3 +99,10 @@ http://people.apache.org/~kkolinko/patches/2010-03-06_tc55_remove_JSSE13Factory_v2.patch +1: kkolinko, markt -1: + +* Fix generation of MD5 files for the release + (Remove linewrap between checksum and filename that occurs there with + ANT 1.7+) + http://people.apache.org/~kkolinko/patches/2010-03-07_tc55_md5.patch + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919914 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/jasper/compiler/ test/webapp/
On 07/03/2010 11:05, Mark Thomas wrote:
> On 07/03/2010 10:19, Mark Thomas wrote:
>> On 07/03/2010 02:43, kkoli...@apache.org wrote:
>>> Author: kkolinko
>>> Date: Sun Mar 7 02:43:12 2010
>>> New Revision: 919914
>>>
>>> URL: http://svn.apache.org/viewvc?rev=919914&view=rev
>>> Log:
>>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
>>> Fix remaining issues in BZ48668
>>> The idea behind this change is to make ELParser aware about
>>> isDeferredAsLiteral option.
>>> Before this change ELParser was used to parse an attribute regardless of
>>> isELIgnored or isDeferredSyntaxAllowedAsLiteral values. With this change we
>>> do not use ELParser when isELIgnored is true and ELParser does not parse
>>> '#{' in expressions when isDeferredSyntaxAllowedAsLiteral is true.
>>> It simplified the code in many places.
>>> Also, servlet specification version from web.xml and JSP specification
>>> version from TLD file are now taken into account when determining the
>>> default values for isELIgnored and isDeferredSyntaxAllowedAsLiteral. As far
>>> as I understand the code, previously only isELIgnored was determined by the
>>> servlet specification version.
>>
>> I am now seeing a number of JSP 2.2 TCK failures. I suspect this change
>> and/or r919851 since the failures are in this area but I need to do some
>> more investigation.
>
> It looks like these changes have exposed some bugs in my web.xml
> parse/merge changes for Tomcat 7. I'll get those fixed and see what
> impact that has.
That has fixed one set of failures but some failures remain and they
look to be related to the isDeferredSyntaxAllowedAsLiteral detection.
Still investgating the root cause...
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r919986 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Mar 7 13:22:02 2010 New Revision: 919986 URL: http://svn.apache.org/viewvc?rev=919986&view=rev Log: vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=919986&r1=919985&r2=919986&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Mar 7 13:22:02 2010 @@ -69,7 +69,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997 Process changes for all naming contexts, not just the global one http://svn.apache.org/viewvc?rev=883134&view=rev - +1: markt, rjung + +1: markt, rjung, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48179 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48848] fn:endsWith fails with dollar sign
https://issues.apache.org/bugzilla/show_bug.cgi?id=48848 --- Comment #1 from Jose Miguel Samper 2010-03-07 13:34:16 UTC --- Created an attachment (id=25101) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25101) JSP which reproduces bug Drop JSP into web application to see the bug. Of course, you need standard-taglibs in the classpath. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 48848] fn:endsWith fails with dollar sign
https://issues.apache.org/bugzilla/show_bug.cgi?id=48848
--- Comment #2 from Konstantin Kolinko 2010-03-07
13:44:26 UTC ---
Wow! Indeed, broken. Can reproduce it with 6.0.24.
In org\apache\taglibs\standard\functions\Functions.java:
public static boolean endsWith(String input, String substring) {
if (input == null) input = "";
if (substring == null) substring = "";
int index = input.indexOf(substring);
if (index == -1) return false;
if (index == 0 && substring.length() == 0) return true;
return (index == input.length() - substring.length());
}
there must be
int index = input.lastIndexOf(substring);
though I more wonder why it does not just use
String.endsWith(String)
like fn:startsWith already does.
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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
DO NOT REPLY [Bug 48848] fn:endsWith fails with dollar sign
https://issues.apache.org/bugzilla/show_bug.cgi?id=48848 --- Comment #3 from Jose Miguel Samper 2010-03-07 13:59:47 UTC --- Created an attachment (id=25102) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25102) Simpler JSP which reproduces the bug The bug has nothing to do with dollar sign, so I change the testcase. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 48848] fn:endsWith fails with repeated search string
https://issues.apache.org/bugzilla/show_bug.cgi?id=48848 Jose Miguel Samper changed: What|Removed |Added Summary|fn:endsWith fails with |fn:endsWith fails with |dollar sign |repeated search string --- Comment #4 from Jose Miguel Samper 2010-03-07 14:00:45 UTC --- The bug has nothing to do with dollar sign, so I changed the bug summary. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r919914 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/jasper/compiler/ test/webapp/
2010/3/7 Mark Thomas :
> On 07/03/2010 11:05, Mark Thomas wrote:
>> On 07/03/2010 10:19, Mark Thomas wrote:
>>> On 07/03/2010 02:43, kkoli...@apache.org wrote:
Author: kkolinko
Date: Sun Mar 7 02:43:12 2010
New Revision: 919914
URL: http://svn.apache.org/viewvc?rev=919914&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48668
Fix remaining issues in BZ48668
The idea behind this change is to make ELParser aware about
isDeferredAsLiteral option.
Before this change ELParser was used to parse an attribute regardless of
isELIgnored or isDeferredSyntaxAllowedAsLiteral values. With this change
we do not use ELParser when isELIgnored is true and ELParser does not
parse '#{' in expressions when isDeferredSyntaxAllowedAsLiteral is true.
It simplified the code in many places.
Also, servlet specification version from web.xml and JSP specification
version from TLD file are now taken into account when determining the
default values for isELIgnored and isDeferredSyntaxAllowedAsLiteral. As
far as I understand the code, previously only isELIgnored was determined
by the servlet specification version.
>>>
>>> I am now seeing a number of JSP 2.2 TCK failures. I suspect this change
>>> and/or r919851 since the failures are in this area but I need to do some
>>> more investigation.
>>
>> It looks like these changes have exposed some bugs in my web.xml
>> parse/merge changes for Tomcat 7. I'll get those fixed and see what
>> impact that has.
>
> That has fixed one set of failures but some failures remain and they
> look to be related to the isDeferredSyntaxAllowedAsLiteral detection.
> Still investgating the root cause...
>
Can it be related that my change to Compiler.java sets those PageInfo
attributes as boolean, but PageInfo stores them both as boolean and as
a String.
This patch will fix that:
http://people.apache.org/~kkolinko/patches/2010-03-07_tc7_48668_Compiler.patch
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919914 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/jasper/compiler/ test/webapp/
On 07/03/2010 14:24, Konstantin Kolinko wrote: > Can it be related that my change to Compiler.java sets those PageInfo > attributes as boolean, but PageInfo stores them both as boolean and as > a String. > > This patch will fix that: > http://people.apache.org/~kkolinko/patches/2010-03-07_tc7_48668_Compiler.patch That is worth fixing but doesn't appear to be the root cause. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r920025 - /tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
Author: markt Date: Sun Mar 7 16:22:32 2010 New Revision: 920025 URL: http://svn.apache.org/viewvc?rev=920025&view=rev Log: Line length Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=920025&r1=920024&r2=920025&view=diff == --- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Sun Mar 7 16:22:32 2010 @@ -232,7 +232,8 @@ defaultJspProperty = new JspProperty(defaultIsXml, defaultIsELIgnored, defaultIsScriptingInvalid, -null, null, null, defaultDeferedSyntaxAllowedAsLiteral, +null, null, null, +defaultDeferedSyntaxAllowedAsLiteral, defaultTrimDirectiveWhitespaces, defaultDefaultContentType, defaultBuffer, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r919914 - in /tomcat/trunk: java/org/apache/jasper/compiler/ java/org/apache/jasper/resources/ test/org/apache/jasper/compiler/ test/webapp/
On 07/03/2010 16:18, Mark Thomas wrote:
> On 07/03/2010 14:24, Konstantin Kolinko wrote:
>> Can it be related that my change to Compiler.java sets those PageInfo
>> attributes as boolean, but PageInfo stores them both as boolean and as
>> a String.
>>
>> This patch will fix that:
>> http://people.apache.org/~kkolinko/patches/2010-03-07_tc7_48668_Compiler.patch
>
> That is worth fixing but doesn't appear to be the root cause.
As far as I can tell the root cause is that some of the checks on the
JSP version supported by the tag library have been removed and in cases
where the web app version allows deferred syntax but the tag library JSP
version does not, #{...} is not being treated as a literal.
I'm looking at r919914 in more detail now to see how to resolve this.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat build error
Hi Mark, I have been using sun jdk only. Even my JAVA_HOME path looks fine. echo $JAVA_HOME /usr/lib/jvm/java-6-openjdk/ Bharath On Sun, Mar 7, 2010 at 1:15 AM, Mark Thomas wrote: > On 06/03/2010 22:05, Bharath Vasudevan wrote: > > BUILD FAILED > > java.lang.NoClassDefFoundError: gnu/classpath/Configuration > > Don't use gnu - download a Sun JDK. > > Mark > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
svn commit: r920055 - /tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Author: markt
Date: Sun Mar 7 18:45:50 2010
New Revision: 920055
URL: http://svn.apache.org/viewvc?rev=920055&view=rev
Log:
Both TLD and web.xml determine if deferred EL syntax is treated as EL or as a
literal
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=920055&r1=920054&r2=920055&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Sun Mar 7
18:45:50 2010
@@ -1075,11 +1075,16 @@
|| (!n.getRoot().isXmlSyntax() &&
attrs.getValue(i).startsWith("<%=")));
boolean elExpression = false;
boolean deferred = false;
+double libraryVersion = Double.parseDouble(
+tagInfo.getTagLibrary().getRequiredVersion());
+boolean deferredSyntaxAllowedAsLiteral =
+pageInfo.isDeferredSyntaxAllowedAsLiteral() ||
+libraryVersion < 2.1;
ELNode.Nodes el = null;
if (!runtimeExpression && !pageInfo.isELIgnored()) {
-el = ELParser.parse(attrs.getValue(i), pageInfo
-.isDeferredSyntaxAllowedAsLiteral());
+el = ELParser.parse(attrs.getValue(i),
+deferredSyntaxAllowedAsLiteral);
Iterator nodes = el.iterator();
while (nodes.hasNext()) {
ELNode node = nodes.next();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r920055 - /tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
On 07/03/2010 18:45, ma...@apache.org wrote: > Author: markt > Date: Sun Mar 7 18:45:50 2010 > New Revision: 920055 > > URL: http://svn.apache.org/viewvc?rev=920055&view=rev > Log: > Both TLD and web.xml determine if deferred EL syntax is treated as EL or as a > literal With this, the updated tests for bug48668 and the 2.2 TCK pass. I suspect that the fix still isn't 100% complete. I'm planning to add some more test cases for this. Watch this space... Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48869] New: Intermitten SSL handshake failure | Appears that client (Tomcat) is unable to send the certificate chain back
https://issues.apache.org/bugzilla/show_bug.cgi?id=48869
Summary: Intermitten SSL handshake failure | Appears that
client (Tomcat) is unable to send the certificate
chain back
Product: Tomcat 5
Version: 5.5.9
Platform: PC
OS/Version: Linux
Status: NEW
Severity: critical
Priority: P1
Component: Connector:HTTP
AssignedTo: dev@tomcat.apache.org
ReportedBy: honeybaj...@rediffmail.com
Hi,
Our application (hosted on tomcat, jdk 1.6_4 using JSSE) connects to the
external webservice.
During SSL handshake, based on the following messages, it appears that tomcat
is unable to send client certificate chain to the server after serverhello has
been received but this issue happens only intermittenly.
I have gone through following bug
https://issues.apache.org/bugzilla/show_bug.cgi?id=37869. Can someone kindly
confirm does it solve the same issue and if the patch can be used safely
against tomcat 5.5.9.
*** ClientHello, TLSv1
RandomCookie: GMT: 1250752588 bytes = { 254, 18, 193, 215, 139, 30, 229, 96,
185, 57, 70, 219, 54, 117, 98, 130, 213, 225, 17, 22, 64, 7, 118, 182, 254,
230, 98, 249 }
Session ID: {}
Cipher Suites: [SSL_RSA_WITH_RC4_128_MD5, SSL_RSA_WITH_RC4_128_SHA,
TLS_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_256_CBC_SHA,
TLS_DHE_RSA_WITH_AES_128_CBC_SHA, TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
TLS_DHE_DSS_WITH_AES_128_CBC_SHA, TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
SSL_RSA_WITH_3DES_EDE_CBC_SHA, SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA, SSL_RSA_WITH_DES_CBC_SHA,
SSL_DHE_RSA_WITH_DES_CBC_SHA, SSL_DHE_DSS_WITH_DES_CBC_SHA,
SSL_RSA_EXPORT_WITH_RC4_40_MD5, SSL_RSA_EXPORT_WITH_DES40_CBC_SHA,
SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA, SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA]
Compression Methods: { 0 }
***
RMI TCP Connection(25)-xx.xx.xx.xx, WRITE: TLSv1 Handshake, length = 79
RMI TCP Connection(25)-xx.xx.xx.xx, WRITE: SSLv2 client hello message, length =
107
RMI TCP Connection(25)-xx.xx.xx.xx, READ: TLSv1 Handshake, length = 2004
*** ServerHello, TLSv1
RandomCookie: GMT: 1250752588 bytes = { 32, 129, 54, 88, 10, 214, 152, 239,
226, 206, 229, 51, 23, 45, 165, 76, 226, 119, 151, 162, 163, 223, 246, 152,
101, 48, 142, 98 }
Session ID: {75, 141, 248, 76, 232, 162, 241, 4, 153, 104, 144, 240, 141, 215,
226, 59, 0, 212, 81, 211, 191, 80, 169, 201, 226, 238, 195, 24,254, 191, 152,
80}
Cipher Suite: TLS_RSA_WITH_AES_128_CBC_SHA
Compression Method: 0
***
%% Created: [Session-4, TLS_RSA_WITH_AES_128_CBC_SHA]
** TLS_RSA_WITH_AES_128_CBC_SHA
*** Certificate chain
chain [0] = [
[
Version: V3
Subject: emailaddress=supp...@xx.com, C=GB, ST=England, L=London, O=Xxx,
OU=EMP, CN=www.ws.xxx.co.uk
Signature Algorithm: SHA1withRSA, OID = 1.2.840.113549.1.1.5
Key: Sun RSA public key, 2048 bits
modulus:
1616261119923282323342550878009975098712541966074293428196195597211737854105818613748642824004023858168734948049667286989778383425834712580421041409153030149635322356160707012168109966921529772841768679958710576427872848032555734321947625911932054688401108479827710330827366623526241982529531925630427348578485966935492826750875858284641917095253856515172583714628445763789859607442240275914167338720348233597513648311014093918006192451527281147637064354340588151350762119918367896157881721760313234874893065293087246862013258834432826237700798003598398293316362809718059187206760048006681314966988913978521585333
public exponent: 65537
Validity: [From: Wed Apr 22 01:00:00 BST 2009,
To: Sun Apr 22 00:59:59 BST 2012]
Issuer: CN=B2B Xxx, O=Xxx
SerialNumber: [63df7cf5 89339db0 eead9c7e d6d141ae]
Certificate Extensions: 7
[1]: ObjectId: 2.5.29.14 Criticality=false
SubjectKeyIdentifier [
KeyIdentifier [
: 13 62 DA 37 9A 42 E6 D5 A9 01 66 B9 86 18 B1 04 .b.7.Bf.
0010: 61 64 69 E6adi.
]
]
[2]: ObjectId: 2.5.29.35 Criticality=false
AuthorityKeyIdentifier [
KeyIdentifier [
: 43 8A 4C B5 D6 60 34 F9 B2 35 AB B3 66 06 E8 82 C.L..`4..5..f...
0010: 74 D4 8A 5Bt..[
]
]
[3]: ObjectId: 2.5.29.17 Criticality=false
SubjectAlternativeName [
RFC822Name: supp...@xx.com
]
[4]: ObjectId: 2.5.29.31 Criticality=false
CRLDistributionPoints [
[DistributionPoint:
[URIName: http://x.x.com/Xxxx/LatestCRL.crl]
]]
[5]: ObjectId: 2.5.29.37 Criticality=false
ExtendedKeyUsages [
serverAuth
clientAuth
]
[6]: ObjectId: 2.5.29.15 Criticality=false
KeyUsage [
DigitalSignature
Key_Encipherment
]
[7]: ObjectId: 2.5.29.19 Criticality=false
BasicConstraints:[
CA:false
PathLen: undefined
]
]
Algorithm: [SHA1withRSA]
Signature:
: 80 9F BA 48 F9 31 37 48 8B 10 63 70 E6 CC 26 8C ...H.17H..cp..&.
0010: 53 89 02 D2 64 6F D7 C1 B9 0A D2 F5 6D EC 3C EE S...do..m.<.
0020: 6D 37 A9 E6 BB 58 D4 16 64 45 64 62 20 A2 D
Re: Tomcat build error
2010/3/7 Bharath Vasudevan : > > I have been using sun jdk only. Even my JAVA_HOME path looks fine. > > echo $JAVA_HOME > /usr/lib/jvm/java-6-openjdk/ > Do not be so sure. I think you self can see that gnu/classpath/Configuration in your logs. What is the value of $CLASSPATH ? http://ant.apache.org/manual/install.html It is my humble opinion, but you would better go and uninstall gcj E.g. rpm -q -a | grep gcj can mention something. (I do not know what OS you are using). Looking again at the stack trace, it looks like Ant is confused: it tries to find some "modern" compiler and initialize a wrapper around it, but cannot. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48869] Intermitten SSL handshake failure | Appears that client (Tomcat) is unable to send the certificate chain back
https://issues.apache.org/bugzilla/show_bug.cgi?id=48869 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Konstantin Kolinko 2010-03-07 20:11:13 UTC --- Are you asking Tomcat devs whether a 5.5.28 patch can be backported to 5.5.9 ?? That is support question, not a bug. http://tomcat.apache.org/bugreport.html#Bugzilla%20is%20not%20a%20support%20forum http://tomcat.apache.org/security-5.html -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r920086 - in /tomcat/jk/trunk/native/apache-2.0: Makefile.vc mod_jk.rc
Author: timw Date: Sun Mar 7 20:17:04 2010 New Revision: 920086 URL: http://svn.apache.org/viewvc?rev=920086&view=rev Log: Adding version resource for mod_jk.so on Windows. Partial fix for #43303 Added: tomcat/jk/trunk/native/apache-2.0/mod_jk.rc Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=920086&r1=920085&r2=920086&view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Sun Mar 7 20:17:04 2010 @@ -26,6 +26,7 @@ CLEAN : + -...@erase "$(INTDIR)\mod_jk.res" -...@erase "$(INTDIR)\jk_ajp12_worker.obj" -...@erase "$(INTDIR)\jk_ajp13.obj" -...@erase "$(INTDIR)\jk_ajp13_worker.obj" @@ -86,6 +87,7 @@ "$(INTDIR)\jk_url.obj" \ "$(INTDIR)\jk_util.obj" \ "$(INTDIR)\jk_worker.obj" \ + "$(INTDIR)\mod_jk.res" \ "$(INTDIR)\mod_jk.obj" "$(OUTDIR)\mod_jk.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -125,7 +127,14 @@ $(CPP_PROJ) $< << -MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 +RSC_PROJ=/l 0x809 /fo"$(INTDIR)\mod_jk.res" /d "NDEBUG" + +SOURCE=.\mod_jk.rc + +"$(INTDIR)\mod_jk.res" : $(SOURCE) "$(INTDIR)" + $(RSC) $(RSC_PROJ) $(SOURCE) + SOURCE=..\common\jk_ajp12_worker.c Added: tomcat/jk/trunk/native/apache-2.0/mod_jk.rc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.rc?rev=920086&view=auto == --- tomcat/jk/trunk/native/apache-2.0/mod_jk.rc (added) +++ tomcat/jk/trunk/native/apache-2.0/mod_jk.rc Sun Mar 7 20:17:04 2010 @@ -0,0 +1,97 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +/ +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +/ +#undef APSTUDIO_READONLY_SYMBOLS + +/ +// English (New Zealand) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENZ) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_NZ +#pragma code_page(1252) +#endif //_WIN32 + +/ +// +// Version +// + +1 VERSIONINFO + FILEVERSION 1,2,31,0 + PRODUCTVERSION 1,2,31,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN +BLOCK "StringFileInfo" +BEGIN +BLOCK "040904b0" +BEGIN +VALUE "Comments", "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\r\n\r\nhttp://www.apache.org/licenses/LICENSE-2.0\r\n\r\nUnless 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. See the License for the specific language governing permissions and limitations under the License." +VALUE "CompanyName", "Apache Software Foundation" +VALUE "FileDescription", "Apache Tomcat Connector for Apache 2.x" +VALUE "FileVersion", "1.2.31" +VALUE "InternalName", "mod_jk-1.2.31" +VALUE "LegalCopyright", "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership." +VALUE "OriginalFilename", "mod_jk-1.2.31.so" +VALUE "ProductName", "Apache Tomcat Connectors project" +VALUE "ProductVersion", "1.2.31" +END +END +BLOCK "VarFileInfo" +BEGIN +VALUE "Translation", 0x409, 1200 +END +END + + +#ifdef APSTUDIO_INVOKED +/ +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN +"resource.h\0" +END + + +3 TEXTINCLUDE +BEGIN +"\r\n" +END + +#endif// APSTUDIO_INVOKED + +#endif// English (New Zealand) resources +/ + + + +#ifndef APSTUDIO_INVOKED +/ +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/ +#endif// not APSTUDI
svn commit: r920087 - /tomcat/jk/trunk/HOWTO-RELEASE.txt
Author: timw Date: Sun Mar 7 20:20:03 2010 New Revision: 920087 URL: http://svn.apache.org/viewvc?rev=920087&view=rev Log: Adding mod_jk.rc to list of files needing version number updates on release. Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/HOWTO-RELEASE.txt?rev=920087&r1=920086&r2=920087&view=diff == --- tomcat/jk/trunk/HOWTO-RELEASE.txt (original) +++ tomcat/jk/trunk/HOWTO-RELEASE.txt Sun Mar 7 20:20:03 2010 @@ -137,6 +137,7 @@ native/common/jk_version.h: Update variables JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERSTRING, and JK_VERISRELEASE. native/common/portable.h.sample: Update VERSION define. +native/apache-2.0/mod_jk.rc: Update JK_VERSION_STR, FILEVERSION, and PRODUCTVERSION native/iis/isapi_redirect.rc: Update JK_VERSION_STR, FILEVERSION, and PRODUCTVERSION native/iis/installer/isapi-redirector-win32-msi.ism: Update ProductVersion. xdocs/miscellaneous/changelog.xml: Start a new section for the new version. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48869] Intermitten SSL handshake failure | Appears that client (Tomcat) is unable to send the certificate chain back
https://issues.apache.org/bugzilla/show_bug.cgi?id=48869 --- Comment #2 from hbajaj 2010-03-07 20:21:25 UTC --- Hi, I have just added the patch as a reference, I am not sure whether that patch addresses this issue or is it a new issue. Thanks, -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 43303] Versioning under Windows not reported by many connector components
https://issues.apache.org/bugzilla/show_bug.cgi?id=43303 --- Comment #3 from Tim Whittington 2010-03-07 20:22:29 UTC --- Version resource for mod_jk.so on Windows has been committed. This will be picked up in the Makefile build, but not the .dsp build (since I'm unable to test those). -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r920092 - in /tomcat/trunk/test: org/apache/jasper/compiler/TestJspConfig.java webapp-2.3/no-el.jsp
Author: markt
Date: Sun Mar 7 20:29:39 2010
New Revision: 920092
URL: http://svn.apache.org/viewvc?rev=920092&view=rev
Log:
Extend the no-el test to cover deferred expressions
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
tomcat/trunk/test/webapp-2.3/no-el.jsp
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=920092&r1=920091&r2=920092&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Sun Mar 7
20:29:39 2010
@@ -41,6 +41,7 @@
String result = res.toString();
assertTrue(result.indexOf("00-${'hello world'}") > 0);
+assertTrue(result.indexOf("01-#{'hello world'}") > 0);
}
}
Modified: tomcat/trunk/test/webapp-2.3/no-el.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.3/no-el.jsp?rev=920092&r1=920091&r2=920092&view=diff
==
--- tomcat/trunk/test/webapp-2.3/no-el.jsp (original)
+++ tomcat/trunk/test/webapp-2.3/no-el.jsp Sun Mar 7 20:29:39 2010
@@ -17,5 +17,6 @@
00-${'hello world'}
+01-#{'hello world'}
\ No newline at end of file
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r920093 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/reference/iis.xml
Author: timw
Date: Sun Mar 7 20:31:45 2010
New Revision: 920093
URL: http://svn.apache.org/viewvc?rev=920093&view=rev
Log:
Adding basic log rotation functionality to the ISAPI redirector - #48501
Config and functionality is modeled after the Apache HTTPD rotatelogs program
for consistency.
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/xdocs/reference/iis.xml
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=920093&r1=920092&r2=920093&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sun Mar 7 20:31:45 2010
@@ -128,6 +128,9 @@
#define ENABLE_CHUNKED_ENCODING_TAG ("enable_chunked_encoding")
#define ERROR_PAGE_TAG ("error_page")
+#define LOG_ROTATION_TIME_TAG ("log_rotationtime")
+#define LOG_FILESIZE_TAG("log_filesize")
+
/* HTTP standard headers */
#define TRANSFER_ENCODING_CHUNKED_HEADER_COMPLETE ("Transfer-Encoding:
chunked")
#define TRANSFER_ENCODING_CHUNKED_HEADER_COMPLETE_LEN (26)
@@ -479,6 +482,7 @@
static jk_map_t *jk_environment_map = NULL;
static jk_logger_t *logger = NULL;
+static JK_CRIT_SEC log_cs;
static char *SERVER_NAME = "SERVER_NAME";
static char *SERVER_SOFTWARE = "SERVER_SOFTWARE";
static char *INSTANCE_ID = "INSTANCE_ID";
@@ -487,7 +491,12 @@
static char extension_uri[INTERNET_MAX_URL_LENGTH] =
"/jakarta/isapi_redirect.dll";
static char log_file[MAX_PATH * 2];
+static char log_file_effective[MAX_PATH * 2];
static int log_level = JK_LOG_DEF_LEVEL;
+static long log_rotationtime = 0;
+static time_t log_next_rotate_time = 0;
+static ULONGLONG log_filesize = 0;
+
static char worker_file[MAX_PATH * 2];
static char worker_mount_file[MAX_PATH * 2] = {0};
static int worker_mount_reload = JK_URIMAP_DEF_RELOAD;
@@ -557,6 +566,10 @@
static int init_jk(char *serverName);
+
+static int JK_METHOD iis_log_to_file(jk_logger_t *l, int level,
+int used, char *what);
+
static BOOL initialize_extension(void);
static int read_registry_init_data(void);
@@ -2273,9 +2286,11 @@
}
wc_close(logger);
jk_shm_close();
+JK_ENTER_CS(&(log_cs), rc);
if (logger) {
jk_close_file_logger(&logger);
}
+JK_LEAVE_CS(&(log_cs), rc);
}
JK_LEAVE_CS(&(init_cs), rc);
@@ -2335,6 +2350,7 @@
StringCbPrintf(HTTP_WORKER_HEADER_INDEX, MAX_PATH,
HTTP_HEADER_TEMPLATE, WORKER_HEADER_INDEX_BASE, hInst);
JK_INIT_CS(&init_cs, rc);
+JK_INIT_CS(&log_cs, rc);
break;
case DLL_PROCESS_DETACH:
@@ -2344,6 +2360,7 @@
__except(1) {
}
JK_DELETE_CS(&init_cs, rc);
+JK_DELETE_CS(&log_cs, rc);
break;
default:
@@ -2387,17 +2404,147 @@
return 0;
}
+/*
+ * Reinitializes the logger, formatting the log file name if rotation is
enabled,
+ * and calculating the next rotation time if applicable.
+ */
+static int init_logger(int rotate, jk_logger_t **l)
+{
+int rc = JK_TRUE;
+int log_open = rotate; /* log is assumed open if a rotate is requested */
+char *log_file_name;
+char log_file_name_buf[MAX_PATH*2];
+
+/* If log rotation is enabled, format the log filename */
+if ((log_rotationtime > 0) || (log_filesize > 0)) {
+time_t t;
+t = time(NULL);
+
+if (log_rotationtime > 0) {
+/* Align time to rotationtime intervals */
+t = (t / log_rotationtime) * log_rotationtime;
+
+/* Calculate rotate time */
+log_next_rotate_time = t + log_rotationtime;
+}
+
+log_file_name = log_file_name_buf;
+if (strchr(log_file, '%')) {
+struct tm *tm_now;
+
+/* If there are %s in the log file name, treat it as a sprintf
format */
+tm_now = localtime(&t);
+strftime(log_file_name, sizeof(log_file_name_buf), log_file,
tm_now);
+} else {
+/* Otherwise append the number of seconds to the base name */
+sprintf_s(log_file_name, sizeof(log_file_name_buf), "%s.%d",
log_file, (long)t);
+}
+} else {
+log_file_name = log_file;
+}
+
+/* Close the current log file if required, and the effective log file name
has changed */
+if (log_open && strncmp(log_file_name, log_file_effective,
strlen(log_file_name)) != 0) {
+FILE* lf = ((jk_file_logger_t* )logger->logger_private)->logfile;
+fprintf_s(lf, "Log rotated to %s\r\n", log_file_name);
+fflush(lf);
+
+rc = jk_close_file_logger(&logger);
+log_open = JK_FALSE;
+}
+
+if (!log_open) {
+if (jk_open_file_logger(&logger, log_file_name, log_level)) {
+logger->log = iis_log_to_file;
+
+/
svn commit: r920096 - in /tomcat/trunk/test: org/apache/jasper/compiler/TestValidator.java webapp-3.0/WEB-INF/tags11.tld webapp-3.0/WEB-INF/tags12.tld webapp-3.0/WEB-INF/tags20.tld webapp-3.0/WEB-INF/
Author: markt
Date: Sun Mar 7 20:32:26 2010
New Revision: 920096
URL: http://svn.apache.org/viewvc?rev=920096&view=rev
Log:
Test that tags from libraries that declare various JSP versions have EL and
deferred EL enabled/disabled as appropriate.
This currently triggers a failure - fix to follow shortly.
Added:
tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld (with props)
tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld (with props)
tomcat/trunk/test/webapp-3.0/WEB-INF/tags20.tld (with props)
tomcat/trunk/test/webapp-3.0/WEB-INF/tags21.tld (with props)
tomcat/trunk/test/webapp-3.0/tld-versions.jsp (with props)
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=920096&r1=920095&r2=920096&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java Sun Mar 7
20:32:26 2010
@@ -20,8 +20,12 @@
import java.io.File;
import java.io.IOException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
public class TestValidator extends TomcatBaseTest {
@@ -45,4 +49,54 @@
// Failure is expected
assertNotNull(e);
}
+
+
+public void testTldVersions30() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir =
+new File("test/webapp-3.0");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/tld-versions.jsp");
+
+String result = res.toString();
+
+assertTrue(result.indexOf("${'00-hello world'}") > 0);
+assertTrue(result.indexOf("#{'01-hello world'}") > 0);
+assertTrue(result.indexOf("${'02-hello world'}") > 0);
+assertTrue(result.indexOf("#{'03-hello world'}") > 0);
+assertTrue(result.indexOf("04-hello world") > 0);
+assertTrue(result.indexOf("#{'05-hello world'}") > 0);
+assertTrue(result.indexOf("06-hello world") > 0);
+}
+
+public static class Echo extends TagSupport {
+
+private static final long serialVersionUID = 1L;
+
+private String echo = null;
+
+public void setEcho(String echo) {
+this.echo = echo;
+}
+
+public String getEcho() {
+return echo;
+}
+
+@Override
+public int doStartTag() throws JspException {
+try {
+pageContext.getOut().print("" + echo + "");
+} catch (IOException e) {
+pageContext.getServletContext().log("Tag (Echo21) failure", e);
+}
+return super.doStartTag();
+}
+}
}
Added: tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld?rev=920096&view=auto
==
--- tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld (added)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld Sun Mar 7 20:32:26 2010
@@ -0,0 +1,36 @@
+
+http://java.sun.com/dtd/web-jsptaglibrary_1_1.dtd";>
+
+ 1.0
+ 1.1
+ Tags11
+ http://tomcat.apache.org/tags11
+
+
+Echo
+org.apache.jasper.compiler.TestValidator$Echo
+empty
+
+ echo
+ yes
+
+
+
+
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp-3.0/WEB-INF/tags11.tld
--
svn:eol-style = native
Added: tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld?rev=920096&view=auto
==
--- tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld (added)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld Sun Mar 7 20:32:26 2010
@@ -0,0 +1,36 @@
+
+http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd";>
+
+ 1.0
+ 1.2
+ Tags12
+ http://tomcat.apache.org/tags12
+
+
+Echo
+org.apache.jasper.compiler.TestValidator$Echo
+empty
+
+ echo
+ yes
+
+
+
+
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp-3.0/WEB-INF/tags12.tld
--
svn:eol-style = native
Added: tomcat/trunk/test/webapp-3.0/WEB-INF/tags20.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/te
Re: svn commit: r920055 - /tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
2010/3/7 Mark Thomas : > On 07/03/2010 18:45, ma...@apache.org wrote: >> Author: markt >> Date: Sun Mar 7 18:45:50 2010 >> New Revision: 920055 >> >> URL: http://svn.apache.org/viewvc?rev=920055&view=rev >> Log: >> Both TLD and web.xml determine if deferred EL syntax is treated as EL or as >> a literal Ah, I see. That is said in the chapter "Backwards Compatibility with JSP 2.0" that precedes the main spec pages (page xxiv in JSP 2.2 Specification). Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48501] Log rotation for ISAPI Redirector
https://issues.apache.org/bugzilla/show_bug.cgi?id=48501 --- Comment #5 from Tim Whittington 2010-03-07 20:46:04 UTC --- Implementation of this is now committed to trunk. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r920109 - in /tomcat/trunk/test: org/apache/jasper/compiler/ webapp-2.3/ webapp-2.3/WEB-INF/ webapp-2.4/ webapp-2.4/WEB-INF/ webapp-2.5/ webapp-2.5/WEB-INF/ webapp-3.0/
Author: markt
Date: Sun Mar 7 20:51:34 2010
New Revision: 920109
URL: http://svn.apache.org/viewvc?rev=920109&view=rev
Log:
Rename no-el to el-as-literal
Add tests for 2.3, 2.4 & 2.5 webapps with Tag libraries that require various
JSP versions
These currently all work and I think some should fail - looking into that next
Added:
tomcat/trunk/test/webapp-2.3/WEB-INF/tags11.tld (with props)
tomcat/trunk/test/webapp-2.3/WEB-INF/tags12.tld (with props)
tomcat/trunk/test/webapp-2.3/WEB-INF/tags20.tld (with props)
tomcat/trunk/test/webapp-2.3/WEB-INF/tags21.tld (with props)
tomcat/trunk/test/webapp-2.3/el-as-literal.jsp
- copied unchanged from r920092, tomcat/trunk/test/webapp-2.3/no-el.jsp
tomcat/trunk/test/webapp-2.3/tld-versions.jsp (with props)
tomcat/trunk/test/webapp-2.4/
tomcat/trunk/test/webapp-2.4/WEB-INF/
tomcat/trunk/test/webapp-2.4/WEB-INF/tags11.tld (with props)
tomcat/trunk/test/webapp-2.4/WEB-INF/tags12.tld (with props)
tomcat/trunk/test/webapp-2.4/WEB-INF/tags20.tld (with props)
tomcat/trunk/test/webapp-2.4/WEB-INF/tags21.tld (with props)
tomcat/trunk/test/webapp-2.4/WEB-INF/web.xml (with props)
tomcat/trunk/test/webapp-2.4/el-as-literal.jsp (with props)
tomcat/trunk/test/webapp-2.4/tld-versions.jsp (with props)
tomcat/trunk/test/webapp-2.5/
tomcat/trunk/test/webapp-2.5/WEB-INF/
tomcat/trunk/test/webapp-2.5/WEB-INF/tags11.tld (with props)
tomcat/trunk/test/webapp-2.5/WEB-INF/tags12.tld (with props)
tomcat/trunk/test/webapp-2.5/WEB-INF/tags20.tld (with props)
tomcat/trunk/test/webapp-2.5/WEB-INF/tags21.tld (with props)
tomcat/trunk/test/webapp-2.5/WEB-INF/web.xml (with props)
tomcat/trunk/test/webapp-2.5/el-as-literal.jsp (with props)
tomcat/trunk/test/webapp-2.5/tld-versions.jsp (with props)
tomcat/trunk/test/webapp-3.0/el-as-literal.jsp (with props)
Removed:
tomcat/trunk/test/webapp-2.3/no-el.jsp
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java?rev=920109&r1=920108&r2=920109&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspConfig.java Sun Mar 7
20:51:34 2010
@@ -36,7 +36,7 @@
tomcat.start();
ByteChunk res = getUrl("http://localhost:"; + getPort() +
-"/test/no-el.jsp");
+"/test/el-as-literal.jsp");
String result = res.toString();
@@ -44,4 +44,59 @@
assertTrue(result.indexOf("01-#{'hello world'}") > 0);
}
+public void testServlet24NoEL() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir =
+new File("test/webapp-2.4");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/el-as-literal.jsp");
+
+String result = res.toString();
+
+assertTrue(result.indexOf("00-hello world") > 0);
+assertTrue(result.indexOf("01-#{'hello world'}") > 0);
+}
+
+public void testServlet25NoEL() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir =
+new File("test/webapp-2.5");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/el-as-literal.jsp");
+
+String result = res.toString();
+
+assertTrue(result.indexOf("00-hello world") > 0);
+}
+
+public void testServlet30NoEL() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir =
+new File("test/webapp-3.0");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/el-as-literal.jsp");
+
+String result = res.toString();
+
+assertTrue(result.indexOf("00-hello world") > 0);
+}
+
}
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java?rev=920109&r1=920108&r2=920109&view=diff
==
--- tomcat/trunk/test/org/apa
svn commit: r920110 - /tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Author: markt
Date: Sun Mar 7 20:54:01 2010
New Revision: 920110
URL: http://svn.apache.org/viewvc?rev=920110&view=rev
Log:
isELIgnored depends on library version and web.xml declaration
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=920110&r1=920109&r2=920110&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Sun Mar 7
20:54:01 2010
@@ -1077,12 +1077,15 @@
boolean deferred = false;
double libraryVersion = Double.parseDouble(
tagInfo.getTagLibrary().getRequiredVersion());
+boolean elIgnored =
+pageInfo.isELIgnored() ||
+libraryVersion < 2.0;
boolean deferredSyntaxAllowedAsLiteral =
pageInfo.isDeferredSyntaxAllowedAsLiteral() ||
libraryVersion < 2.1;
ELNode.Nodes el = null;
-if (!runtimeExpression && !pageInfo.isELIgnored()) {
+if (!runtimeExpression && !elIgnored) {
el = ELParser.parse(attrs.getValue(i),
deferredSyntaxAllowedAsLiteral);
Iterator nodes = el.iterator();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r920111 - /tomcat/jk/trunk/native/STATUS.txt
Author: timw Date: Sun Mar 7 20:56:04 2010 New Revision: 920111 URL: http://svn.apache.org/viewvc?rev=920111&view=rev Log: Updating status with 1.2.29/30/31 details. Modified: tomcat/jk/trunk/native/STATUS.txt Modified: tomcat/jk/trunk/native/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=920111&r1=920110&r2=920111&view=diff == --- tomcat/jk/trunk/native/STATUS.txt (original) +++ tomcat/jk/trunk/native/STATUS.txt Sun Mar 7 20:56:04 2010 @@ -18,7 +18,9 @@ Release: -1.2.29 : in development +1.2.31 : in development +1.2.30 : released March 1, 2010 +1.2.29 : released February 26, 2010, withdrawn February 27, 2010 1.2.28 : released March 22, 2009 1.2.27 : released October 28, 2008 1.2.26 : released December 21, 2007 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r920112 - /tomcat/jk/trunk/native/TODO.txt
Author: timw Date: Sun Mar 7 20:57:35 2010 New Revision: 920112 URL: http://svn.apache.org/viewvc?rev=920112&view=rev Log: Updating todos Modified: tomcat/jk/trunk/native/TODO.txt Modified: tomcat/jk/trunk/native/TODO.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/TODO.txt?rev=920112&r1=920111&r2=920112&view=diff == --- tomcat/jk/trunk/native/TODO.txt (original) +++ tomcat/jk/trunk/native/TODO.txt Sun Mar 7 20:57:35 2010 @@ -86,7 +86,7 @@ a) Allow logging of request url or uuid in jk log to ease matching with access log. -b) Implement log rotation for IIS. +b) Implement log rotation for IIS. (done in 1.2.31) c) Allow adding of log notes for IIS like we do with Apache. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat build error
My classpath is set for the tomcat working directory. Looks like apache.ant.org is down now (so couldnt see what it should be set to). echo $CLASSPATH /usr/share/tomcat6/lib/servlet-api.jar I am working on a ubuntu server edition. I had ant-gcj installed previously. Removed it now and tried it. Still its failing with the same error. sudo dpkg --get-selections | grep gcj gcj-4.4-basepurge gcj-4.4-jre-lib install libgcj-bc install libgcj-common install libgcj10install On Sun, Mar 7, 2010 at 12:04 PM, Konstantin Kolinko wrote: > 2010/3/7 Bharath Vasudevan : > > > > I have been using sun jdk only. Even my JAVA_HOME path looks fine. > > > > echo $JAVA_HOME > > /usr/lib/jvm/java-6-openjdk/ > > > > Do not be so sure. I think you self can see that > gnu/classpath/Configuration in your logs. > > What is the value of $CLASSPATH ? > http://ant.apache.org/manual/install.html > > It is my humble opinion, but you would better go and uninstall gcj > E.g. rpm -q -a | grep gcj can mention something. > (I do not know what OS you are using). > > > Looking again at the stack trace, it looks like Ant is confused: it > tries to find some "modern" compiler and initialize a wrapper around > it, but cannot. > > 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: r920119 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: timw
Date: Sun Mar 7 21:23:01 2010
New Revision: 920119
URL: http://svn.apache.org/viewvc?rev=920119&view=rev
Log:
Fix #38895 - use ALL_RAW to obtain HTTP headers by default, instead of
ALL_HTTP, which obtains CGI style headers (and does lowercase and '_' -> '-'
conversions on header names).
Old behaviour is available by defining USE_CGI_HEADERS.
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=920119&r1=920118&r2=920119&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sun Mar 7 21:23:01 2010
@@ -75,7 +75,7 @@
#define WORKER_HEADER_NAME_BASE ("TOMCATWORKER")
#define WORKER_HEADER_INDEX_BASE ("TOMCATWORKERIDX")
#define TOMCAT_TRANSLATE_HEADER_NAME_BASE ("TOMCATTRANSLATE")
-#ifdef USE_RAW_HEADERS
+#ifndef USE_CGI_HEADERS
#define CONTENT_LENGTH("CONTENT-LENGTH:")
#else
#define CONTENT_LENGTH("CONTENT_LENGTH:")
@@ -83,7 +83,7 @@
/* The HTTP_ form of the header for use in ExtensionProc */
#define HTTP_HEADER_PREFIX "HTTP_"
-#ifndef USE_RAW_HEADERS
+#ifdef USE_CGI_HEADERS
#define HTTP_HEADER_PREFIX_LEN 5
#endif
@@ -436,7 +436,7 @@
#define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)")
-#ifndef USE_RAW_HEADERS
+#ifdef USE_CGI_HEADERS
#define JK_TOLOWER(x) ((char)tolower((BYTE)(x)))
#endif
@@ -3127,7 +3127,7 @@
huge_buf_sz = MAX_PACKET_SIZE;
if (get_server_value(private_data->lpEcb,
-#ifdef USE_RAW_HEADERS
+#ifndef USE_CGI_HEADERS
"ALL_RAW", huge_buf, huge_buf_sz)) {
#else
"ALL_HTTP", huge_buf, huge_buf_sz)) {
@@ -3171,7 +3171,7 @@
for (i = 0, tmp = headers_buf; *tmp && i < cnt;) {
int real_header = JK_TRUE;
-#ifndef USE_RAW_HEADERS
+#ifdef USE_CGI_HEADERS
/* Skip the HTTP_ prefix to the beginning of the header name */
tmp += HTTP_HEADER_PREFIX_LEN;
#endif
@@ -3218,7 +3218,7 @@
}
while (':' != *tmp && *tmp) {
-#ifndef USE_RAW_HEADERS
+#ifdef USE_CGI_HEADERS
if (real_header) {
if ('_' == *tmp) {
*tmp = '-';
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r920120 - /tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
Author: markt
Date: Sun Mar 7 21:25:37 2010
New Revision: 920120
URL: http://svn.apache.org/viewvc?rev=920120&view=rev
Log:
Fix intermittent test failures
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java?rev=920120&r1=920119&r2=920120&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java Sun Mar 7
21:25:37 2010
@@ -144,8 +144,11 @@
os.write("GET /examples/servlets/servlet/HelloWorldExample
HTTP/1.0\n".getBytes());
os.flush();
+
InputStream is = socket.getInputStream();
+// Make sure the NIO connector has read the request before the
handshake
+Thread.sleep(100);
socket.startHandshake();
handshakeDone = false;
byte[] b = new byte[0];
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r920055 - /tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
2010/3/7 Konstantin Kolinko :
> 2010/3/7 Mark Thomas :
>> On 07/03/2010 18:45, ma...@apache.org wrote:
>>> Author: markt
>>> Date: Sun Mar 7 18:45:50 2010
>>> New Revision: 920055
>>>
>>> URL: http://svn.apache.org/viewvc?rev=920055&view=rev
>>> Log:
>>> Both TLD and web.xml determine if deferred EL syntax is treated as EL or as
>>> a literal
>
> Ah, I see. That is said in the chapter "Backwards Compatibility with
> JSP 2.0" that precedes the main spec pages (page xxiv in JSP 2.2
> Specification).
>
> Best regards,
> Konstantin Kolinko
>
Re: r920110:
2010/3/7 :
> Author: markt
> Date: Sun Mar 7 20:54:01 2010
> New Revision: 920110
>
> URL: http://svn.apache.org/viewvc?rev=920110&view=rev
> Log:
> isELIgnored depends on library version and web.xml declaration
>
> Modified:
>tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
> =
> --- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
> +++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Sun Mar 7
> 20:54:01 2010
> @@ -1077,12 +1077,15 @@
> boolean deferred = false;
> double libraryVersion = Double.parseDouble(
> tagInfo.getTagLibrary().getRequiredVersion());
> +boolean elIgnored =
> +pageInfo.isELIgnored() ||
> +libraryVersion < 2.0;
> boolean deferredSyntaxAllowedAsLiteral =
> pageInfo.isDeferredSyntaxAllowedAsLiteral() ||
> libraryVersion < 2.1;
>
> ELNode.Nodes el = null;
> -if (!runtimeExpression && !pageInfo.isELIgnored()) {
> +if (!runtimeExpression && !elIgnored) {
> el = ELParser.parse(attrs.getValue(i),
> deferredSyntaxAllowedAsLiteral);
> Iterator nodes = el.iterator();
>
I see no provision in the spec for the above change.
The chapter "Backwards Compatibility with JSP 2.0" that I mentioned above
does say that only about #{} expressions.
The chapter "Backwards Compatibility with JSP 1.2" of JSP 2.0 spec
(page 20/478) or JSP.3.3.2 Deactivating EL Evaluation of JSP 2.0 spec
(page 123/478) do not mention that either.
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: r920121 - /tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Author: timw Date: Sun Mar 7 21:26:58 2010 New Revision: 920121 URL: http://svn.apache.org/viewvc?rev=920121&view=rev Log: Updating changelog with recent commits. Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=920121&r1=920120&r2=920121&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sun Mar 7 21:26:58 2010 @@ -26,6 +26,7 @@ Mladen Turk Rainer Jung Henri Gomez +Tim Whittington Changelog @@ -39,6 +40,24 @@ new documentation project for JK was started. + + + + + +Apache: Added version number resource for mod_jk.so on Windows. (timw) + + +IIS: Added rotatelogs style log rotation to ISAPI Redirector. (timw) + + +38895: IIS: Use RAW headers instead of CGI headers by default + to prevent conversion of underscores '_' to hyphens '-' in header names. + Old behaviour can be enabled by defining USE_CGI_HEADERS. (timw) + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 38895] Http headers with an underscore "_" change into hypen "-"
https://issues.apache.org/bugzilla/show_bug.cgi?id=38895 Tim Whittington changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Tim Whittington 2010-03-07 21:28:28 UTC --- Changed the default behaviour to use ALL_RAW instead of ALL_HTTP to obtain headers, which prevents the CGI style header name munging. Old behaviour is available by defining USE_CGI_HEADERS. Will be part of 1.2.31 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r920122 - in /tomcat/trunk/java/org/apache/catalina: ./ core/ ha/context/ startup/
Author: markt
Date: Sun Mar 7 21:30:32 2010
New Revision: 920122
URL: http://svn.apache.org/viewvc?rev=920122&view=rev
Log:
Lifecycle refactoring - ContainerBase
Adds a new CONFIGURE event to allow Context to fire the START event at the
right time
Context fires START a little later
ReplicatedContext takes advantage of LifecycleBase ensuring start() is only
called once
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/Lifecycle.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=920122&r1=920121&r2=920122&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Sun Mar 7 21:30:32 2010
@@ -119,14 +119,6 @@
/**
- * Set the application available flag for this Context.
- *
- * @param available The new application available flag
- */
-public void setAvailable(boolean available);
-
-
-/**
* Return the Locale to character set mapper for this Context.
*/
public CharsetMapper getCharsetMapper();
Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Lifecycle.java?rev=920122&r1=920121&r2=920122&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java Sun Mar 7 21:30:32
2010
@@ -127,6 +127,15 @@
public static final String PERIODIC_EVENT = "periodic";
+/**
+ * The LifecycleEvent type for the "configure" event. Use by those
+ * components that use a separate component to perform configuration and
+ * need to signal when configuration should be performed - usually after
+ * {...@link #BEFORE_START_EVENT} and before {...@link #START_EVENT}.
+ */
+public static final String CONFIGURE_EVENT = "configure";
+
+
// - Public Methods
@@ -208,7 +217,5 @@
*
* @return The current state of the source component.
*/
-// TODO Remove this comment once all components that implement Lifecycle
-// have had this method added
-//public LifecycleState getState();
+public LifecycleState getState();
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=920122&r1=920121&r2=920122&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Sun Mar 7
21:30:32 2010
@@ -44,7 +44,7 @@
import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.LifecycleState;
import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
import org.apache.catalina.Pipeline;
@@ -52,7 +52,7 @@
import org.apache.catalina.Valve;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.util.LifecycleSupport;
+import org.apache.catalina.util.LifecycleBase;
import org.apache.tomcat.util.res.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -122,7 +122,7 @@
* @author Craig R. McClanahan
*/
-public abstract class ContainerBase
+public abstract class ContainerBase extends LifecycleBase
implements Container, MBeanRegistration {
private static final org.apache.juli.logging.Log log=
@@ -168,12 +168,6 @@
/**
- * The lifecycle event support for this component.
- */
-protected LifecycleSupport lifecycle = new LifecycleSupport(this);
-
-
-/**
* The container event listeners for this Container.
*/
protected ArrayList listeners = new
ArrayList();
@@ -254,10 +248,8 @@
/**
- * Has this component been started?
+ * Has th
svn commit: r920123 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Sun Mar 7 21:30:54 2010 New Revision: 920123 URL: http://svn.apache.org/viewvc?rev=920123&view=rev Log: Update change log 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=920123&r1=920122&r2=920123&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 7 21:30:54 2010 @@ -32,10 +32,14 @@ - + +Update Servlet support to the Servlet 3.0 specification. Note +asynchronous support is not yet complete. (markt/fhanik) + + 46925: Replace recursive search for nested roles with iterative search. Patch provided by Stefan Zoerner. (rjung) @@ -109,6 +113,11 @@ directories and/or WAR files to be mapped to paths within the context. (markt) + +Provide clearer definition of Lifecycle interface, particularly start +and stop, and align components that implement Lifecycle with this +definition. (markt) + @@ -155,6 +164,12 @@ +Update JSP support to the JSP 2.2 specification. (markt) + + +Update EL support to the EL 2.2 specification. (markt) + + 787978 Use "1.6" as the default value for compilerSourceVM and compilerTargetVM options of Jasper. (kkolinko) @@ -195,9 +210,13 @@ in the documentation. (fhanik) -A number of additional roles were added to the Manager application to -separate out permissions for the HTML interface, the text interface and -the JMX proxy. (markt) +A number of additional roles were added to the Manager and Host Manager +applications to separate out permissions for the HTML interface, the +text interface and the JMX proxy. (markt) + + +CSRF protection was added to the Manager and Host Manager applications. +(markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 38895] Http headers with an underscore "_" change into hyphen "-"
https://issues.apache.org/bugzilla/show_bug.cgi?id=38895 Konstantin Kolinko changed: What|Removed |Added Summary|Http headers with an|Http headers with an |underscore "_" change into |underscore "_" change into |hypen "-" |hyphen "-" -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: Tomcat build error
On 07/03/2010 21:14, Bharath Vasudevan wrote: > My classpath is set for the tomcat working directory. Looks like > apache.ant.org is down now (so couldnt see what it should be set to). That is ant.apache.org As you'll see from http://monitoring.apache.org/status/ it is the EU mirror that is down. The infra team is updating DNS to use the US mirror as I tyope. You can force the use of the US mirror using ant.us.apache.org > echo $CLASSPATH > /usr/share/tomcat6/lib/servlet-api.jar Irrelevant. Again. Use a complier from Sun. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Enable RAW headers by default in IIS Tomcat connector
I've committed this change now. I replaced USE_RAW_HEADERS with USE_CGI_HEADERS, and inverted all the conditionals. cheers tim On Mon, Feb 8, 2010 at 9:13 PM, Tim Whittington wrote: > OK, the most conservative change will be to enable USE_RAW_HEADERS in the > makefiles/projects and leave the code untouched - I'll make the change after > 1.2.29 is out. > > cheers > tim > > > On Mon, Feb 8, 2010 at 9:03 PM, Rainer Jung wrote: > >> On 08.02.2010 08:46, Mladen Turk wrote: >> >>> On 02/08/2010 08:38 AM, Tim Whittington wrote: >>> There's a USE_RAW_HEADERS define that will force the use of the raw HTTP headers and avoid this problem, so I'd propose that we make that behaviour the default. >>> >>> I agree with having it default, but is it possible to have additional >>> configure option that would allow legacy mode? >>> >> >> I agree. I'm not sure, whether there could be some compatibility problems >> with existing apps, so changing default but still being able to switch back >> lets us move forward and in case someone complains he can switch back. >> >> Regards, >> >> Rainer >> >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> >
Re: svn commit: r920055 - /tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
On 07/03/2010 21:26, Konstantin Kolinko wrote:
> 2010/3/7 Konstantin Kolinko :
>> 2010/3/7 Mark Thomas :
>>> On 07/03/2010 18:45, ma...@apache.org wrote:
Author: markt
Date: Sun Mar 7 18:45:50 2010
New Revision: 920055
URL: http://svn.apache.org/viewvc?rev=920055&view=rev
Log:
Both TLD and web.xml determine if deferred EL syntax is treated as EL or
as a literal
>>
>> Ah, I see. That is said in the chapter "Backwards Compatibility with
>> JSP 2.0" that precedes the main spec pages (page xxiv in JSP 2.2
>> Specification).
>>
>> Best regards,
>> Konstantin Kolinko
>>
>
> Re: r920110:
>
> 2010/3/7 :
>> Author: markt
>> Date: Sun Mar 7 20:54:01 2010
>> New Revision: 920110
>>
>> URL: http://svn.apache.org/viewvc?rev=920110&view=rev
>> Log:
>> isELIgnored depends on library version and web.xml declaration
>>
>> Modified:
>>tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
>> =
>> --- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
>> +++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Sun Mar 7
>> 20:54:01 2010
>> @@ -1077,12 +1077,15 @@
>> boolean deferred = false;
>> double libraryVersion = Double.parseDouble(
>> tagInfo.getTagLibrary().getRequiredVersion());
>> +boolean elIgnored =
>> +pageInfo.isELIgnored() ||
>> +libraryVersion < 2.0;
>> boolean deferredSyntaxAllowedAsLiteral =
>> pageInfo.isDeferredSyntaxAllowedAsLiteral() ||
>> libraryVersion < 2.1;
>>
>> ELNode.Nodes el = null;
>> -if (!runtimeExpression && !pageInfo.isELIgnored()) {
>> +if (!runtimeExpression && !elIgnored) {
>> el = ELParser.parse(attrs.getValue(i),
>> deferredSyntaxAllowedAsLiteral);
>> Iterator nodes = el.iterator();
>>
>
> I see no provision in the spec for the above change.
>
> The chapter "Backwards Compatibility with JSP 2.0" that I mentioned above
> does say that only about #{} expressions.
>
> The chapter "Backwards Compatibility with JSP 1.2" of JSP 2.0 spec
> (page 20/478) or JSP.3.3.2 Deactivating EL Evaluation of JSP 2.0 spec
> (page 123/478) do not mention that either.
The TCK passes either way. Given that the spec doesn't cover this and
neither does the TCK do we:
a) stick to the letter of the spec
b) treat isELIgnored and isDeferredSyntaxAllowedAsLiteral consistently
I have a preference for b) but if the majority disagree I'm happy to revert.
In a similar area on which the spec is silent, if I use a TLD that
declares it requires JSP 2.1 in a web applciation that declares servlet
2.3 in web.xml is that an error? At the moment it works but it feels
wrong. Thoughts?
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r920086 - in /tomcat/jk/trunk/native/apache-2.0: Makefile.vc mod_jk.rc
On 03/07/2010 09:17 PM, t...@apache.org wrote: Author: timw --- tomcat/jk/trunk/native/apache-2.0/mod_jk.rc (added) +++ tomcat/jk/trunk/native/apache-2.0/mod_jk.rc Sun Mar 7 20:17:04 2010 @@ -0,0 +1,97 @@ +// Microsoft Visual C++ generated resource script. +// Nice but this should be hand crafted thought. Why just not using isapi's rc file and change the name We could even use the same file thought. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat build error
Thanks folks. Looks like the gcj that was installed was causing the issue. Had uninstalled it and ant started picking up my jdk path. On Sun, Mar 7, 2010 at 1:34 PM, Mark Thomas wrote: > On 07/03/2010 21:14, Bharath Vasudevan wrote: > > My classpath is set for the tomcat working directory. Looks like > > apache.ant.org is down now (so couldnt see what it should be set to). > > That is ant.apache.org > > As you'll see from http://monitoring.apache.org/status/ it is the EU > mirror that is down. The infra team is updating DNS to use the US mirror > as I tyope. You can force the use of the US mirror using ant.us.apache.org > > > echo $CLASSPATH > > /usr/share/tomcat6/lib/servlet-api.jar > > Irrelevant. > > Again. Use a complier from Sun. > > Mark > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
svn commit: r920134 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sun Mar 7 22:29:08 2010 New Revision: 920134 URL: http://svn.apache.org/viewvc?rev=920134&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=920134&r1=920133&r2=920134&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Mar 7 22:29:08 2010 @@ -105,7 +105,7 @@ Honor isELIgnored and isDeferredSyntaxAllowed when parsing. Backport of r919851: http://people.apache.org/~kkolinko/patches/2010-03-07_tc6_bug48668_r919851.patch - +1: kkolinko + +1: kkolinko, markt -1: 2) Fix for jasper.compiler.Validator @@ -119,4 +119,12 @@ Backport of r919914: http://people.apache.org/~kkolinko/patches/2010-03-07_tc6_bug48668_r919914.patch +1: kkolinko + +1: markt with http://svn.apache.org/viewvc?rev=920055&view=rev -1: + +* Follow up for https://issues.apache.org/bugzilla/show_bug.cgi?id=48668 + Make handling of isELIgnored and isDeferredSyntaxAllowedAsLiteral consistent + This is *NOT* required for spec compliance + http://svn.apache.org/viewvc?rev=920110&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 7 [2010/03/07]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48222|New|Enh|2009-11-18|Source JARs empty in maven central| |48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers | |48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite | |48297|New|Nor|2009-11-28|webservices.ServiceRefFactory.initHandlerChain add| |48358|New|Enh|2009-12-09|JSP-unloading reloaded| |48550|New|Enh|2010-01-14|Update examples and default server.xml to use UTF-| |48644|New|Nor|2010-01-30|Code should never ignore throwable| |48648|New|Nor|2010-01-31|Blank page (dropped connection) when running TC7 w| |48662|New|Enh|2010-02-02|context.xml expansion on deployment improvements | |48689|New|Enh|2010-02-05|Jar abstraction for Jasper| |48692|New|Enh|2010-02-07|Provide option to parse application/x-www-form-url| |48817|New|Nor|2010-02-25|Skip validation query and use JDBC API for validat| |48837|New|Enh|2010-03-01|Memory leaks protection does not cure leaks trigge| |48861|New|Nor|2010-03-04|Files without AL headers | +-+---+---+--+--+ | Total 14 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 6 [2010/03/07]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |39661|Opn|Enh|2006-05-25|Please document JULI FileHandler configuration pro| |41128|Inf|Enh|2006-12-07|Reference to java Thread name from RequestProcesso| |41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat| |41791|New|Enh|2007-03-07|Tomcat behaves inconsistently concerning flush-pac| |41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific| |41944|New|Enh|2007-03-25|Start running the RAT tool to see where we're miss| |41992|New|Enh|2007-03-30|Need ability to set OS process title | |42463|New|Enh|2007-05-20|"crossContext" and classloader issues - pls amend | |43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant| |43003|New|Enh|2007-07-30|Separate dependent component download and build ta| |43400|New|Enh|2007-09-14|enum support for tag libs | |43497|New|Enh|2007-09-26|Add ability to escape rendered output of JSP expre| |43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml | |43642|New|Enh|2007-10-17|Add prestartminSpareThreads attribute for Executor| |43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor| |43742|New|Enh|2007-10-30|.tag compiles performed one at a time -- extremel| |43790|Ass|Enh|2007-11-03|concurrent access issue on TagHandlerPool | |43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output | |44047|New|Enh|2007-12-10|Provide a way for Tomcat to serve up error pages w| |44106|New|Enh|2007-12-19|autodeploy configures directories which do not con| |44199|New|Enh|2008-01-10|expose current backlog queue size | |44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f| |44264|New|Enh|2008-01-18|Clustering - Support for disabling multicasting an| |44265|New|Enh|2008-01-18|Improve JspWriterImpl performance with "inline" su| |44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag | |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44299|New|Enh|2008-01-26|Provider manager app with a log out button| |44312|New|Enh|2008-01-28|Warn when overwritting docBase of the default Host| |44598|New|Enh|2008-03-13|JAASRealm is suppressing Exceptions | |44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam| |44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt| |44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin| |45014|New|Enh|2008-05-15|Request and Response classes should have wrappers | |45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets| |45283|Opn|Enh|2008-06-25|Allow multiple authenticators to be added to pipel| |45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete | |45654|New|Enh|2008-08-19|use static methods and attributes in a direct way!| |45731|New|Enh|2008-09-02|Enhancement request : pluggable httpsession cache | |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45871|New|Enh|2008-09-23|Support for salted and digested patches in DataSou| |45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or | |45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE| |45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output| |45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive | |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|New|Enh|2008-11-21|Tomcat reloading of context does not update contex| |46264|New|Enh|2008-11-21|Shutting down tomcat with large number of contexts| |46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl| |46350|New|Enh|2008-12-05|Maven repository should contain source bundles| |46451|New|Enh|2008-12-30|Configure svn:bugtraq properties | |46461|New|Enh|2009-01-01|fail graceful on dns changes for connectors/hosts | |46497|
Bug report for Taglibs [2010/03/07]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |27717|New|Maj|2004-03-16| very slow in JSTL 1.1 | |33934|New|Cri|2005-03-09|[standard] memory leak in jstl c:set tag | |38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field | |38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)| |42413|New|Nor|2007-05-14|[PATCH] Log Taglib enhancements | |43640|New|Nor|2007-10-16|Move the tests package to JUnit | |45197|Ass|Nor|2008-06-12|Need to support the JSTL 1.2 specification| |46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l| |48333|New|Nor|2009-12-02|TLD generator | |48772|New|Nor|2010-02-19|Bad information in impl module pom.xml| |48773|New|Nor|2010-02-19|DataSourceWrapper and DriverManager problems | |48848|New|Maj|2010-03-03|fn:endsWith fails with repeated search string | +-+---+---+--+--+ | Total 12 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 5 [2010/03/07]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |27122|Opn|Enh|2004-02-20|IE plugins cannot access components through Tomcat| |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |29494|Inf|Enh|2004-06-10|No way to set PATH when running as a service on Wi| |33262|Inf|Enh|2005-01-27|Service Manager autostart should check for adminis| |33453|Opn|Enh|2005-02-08|Jasper should recompile JSP files whose datestamps| |33671|Opn|Enh|2005-02-21|Manual Windows service installation with custom na| |34801|New|Enh|2005-05-08|PATCH: CGIServlet does not terminate child after a| |34805|Ass|Enh|2005-05-08|warn about invalid security constraint url pattern| |34868|Ass|Enh|2005-05-11|allow to register a trust store for a session that| |35054|Inf|Enh|2005-05-25|warn if appBase is not existing as a File or direc| |36133|Inf|Enh|2005-08-10|Support JSS SSL implementation| |36362|New|Enh|2005-08-25|missing check for Java reserved keywords in tag fi| |36569|Inf|Enh|2005-09-09|Redirects produce illegal URL's | |36837|Inf|Enh|2005-09-28|Looking for ProxyHandler implementation of Http re| |36922|Inf|Enh|2005-10-04|setup.sh file mis-advertised and missing | |37018|Ass|Enh|2005-10-11|Document how to use tomcat-SSL with a pkcs11 token| |37334|Inf|Enh|2005-11-02|Realm digest property not aligned with the adminis| |37449|Opn|Enh|2005-11-10|Two UserDatabaseRealm break manager user | |37485|Inf|Enh|2005-11-14|I'd like to run init SQL after JDBC Connection cre| |38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations | |38268|Inf|Enh|2006-01-13|User friendly: Need submit button on adding/deleti| |38360|Inf|Enh|2006-01-24|Domain for session cookies| |38546|Inf|Enh|2006-02-07|Google bot sends invalid If-Modifed-Since Header, | |38577|Inf|Enh|2006-02-08|Enhance logging of security failures | |38743|New|Min|2006-02-21|when using APR, JKS options are silently ignored | |38916|Inf|Enh|2006-03-10|HttpServletRequest cannot handle multipart request| |39053|Inf|Enh|2006-03-21|include Tomcat embedded sample| |39309|Opn|Enh|2006-04-14|tomcat can't compile big jsp, hitting a compiler l| |39740|New|Enh|2006-06-07|semi-colon ; isn't allowed as a query argument sep| |39862|Inf|Enh|2006-06-22|provide support for protocol-independent GenericSe| |40211|Inf|Enh|2006-08-08|Compiled JSP don't indent HTML code | |40218|New|Enh|2006-08-08|JNDI realm - recursive group/role matching| |40222|Inf|Enh|2006-08-09|Default Tomcat configuration alows easy session hi| |40402|New|Enh|2006-09-03|Manager should display Exceptions | |40510|New|Enh|2006-09-14|installer does not create shortcuts for all users | |40712|New|Enh|2006-10-10|Realm admin error.| |40728|Inf|Enh|2006-10-11|Catalina MBeans use non-serializable classes | |40766|New|Enh|2006-10-16|Using an unsecure jsessionid with mod_proxy_ajp ov| |40881|Opn|Enh|2006-11-02|Unable to receive message through TCP channel -> | |41007|Opn|Enh|2006-11-20|Can't define customized 503 error page| |41179|New|Enh|2006-12-15|400 Bad Request response during auto re-deployment| |41227|Opn|Enh|2006-12-21|When the jasper compiler fails to compile a JSP, i| |41337|Opn|Enh|2007-01-10|Display an error page if no cert is available on C| |41496|New|Enh|2007-01-30|set a security provider for jsse in a connector co| |41498|New|Enh|2007-01-30|allRolesMode Realm configuration option not docume| |41539|Inf|Enh|2007-02-05|NullPointerException during Embedded tomcat restar| |41673|New|Enh|2007-02-21|Jasper output the message of compiling error using| |41697|Ver|Enh|2007-02-25|make visible in debug output if charset from brows| |41709|Inf|Enh|2007-02-26|When calling the API that relates to the buffer af| |41718|New|Enh|2007-02-27|Status 302 response to GET request has no body whe| |42390|New|Maj|2007-05-11|JSP compilation error with nested tagfile tags wit| |42416|
Bug report for Tomcat Connectors [2010/03/07]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo| |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |36155|Opn|Nor|2005-08-12|tomcat chooses wrong host if using mod_jk | |39967|Inf|Nor|2006-07-05|mod_jk gives segmentation fault when apache is sta| |40208|Inf|Nor|2006-08-08|Request-Dump when ErrorDocument in httpd.conf is a| |41170|Inf|Nor|2006-12-13|single crlf in header termination crashes app.| |41923|Opn|Nor|2007-03-21|Tomcat doesnt recognized client abort | |42366|Inf|Nor|2007-05-09|Memory leak in newer mod_jk version when connectio| |42554|Opn|Nor|2007-05-31|mod_ssl + mod_jk with status_worker does not work | |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |43968|New|Enh|2007-11-26|[patch] support ipv6 with mod_jk | |44290|New|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan| |44349|New|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s| |44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 | |44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc| |44571|New|Enh|2008-03-10|Limits busy per worker to a threshold | |45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff| |45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so| |45395|New|Min|2008-07-14|MsgAjp dump method does not dump packet when being| |46337|New|Nor|2008-12-04|real worker name is wrong | |46406|New|Enh|2008-12-16|Supporting relative paths in isapi_redirect.proper| |46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread | |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47038|New|Enh|2009-04-15|USE_FLOCK_LK redefined compiler warning when using| |47327|New|Enh|2009-06-07|remote_user not logged in apache logfile | |47617|New|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err| |47678|New|Nor|2009-08-11|Unable to allocate shared memory when using isapi_| |47679|New|Nor|2009-08-11|Not all headers get passed to Tomcat server from i| |47692|New|Reg|2009-08-12|Can not compile mod_jk with apache2.0.63 and tomca| |47714|New|Cri|2009-08-20|Reponse mixed between users | |47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |47840|New|Min|2009-09-14|A broken worker name is written in the log file. | |48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the| |48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48501|New|Enh|2010-01-07|Log rotation for ISAPI Redirector | |48513|New|Enh|2010-01-09|IIS Quick setup instructions | |48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker | |48826|New|Maj|2010-02-27|POST request causes access violation in isapi_redi| |48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv| +-+---+---+--+--+ | Total 40 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Native [2010/03/07]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |38372|Inf|Cri|2006-01-25|tcnative-1.dll response overflow corruption, parti| |41361|New|Nor|2007-01-14|Content lost when read by a slow client. | |42090|New|Cri|2007-04-11|tcnative badly handles some OpenSSL disconnections| |45392|New|Nor|2008-07-14|No OCSP support for client SSL verification | |46041|New|Cri|2008-10-20|Tomcat service is terminated unexpectedly (tcnativ| |46179|New|Maj|2008-11-10|apr ssl client authentication | |46571|New|Nor|2009-01-21|tcnative blocks in APR poll on Solaris| |47319|New|Nor|2009-06-05|With APR, getRemoteHost() returns NULL for unknown| |47851|New|Nor|2009-09-16|thread-safety issues in the TC native Java code | |48253|New|Min|2009-11-20|Tomcat Native patch - adding dynamic locking callb| |48584|New|Min|2010-01-20|Error or ACCESS_VIOLATION on shutdown | |48655|New|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown| +-+---+---+--+--+ | Total 12 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r920199 - /tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Author: mturk Date: Mon Mar 8 06:01:27 2010 New Revision: 920199 URL: http://svn.apache.org/viewvc?rev=920199&view=rev Log: Embed manifest inside dll Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=920199&r1=920198&r2=920199&view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Mon Mar 8 06:01:27 2010 @@ -94,6 +94,9 @@ $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << + @IF EXIST $(OUTDIR)\mod_jk.manifest \ + mt -nologo -manifest $(OUTDIR)\mod_jk.manifest -outputresource:$(OUTDIR)\mod_jk.so;2 + CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src" /FD /c - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r920207 - in /tomcat/jk/trunk/native: apache-2.0/Makefile.vc apache-2.0/mod_jk.rc common/jk.rc common/jk_version.h iis/Makefile.amd64 iis/Makefile.ia64 iis/Makefile.x86 iis/isapi_redirect.
Author: mturk Date: Mon Mar 8 06:34:14 2010 New Revision: 920207 URL: http://svn.apache.org/viewvc?rev=920207&view=rev Log: Use common windows .rc file and one place for version (jk_version.h) Added: tomcat/jk/trunk/native/common/jk.rc Removed: tomcat/jk/trunk/native/apache-2.0/mod_jk.rc tomcat/jk/trunk/native/iis/isapi_redirect.rc Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc tomcat/jk/trunk/native/common/jk_version.h tomcat/jk/trunk/native/iis/Makefile.amd64 tomcat/jk/trunk/native/iis/Makefile.ia64 tomcat/jk/trunk/native/iis/Makefile.x86 Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=920207&r1=920206&r2=920207&view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Mon Mar 8 06:34:14 2010 @@ -87,7 +87,7 @@ "$(INTDIR)\jk_url.obj" \ "$(INTDIR)\jk_util.obj" \ "$(INTDIR)\jk_worker.obj" \ - "$(INTDIR)\mod_jk.res" \ + "$(INTDIR)\jk.res" \ "$(INTDIR)\mod_jk.obj" "$(OUTDIR)\mod_jk.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -131,11 +131,11 @@ << MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC_PROJ=/l 0x809 /fo"$(INTDIR)\mod_jk.res" /d "NDEBUG" +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d BASENAME="mod_jk" /d "NDEBUG" -SOURCE=.\mod_jk.rc +SOURCE=..\common\jk.rc -"$(INTDIR)\mod_jk.res" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\k.res" : $(SOURCE) "$(INTDIR)" $(RSC) $(RSC_PROJ) $(SOURCE) Added: tomcat/jk/trunk/native/common/jk.rc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk.rc?rev=920207&view=auto == --- tomcat/jk/trunk/native/common/jk.rc (added) +++ tomcat/jk/trunk/native/common/jk.rc Mon Mar 8 06:34:14 2010 @@ -0,0 +1,76 @@ +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "jk_version.h" + +#define ASF_COPYRIGHT "Licensed to the Apache Software Foundation " \ + "(ASF) under one or more contributor license " \ + "agreements. See the NOTICE file distributed " \ + "with this work for additional information " \ + "regarding copyright ownership." + +#define ASF_LICENSE "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\r\n\r\n" \ +"http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n"; \ +"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. See the License for the " \ +"specific language governing permissions and " \ +"limitations under the License." + +#define JK_DLL_BASENAME BASENAME "-" JK_VERSTRING + + +1 VERSIONINFO + FILEVERSION JK_VERSIONCSV + PRODUCTVERSION JK_VERSIONCSV + FILEFLAGSMASK 0x3fL +#if defined(_DEBUG) + FILEFLAGS 0x01L +#else + FILEFLAGS 0x00L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN +BLOCK "040904b0" +BEGIN +VALUE "Comments", ASF_LICENSE "\0" + VALUE "CompanyName", "Apache Software Foundation\0" + VALUE "FileDescription", "Apache Tomcat Connector\0" + VALUE "FileVersion", JK_VERSTRING "\0" + VALUE "InternalName", JK_DLL_BASENAME "\0" + VALUE "LegalCopyright", ASF_COPYRIGHT "\0" + VALUE "OriginalFilename", JK_DLL_BASENAME ".dll\0" + VALUE "ProductName", "Apache Tomcat Connectors project\0" + VALUE "ProductVersion", JK_VERSTRING "\0" +END + END + BLOCK "VarFileInfo" + BEGIN +VALU
svn commit: r920208 - /tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Author: mturk Date: Mon Mar 8 06:36:06 2010 New Revision: 920208 URL: http://svn.apache.org/viewvc?rev=920208&view=rev Log: Fix copy/paste typo Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=920208&r1=920207&r2=920208&view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Mon Mar 8 06:36:06 2010 @@ -135,7 +135,7 @@ SOURCE=..\common\jk.rc -"$(INTDIR)\k.res" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\jk.res" : $(SOURCE) "$(INTDIR)" $(RSC) $(RSC_PROJ) $(SOURCE) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r920209 - /tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Author: mturk Date: Mon Mar 8 06:36:52 2010 New Revision: 920209 URL: http://svn.apache.org/viewvc?rev=920209&view=rev Log: Fix copy/paste typo Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=920209&r1=920208&r2=920209&view=diff == --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Mon Mar 8 06:36:52 2010 @@ -26,7 +26,7 @@ CLEAN : - -...@erase "$(INTDIR)\mod_jk.res" + -...@erase "$(INTDIR)\jk.res" -...@erase "$(INTDIR)\jk_ajp12_worker.obj" -...@erase "$(INTDIR)\jk_ajp13.obj" -...@erase "$(INTDIR)\jk_ajp13_worker.obj" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r920210 - /tomcat/jk/trunk/native/common/jk.rc
Author: mturk Date: Mon Mar 8 06:40:05 2010 New Revision: 920210 URL: http://svn.apache.org/viewvc?rev=920210&view=rev Log: Stringify the name Modified: tomcat/jk/trunk/native/common/jk.rc Modified: tomcat/jk/trunk/native/common/jk.rc URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk.rc?rev=920210&r1=920209&r2=920210&view=diff == --- tomcat/jk/trunk/native/common/jk.rc (original) +++ tomcat/jk/trunk/native/common/jk.rc Mon Mar 8 06:40:05 2010 @@ -37,7 +37,7 @@ "specific language governing permissions and " \ "limitations under the License." -#define JK_DLL_BASENAME BASENAME "-" JK_VERSTRING +#define JK_DLL_BASENAME JK_STRINGIFY(BASENAME) "-" JK_VERSTRING 1 VERSIONINFO - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r920093 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/reference/iis.xml
On 03/07/2010 09:31 PM, t...@apache.org wrote: Author: timw +/* Remember the current log file name for the next potential rotate */ +strcpy_s(log_file_effective, sizeof(log_file_effective), log_file_name); -1 You will have to use StringCb routines here, because strcpy_s breaks the VC6 compilation. Those we added to later MSVCRT versions. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r920211 - /tomcat/jk/trunk/native/common/jk_status.c
Author: mturk
Date: Mon Mar 8 06:53:52 2010
New Revision: 920211
URL: http://svn.apache.org/viewvc?rev=920211&view=rev
Log:
Fix compile time warnings
Modified:
tomcat/jk/trunk/native/common/jk_status.c
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=920211&r1=920210&r2=920211&view=diff
==
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Mon Mar 8 06:53:52 2010
@@ -716,7 +716,7 @@
static int status_strftime(time_t clock, int mime, char *buf_time, char
*buf_tz,
jk_logger_t *l)
{
-int rc_time;
+size_t rc_time;
#ifdef _MT_CODE_PTHREAD
struct tm res;
struct tm *tms = localtime_r(&clock, &res);
@@ -734,7 +734,7 @@
strftime(buf_tz, JK_STATUS_TIME_BUF_SZ, JK_STATUS_TIME_FMT_TZ, tms);
JK_TRACE_EXIT(l);
-return rc_time;
+return (int)rc_time;
}
@@ -1925,7 +1925,7 @@
if (rc_time > 0 ) {
jk_print_xml_att_string(s, off+2, "error_time_datetime", buf_time);
jk_print_xml_att_string(s, off+2, "error_time_tz", buf_tz);
-jk_print_xml_att_int(s, off+2, "error_time_unix_seconds",
error_time);
+jk_print_xml_att_int(s, off+2, "error_time_unix_seconds",
(int)error_time);
jk_print_xml_att_int(s, off+2, "error_time_ago", delta_error);
}
/* Terminate the tag */
@@ -2054,7 +2054,7 @@
if (rc_time > 0) {
jk_print_prop_att_string(s, w, name, "error_time_datetime",
buf_time);
jk_print_prop_att_string(s, w, name, "error_time_tz", buf_tz);
-jk_print_prop_att_int(s, w, name, "error_time_unix seconds",
error_time);
+jk_print_prop_att_int(s, w, name, "error_time_unix seconds",
(int)error_time);
jk_print_prop_att_int(s, w, name, "error_time_ago seconds",
delta_error);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48870] New: avoid parallel arrays of base types
https://issues.apache.org/bugzilla/show_bug.cgi?id=48870 Summary: avoid parallel arrays of base types Product: Tomcat 7 Version: unspecified Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: hau...@acm.org Created an attachment (id=25103) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25103) patch_parallelArrays.txt having kind of 'synchronized' arrays, i.e. one of Strings and another one of Integers appears to be a questionable programming pattern to me. Pls find attached a hopefully more OO approach see also bug 48158 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 48863] Log directory misconfiguration for class loaders
https://issues.apache.org/bugzilla/show_bug.cgi?id=48863 --- Comment #5 from Ralf Hauser 2010-03-08 06:58:13 UTC --- see also Bug 48870 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
DO NOT REPLY [Bug 48870] avoid parallel arrays of base types
https://issues.apache.org/bugzilla/show_bug.cgi?id=48870 --- Comment #1 from Ralf Hauser 2010-03-08 06:58:52 UTC --- oops, the related RFE should have been Bug 48863 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r920199 - /tomcat/jk/trunk/native/apache-2.0/Makefile.vc
Thanks - I was wondering whether to do this, but forgot on the commit. On Mon, Mar 8, 2010 at 7:01 PM, wrote: > Author: mturk > Date: Mon Mar 8 06:01:27 2010 > New Revision: 920199 > > URL: http://svn.apache.org/viewvc?rev=920199&view=rev > Log: > Embed manifest inside dll > > Modified: >tomcat/jk/trunk/native/apache-2.0/Makefile.vc > > Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc > URL: > http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=920199&r1=920198&r2=920199&view=diff > > == > --- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original) > +++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Mon Mar 8 06:01:27 2010 > @@ -94,6 +94,9 @@ > $(LINK32) @<< > $(LINK32_FLAGS) $(LINK32_OBJS) > << > + @IF EXIST $(OUTDIR)\mod_jk.manifest \ > + mt -nologo -manifest $(OUTDIR)\mod_jk.manifest > -outputresource:$(OUTDIR)\mod_jk.so;2 > + > > CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(JAVA_HOME)\include" > /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /D "NDEBUG" /D > "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\mod_jk_src" /FD /c > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: svn commit: r920086 - in /tomcat/jk/trunk/native/apache-2.0: Makefile.vc mod_jk.rc
Great - I hadn't considered that. On Mon, Mar 8, 2010 at 10:55 AM, Mladen Turk wrote: > On 03/07/2010 09:17 PM, t...@apache.org wrote: > >> Author: timw >> >> --- tomcat/jk/trunk/native/apache-2.0/mod_jk.rc (added) >> +++ tomcat/jk/trunk/native/apache-2.0/mod_jk.rc Sun Mar 7 20:17:04 2010 >> @@ -0,0 +1,97 @@ >> +// Microsoft Visual C++ generated resource script. >> +// >> > > Nice but this should be hand crafted thought. > Why just not using isapi's rc file and change the name > We could even use the same file thought. > > > Regards > -- > ^TM > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
svn commit: r920223 - /tomcat/jk/trunk/HOWTO-RELEASE.txt
Author: timw Date: Mon Mar 8 07:54:26 2010 New Revision: 920223 URL: http://svn.apache.org/viewvc?rev=920223&view=rev Log: Removing .rc files from list of files to modify on release (these now get version info from jk_version.h) Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/HOWTO-RELEASE.txt?rev=920223&r1=920222&r2=920223&view=diff == --- tomcat/jk/trunk/HOWTO-RELEASE.txt (original) +++ tomcat/jk/trunk/HOWTO-RELEASE.txt Mon Mar 8 07:54:26 2010 @@ -137,8 +137,6 @@ native/common/jk_version.h: Update variables JK_VERMAJOR, JK_VERMINOR, JK_VERFIX, JK_VERSTRING, and JK_VERISRELEASE. native/common/portable.h.sample: Update VERSION define. -native/apache-2.0/mod_jk.rc: Update JK_VERSION_STR, FILEVERSION, and PRODUCTVERSION -native/iis/isapi_redirect.rc: Update JK_VERSION_STR, FILEVERSION, and PRODUCTVERSION native/iis/installer/isapi-redirector-win32-msi.ism: Update ProductVersion. xdocs/miscellaneous/changelog.xml: Start a new section for the new version. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r920093 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/reference/iis.xml
Thanks I'm trying to track down a VC6 install so I can test the .dsp build before I commit. Maybe a move to VC2003 as a minimum might be in order some day. cheers tim On Mon, Mar 8, 2010 at 7:43 PM, Mladen Turk wrote: > On 03/07/2010 09:31 PM, t...@apache.org wrote: > >> Author: timw >> >> +/* Remember the current log file name for the next potential >> rotate */ >> +strcpy_s(log_file_effective, sizeof(log_file_effective), >> log_file_name); >> > > -1 > > You will have to use StringCb routines here, because strcpy_s > breaks the VC6 compilation. Those we added to later MSVCRT versions. > > Regards > -- > ^TM > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
