Re: Tomcat Native 1.2.2
Hi Christopher, Thanks for your comments. I used to compile openssl under linux, when I switched my OS to Mac OSX, the openssl building env was not completely clean, which lead to the problem. Will use brew to update openssl later on. Thanks, Huxing -- From:Christopher Schultz Time:2015 Nov 6 (Fri) 20:18 To:Tomcat Developers List Subject:Re: Tomcat Native 1.2.2 Huxing, On 11/5/15 7:08 PM, Huxing Zhang wrote: > Hi All, > > I have solved the problem building tcnative on Mac OSX. > > The message worth noticing is: > ld: warning: ld: warning: ignoring file /usr/local/openssl/lib/libcrypto.a, > file was built for archive which is not the architecture being linked > (x86_64): /usr/local/openssl/lib/libcrypto.aignoring file > /usr/local/openssl/lib/libssl.a, file was built for archive which is not the > architecture being linked (x86_64): /usr/local/openssl/lib/libssl.a I'm sorry I hadn't noticed that before. It's obviously the problem. > The root cause is openssl is not correctly compiled with the right > architecture. > > Recompile openssl with the following configuration will solve this problem. That openssl is one that you must have provided yourself in the past... Mac OS has been 64-bit-only for quite a while, now, and the OpenSSL binaries shipped with Mac OS X are dual-architecture: $ file /usr/lib/libssl.dylib /usr/lib/libssl.dylib: Mach-O universal binary with 2 architectures /usr/lib/libssl.dylib (for architecture i386): Mach-O dynamically linked shared library i386 /usr/lib/libssl.dylib (for architecture x86_64): Mach-O 64-bit dynamically linked shared library x86_64 On Mac OS X, consider using something like Brew for things like newer versions of OpenSSL. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58481] JAX WS Request fails with "Premature end of file"
https://bz.apache.org/bugzilla/show_bug.cgi?id=58481 --- Comment #3 from CHI --- Created attachment 33265 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33265&action=edit mod_jk.log with loglevel trace -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58481] JAX WS Request fails with "Premature end of file"
https://bz.apache.org/bugzilla/show_bug.cgi?id=58481 --- Comment #4 from CHI --- Created attachment 33266 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33266&action=edit console.log -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58481] JAX WS Request fails with "Premature end of file"
https://bz.apache.org/bugzilla/show_bug.cgi?id=58481 --- Comment #5 from CHI --- added log files... -- 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: r1713346 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Author: remm Date: Mon Nov 9 08:53:37 2015 New Revision: 1713346 URL: http://svn.apache.org/viewvc?rev=1713346&view=rev Log: Fix NPE. Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713346&r1=1713345&r2=1713346&view=diff == --- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Nov 9 08:53:37 2015 @@ -607,7 +607,9 @@ public abstract class AbstractProtocol
svn commit: r1713347 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Author: remm
Date: Mon Nov 9 08:54:48 2015
New Revision: 1713347
URL: http://svn.apache.org/viewvc?rev=1713347&view=rev
Log:
SunX509 is not a good default (testsuite failures).
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1713347&r1=1713346&r2=1713347&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Mon Nov 9 08:54:48 2015
@@ -28,7 +28,7 @@ public class SSLHostConfigCertificate {
public static final Type DEFAULT_TYPE = Type.UNDEFINED;
static final String DEFAULT_KEYSTORE_PROVIDER =
-System.getProperty("javax.net.ssl.keyStoreProvider", "SunX509");
+System.getProperty("javax.net.ssl.keyStoreProvider");
static final String DEFAULT_KEYSTORE_TYPE =
System.getProperty("javax.net.ssl.keyStoreType", "JKS");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713351 - /tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
Author: mgrigorov
Date: Mon Nov 9 09:06:32 2015
New Revision: 1713351
URL: http://svn.apache.org/viewvc?rev=1713351&view=rev
Log:
Fix a typo in a test method name.
Introduced with r1713285
Modified:
tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
Modified:
tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java?rev=1713351&r1=1713350&r2=1713351&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/util/TestStandardSessionIdGenerator.java
Mon Nov 9 09:06:32 2015
@@ -71,7 +71,7 @@ public class TestStandardSessionIdGenera
}
@Test
-public void testValidateWithJvmRouteWithPerid() {
+public void testValidateWithJvmRouteWithPeriod() {
Assert.assertTrue(generator.validateSessionId(VALID + ".g.h.i"));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/595 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1713347 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/596 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1713351 Blamelist: mgrigorov BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713362 - in /tomcat/trunk/java/org/apache: catalina/startup/HostConfig.java coyote/http11/Http11InputBuffer.java coyote/http11/filters/ChunkedInputFilter.java tomcat/util/digester/CallMe
Author: markt
Date: Mon Nov 9 09:39:49 2015
New Revision: 1713362
URL: http://svn.apache.org/viewvc?rev=1713362&view=rev
Log:
Fix Findbugs warnings. Remove code that will never execute because the
condition it depends on can never be met.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1713362&r1=1713361&r2=1713362&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Mon Nov 9
09:39:49 2015
@@ -1311,9 +1311,6 @@ public class HostConfig implements Lifec
if (resource.exists()) {
continue;
}
-if (lastModified == 0L) {
-continue;
-}
// Undeploy application
undeploy(app);
deleteRedeployResources(app, resources, i, true);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java?rev=1713362&r1=1713361&r2=1713362&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11InputBuffer.java Mon Nov
9 09:39:49 2015
@@ -90,8 +90,6 @@ public class Http11InputBuffer implement
HTTP_TOKEN_CHAR[i] = false;
} else if (i == ' ') {
HTTP_TOKEN_CHAR[i] = false;
-} else if (i == '\t') {
-HTTP_TOKEN_CHAR[i] = false;
} else {
HTTP_TOKEN_CHAR[i] = true;
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java?rev=1713362&r1=1713361&r2=1713362&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
Mon Nov 9 09:39:49 2015
@@ -387,10 +387,6 @@ public class ChunkedInputFilter implemen
}
remaining = result;
-if (remaining < 0) {
-return false;
-}
-
return true;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1713362&r1=1713361&r2=1713362&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Mon
Nov 9 09:39:49 2015
@@ -349,11 +349,6 @@ public class CallMethodRule extends Rule
parameters = new Object[1];
parameters[0] = bodyText;
-if (paramTypes.length == 0) {
-paramTypes = new Class[1];
-paramTypes[0] = String.class;
-}
-
}
// Construct the parameter values array we will need
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1713362&r1=1713361&r2=1713362&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Nov
9 09:39:49 2015
@@ -242,11 +242,10 @@ public class SecureNioChannel extends Ni
break;
}
default: throw new
IllegalStateException(sm.getString("channel.nio.ssl.invalidStatus",
handshakeStatus));
-}//switch
-}//while
-//return 0 if we are complete, otherwise reregister for any activity
that
-//would cause this method to be called again.
-return
handshakeComplete?0:(SelectionKey.OP_WRITE|SelectionKey.OP_READ);
+}
+}
+// Handshake is complete if this point is reached
+return 0;
}
-
[VOTE][RESULT] Release Apache Tomcat Native 1.2.2
The following votes were cast: Binding: +1: remm, markt, violetagg, rjung Non-binding: +1: Huxing Zhang The vote therefore passes. Thank you to everyone who tested this and the previous 1.2.x releases. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/597 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1713362 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r11086 - /dev/tomcat/tomcat-connectors/native/1.2.2/ /release/tomcat/tomcat-connectors/native/1.2.2/
Author: markt Date: Mon Nov 9 09:57:07 2015 New Revision: 11086 Log: Release Tomcat Native 1.2.2 Added: release/tomcat/tomcat-connectors/native/1.2.2/ - copied from r11085, dev/tomcat/tomcat-connectors/native/1.2.2/ Removed: dev/tomcat/tomcat-connectors/native/1.2.2/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713365 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Author: jfclere
Date: Mon Nov 9 10:20:32 2015
New Revision: 1713365
URL: http://svn.apache.org/viewvc?rev=1713365&view=rev
Log:
Use the default when not explicitly configured.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1713365&r1=1713364&r2=1713365&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Mon Nov 9 10:20:32 2015
@@ -443,7 +443,11 @@ public class OpenSSLContext implements o
KeyStore ks = KeyStore.getInstance(keystoretype);
InputStream stream = ConfigFileLoader.getInputStream(keystorefile);
ks.load(stream, password.toCharArray());
-KeyManagerFactory kmf =
KeyManagerFactory.getInstance(keystoreprovider);
+KeyManagerFactory kmf;
+if (keystoreprovider != null)
+kmf = KeyManagerFactory.getInstance(keystoreprovider);
+else
+ kmf =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, password.toCharArray());
KeyManager[] kms = kmf.getKeyManagers();
if (kms == null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713389 - in /tomcat/trunk: build.properties.default java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: markt
Date: Mon Nov 9 11:30:07 2015
New Revision: 1713389
URL: http://svn.apache.org/viewvc?rev=1713389&view=rev
Log:
Update minimum Tomcat Native version to 1.2.2
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1713389&r1=1713388&r2=1713389&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Nov 9 11:30:07 2015
@@ -156,7 +156,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.1.33
+tomcat-native.version=1.2.2
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1713389&r1=1713388&r2=1713389&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Mon
Nov 9 11:30:07 2015
@@ -66,10 +66,10 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MAJOR = 1;
-protected static final int TCN_REQUIRED_MINOR = 1;
-protected static final int TCN_REQUIRED_PATCH = 32;
+protected static final int TCN_REQUIRED_MINOR = 2;
+protected static final int TCN_REQUIRED_PATCH = 2;
protected static final int TCN_RECOMMENDED_MINOR = 2;
-protected static final int TCN_RECOMMENDED_PV = 0;
+protected static final int TCN_RECOMMENDED_PV = 2;
// -- Properties
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1713389&r1=1713388&r2=1713389&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 9 11:30:07 2015
@@ -105,6 +105,11 @@
org.apache.coyote.USE_CUSTOM_STATUS_MSG_IN_HEADER is no
longer used and has been removed. (markt)
+
+The minimum required Tomcat Native version has been increased to 1.2.2.
+The 1.2.x branch includes ALPN and SNI support which are required for
+HTTP/2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713391 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Author: markt
Date: Mon Nov 9 11:31:44 2015
New Revision: 1713391
URL: http://svn.apache.org/viewvc?rev=1713391&view=rev
Log:
Tab police
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1713391&r1=1713390&r2=1713391&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Mon Nov 9 11:31:44 2015
@@ -447,7 +447,7 @@ public class OpenSSLContext implements o
if (keystoreprovider != null)
kmf = KeyManagerFactory.getInstance(keystoreprovider);
else
- kmf =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+kmf =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, password.toCharArray());
KeyManager[] kms = kmf.getKeyManagers();
if (kms == null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/599 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1713391 Blamelist: markt BUILD FAILED: failed compile Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713397 - in /tomcat/trunk: build.xml webapps/docs/changelog.xml
Author: markt
Date: Mon Nov 9 11:39:07 2015
New Revision: 1713397
URL: http://svn.apache.org/viewvc?rev=1713397&view=rev
Log:
Drop Windows Itanium support for native components
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1713397&r1=1713396&r2=1713397&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Nov 9 11:39:07 2015
@@ -1923,9 +1923,6 @@
-
-
@@ -1935,9 +1932,6 @@
-
-Apache Tomcat ${version} native binaries for Win64 IA64 platform.
-
Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
@@ -2379,7 +2373,6 @@ skip.installer property in build.propert
-
@@ -2412,7 +2405,6 @@ skip.installer property in build.propert
-
@@ -2435,7 +2427,6 @@ skip.installer property in build.propert
-
@@ -2445,36 +2436,6 @@ skip.installer property in build.propert
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2542,7 +2503,6 @@ skip.installer property in build.propert
-
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1713397&r1=1713396&r2=1713397&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 9 11:39:07 2015
@@ -65,6 +65,10 @@
may be overridden by setting UMASK in
setenv.sh. (markt)
+
+Remove native code (Windows Service Wrapper, APR/native connector)
+support for Windows Itanium. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57136] EL Parser escaping dollar sign not ${ or ${...}
https://bz.apache.org/bugzilla/show_bug.cgi?id=57136 --- Comment #30 from Yoni Amir --- Hi, Do you know if this configuration option, quoteAttributeEL, will be available only in tomcat 8.0.29, or also in Tomcat 7.0.66 (or maybe a later 7.0.xx)? Thanks, Yoni -- 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: On escaping of EL in attributes (BZ 57136)
2015-11-06 15:12 GMT+03:00 Mark Thomas : > On 06/11/2015 11:47, Christopher Schultz wrote: >> On 11/5/15 4:34 AM, Mark Thomas wrote: >>> On 05/11/2015 08:48, Mark Thomas wrote: <...> >>> At this point, I don't see a clear argument one way or the other. >>> >>> I've looked through the open JSP spec issues: >>> https://java.net/jira/browse/JSP_SPEC_PUBLIC >>> >>> and I don't see anything for this. I do see a lot of very old issues >>> that don't appear to have been looked at for some time. >>> >>> Given the lack of clarity of the which behaviour is correct, I think we >>> have little choice but to make this optional and that we should get this >>> done before the next 8.0.x release. I intend to start working on that in >>> trunk today. >> <...> > If we did have the TCK we could challenge it again (on the grounds the > spec was never updated so surely that must mean the spec is right and > the TCK is wrong) > >> On the other hand, nobody ready the TCK... only the spec. > > Indeed. > >> So most users will expect form 2. > > If they read the spec carefully enough (and to be fair it took me > several days of reading and re-reading the relevant bits to get to the > point I was happy that I understood what it meant) they should expect > form 1. > If I were in the footwear of somebody who implements a web application that has to run on all web containers implementing the specification, my position will be: All I would care is that all web containers implement this part of specification in the same way. In this case I can "write once, run everywhere", which is usually expected of Java. If this is enforced not through the text of the document, but through the TCK, it is a pity (and a shame on spec leader), but it solves my problem. It is unlikely that some test were removed from TCK unless spec leader officially allows undefined behaviour across different implementations. As such, testing this example in an alternate implementation (e.g. RI) will make a guess on what behaviour is expected here. (Maybe somebody on users list would like to do testing). That aside, as I mention in BZ 57136, form 2 (double escaping) provides better historical compatibility with pre-EL use of tag libraries (JSTL 1.0 / JSP 1.2 version of EL). form 1 (single escaping) is easier to read and write and provides uniformity across using EL in template text and EL in tags. Syntax hiliting in Eclipse IDE (4.4.2 Luna SR2) breaks at current /tomcat-7.0.x/test/webapp-3.0/el-method.jsp (form 1). I have not yet upgraded to current Mars 4.5[.1] to test it there. 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: r1713446 - /tomcat/trunk/res/tomcat.nsi
Author: remm
Date: Mon Nov 9 14:37:04 2015
New Revision: 1713446
URL: http://svn.apache.org/viewvc?rev=1713446&view=rev
Log:
Itanium was dropped.
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1713446&r1=1713445&r2=1713446&view=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Mon Nov 9 14:37:04 2015
@@ -211,8 +211,6 @@ Section "Core" SecTomcatCore
File /oname=$TomcatServiceFileName bin\tomcat@VERSION_MAJOR@.exe
${ElseIf} $Arch == "x64"
File /oname=$TomcatServiceFileName bin\x64\tomcat@VERSION_MAJOR@.exe
- ${ElseIf} $Arch == "i64"
-File /oname=$TomcatServiceFileName bin\i64\tomcat@VERSION_MAJOR@.exe
${EndIf}
FileOpen $ServiceInstallLog "$INSTDIR\logs\service-install.log" a
@@ -264,8 +262,6 @@ Section "Native" SecTomcatNative
File bin\tcnative-1.dll
${ElseIf} $Arch == "x64"
File /oname=tcnative-1.dll bin\x64\tcnative-1.dll
- ${ElseIf} $Arch == "i64"
-File /oname=tcnative-1.dll bin\i64\tcnative-1.dll
${EndIf}
ClearErrors
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/601 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1713446 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 44 mins 56 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151109-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151109.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151109-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-ma ster/dest-20151109/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib
svn commit: r1713486 - /tomcat/native/trunk/native/src/ssl.c
Author: rjung Date: Mon Nov 9 17:41:30 2015 New Revision: 1713486 URL: http://svn.apache.org/viewvc?rev=1713486&view=rev Log: Simplify search for opening define. Modified: tomcat/native/trunk/native/src/ssl.c Modified: tomcat/native/trunk/native/src/ssl.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1713486&r1=1713485&r2=1713486&view=diff == --- tomcat/native/trunk/native/src/ssl.c (original) +++ tomcat/native/trunk/native/src/ssl.c Mon Nov 9 17:41:30 2015 @@ -1727,7 +1727,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, getHandsha /*** End Apple API Additions ***/ -#else +#else /* HAVE_OPENSSL */ /* OpenSSL is not supported. * Create empty stubs. */ @@ -2097,4 +2097,4 @@ TCN_IMPLEMENT_CALL(jint, SSL, getHandsha tcn_ThrowException(e, "Not implemented"); } /*** End Apple API Additions ***/ -#endif +#endif /* HAVE_OPENSSL */ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713487 - in /tomcat/native/trunk: native/src/ssl.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Mon Nov 9 17:45:08 2015
New Revision: 1713487
URL: http://svn.apache.org/viewvc?rev=1713487&view=rev
Log:
Fix the signature of the implementation of the
native SSL method newSSL() in the case when
OPENSSL is not available.
Use the same signature in the case when
HAVE_OPENSSL is not defined as in the case
when it is defined.
Modified:
tomcat/native/trunk/native/src/ssl.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1713487&r1=1713486&r2=1713487&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Mon Nov 9 17:45:08 2015
@@ -1861,9 +1861,12 @@ TCN_IMPLEMENT_CALL(jint, SSL, getLastErr
return 0;
}
-TCN_IMPLEMENT_CALL(jlong, SSL, newSSL)(TCN_STDARGS, jlong ssl_ctx) {
+TCN_IMPLEMENT_CALL(jlong /* SSL * */, SSL, newSSL)(TCN_STDARGS,
+ jlong ctx /* tcn_ssl_ctxt_t
* */,
+ jboolean server) {
UNREFERENCED(o);
- UNREFERENCED(ssl_ctx);
+ UNREFERENCED(ctx);
+ UNREFERENCED(server);
tcn_ThrowException(e, "Not implemented");
return 0;
}
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1713487&r1=1713486&r2=1713487&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Mon Nov 9 17:45:08
2015
@@ -46,6 +46,10 @@
Fix typo in declaration of a stub method used when the library is
compiled without OpenSSL support. (kkolinko)
+
+ Fix the signature of the implementation of the native SSL method
+ newSSL() in the case when OPENSSL is not available. (rjung)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713495 - in /tomcat/native/trunk: native/src/sslinfo.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Mon Nov 9 17:55:47 2015
New Revision: 1713495
URL: http://svn.apache.org/viewvc?rev=1713495&view=rev
Log:
Fix the signature of the implementation of the
native SSLSocket method getInfoB() to return
jbyteArray instead of jobject.
This is consistent with what it actually
returns and how the native Java method is
declared.
Modified:
tomcat/native/trunk/native/src/sslinfo.c
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1713495&r1=1713494&r2=1713495&view=diff
==
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Mon Nov 9 17:55:47 2015
@@ -197,8 +197,8 @@ static char *lookup_ssl_cert_dn(X509_NAM
return result;
}
-TCN_IMPLEMENT_CALL(jobject, SSLSocket, getInfoB)(TCN_STDARGS, jlong sock,
- jint what)
+TCN_IMPLEMENT_CALL(jbyteArray, SSLSocket, getInfoB)(TCN_STDARGS, jlong sock,
+jint what)
{
tcn_socket_t *a = J2P(sock, tcn_socket_t *);
tcn_ssl_conn_t *s;
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1713495&r1=1713494&r2=1713495&view=diff
==
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Mon Nov 9 17:55:47
2015
@@ -50,6 +50,12 @@
Fix the signature of the implementation of the native SSL method
newSSL() in the case when OPENSSL is not available. (rjung)
+
+ Fix the signature of the implementation of the native SSLSocket
+ method getInfoB() to return jbyteArray instead of jobject.
+ This is consistent with what it actually returns and how
+ the native Java method is declared. (rjung)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713496 - /tomcat/native/trunk/native/src/sslinfo.c
Author: rjung
Date: Mon Nov 9 17:57:30 2015
New Revision: 1713496
URL: http://svn.apache.org/viewvc?rev=1713496&view=rev
Log:
Followup to r1713495: Forgot the non-OPENSSL
branch.
Modified:
tomcat/native/trunk/native/src/sslinfo.c
Modified: tomcat/native/trunk/native/src/sslinfo.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslinfo.c?rev=1713496&r1=1713495&r2=1713496&view=diff
==
--- tomcat/native/trunk/native/src/sslinfo.c (original)
+++ tomcat/native/trunk/native/src/sslinfo.c Mon Nov 9 17:57:30 2015
@@ -573,8 +573,8 @@ TCN_IMPLEMENT_CALL(jint, SSLSocket, getI
* Create empty stubs.
*/
-TCN_IMPLEMENT_CALL(jobject, SSLSocket, getInfoB)(TCN_STDARGS, jlong sock,
- jint what)
+TCN_IMPLEMENT_CALL(jbyteArray, SSLSocket, getInfoB)(TCN_STDARGS, jlong sock,
+jint what)
{
UNREFERENCED_STDARGS;
UNREFERENCED(sock);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1713507 - /tomcat/native/trunk/native/build/api.pl
Author: rjung Date: Mon Nov 9 18:36:41 2015 New Revision: 1713507 URL: http://svn.apache.org/viewvc?rev=1713507&view=rev Log: Add a script to check consistency of native C and Java API. There probably exists a more clever approach but it seems to work for the time being. Currently in trunk all methods that exists in both worlds have consistent signatures, but a lot of methods are missing in one of the two worlds. I have not yet completely checked the result, but the current reported inconsistencies are: Missing Java API: In Library: boolean has(int) boolean initialize() int size(int) int version(int) In Lock: int cleanup(long) In Pool: long palloc(long,int) long pcalloc(long,int) long unmanaged() In SSL: boolean generateRSATempKey(int) int getHandshakeCount(long) boolean loadDSATempKey(int,String) In SSLContext: boolean setCertificateRaw(long,byte\[\],byte\[\],int) In Socket: long get(long,int) In Status: boolean is(int,int) Missing C API: For Local: long accept(long) int bind(long,long) int connect(long,long) long create(String,long) int listen(long,int) For OS: String expand(String) int info(long[]) void syslog(int,String) void sysloginit(String) For Registry: int close(long) long create(int,String,int,long) int deleteKey(int,String,boolean) int deleteValue(long,String) String[] enumKeys(long) String[] enumValues(long) int getSize(long,String) int getType(long,String) String[] getValueA(long,String) byte[] getValueB(long,String) int getValueI(long,String) long getValueJ(long,String) String getValueS(long,String) long open(int,String,int,long) int setValueA(long,String,String[]) int setValueB(long,String,byte[]) int setValueE(long,String,String) int setValueI(long,String,int) int setValueJ(long,String,long) int setValueS(long,String,String) For SSL: void flushBIO(long) Added: tomcat/native/trunk/native/build/api.pl (with props) Added: tomcat/native/trunk/native/build/api.pl URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/api.pl?rev=1713507&view=auto == --- tomcat/native/trunk/native/build/api.pl (added) +++ tomcat/native/trunk/native/build/api.pl Mon Nov 9 18:36:41 2015 @@ -0,0 +1,367 @@ +#!/usr/bin/perl + +# 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. + +# - +# Compare the native API with native methods in the Java API. +# - + +# - +# TODO: +# - use method name plus return type plus args as key instead of +# only method name +# - +# + +use strict; + +# Modules needed, should all be standard + +# Commandline option parsing +use Getopt::Std; +# dirname function +use File::Basename; +# Traverse through directory structure and execute +# callback for each file +use File::Find; +# Platform agnostic concatenation of directory and file names +use File::Spec::Functions; + +### BEGIN VARIABLES WHICH MUST BE MAINTAINED # + +# Script version, printed via getopts with "--version" +our $VERSION = '1.0'; + +# Sub directories containing c native API and Java classes. +# Path relative to tcnative main project directory. +my $C_NATIVE_SUBDIR = 'native/src'; +my $JAVA_API_SUBDIR = 'java'; + +# Macro used for marking C native API +my $C_NATIVE_DECLARATION = 'TCN_IMPLEMENT_CALL'; + +# Macro used for marking C native API arguments +my $C_NATIVE_ARGUMENTS = 'TCN_STDARGS'; + +### END VARIABLES WHICH MUST BE MAINTAINED # + +# Global data variables + +# Print verbose output? +my $verbose = 0; + +# Signature structures +my %
