svn commit: r1607262 - /tomcat/native/trunk/native/src/ssl.c
Author: kkolinko
Date: Wed Jul 2 07:32:51 2014
New Revision: 1607262
URL: http://svn.apache.org/r1607262
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56423
Provide stubs for methods fipsModeGet, fipsModeSet for the case if TCNative is
compiled without OpenSSL.
The methods throw an exception like their non-stub implementations do in case
FIPS mode is not available.
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=1607262&r1=1607261&r2=1607262&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Jul 2 07:32:51 2014
@@ -1152,11 +1152,18 @@ TCN_IMPLEMENT_CALL(void, SSL, randSet)(T
UNREFERENCED(file);
}
+TCN_IMPLEMENT_CALL(jint, SSL, fipsModeGet)(TCN_STDARGS)
+{
+UNREFERENCED(o);
+tcn_ThrowException(e, "FIPS was not available to tcnative at build time.
You will need to re-build tcnative against an OpenSSL with FIPS.");
+return 0;
+}
+
TCN_IMPLEMENT_CALL(jint, SSL, fipsModeSet)(TCN_STDARGS, jint mode)
{
-UNREFERENCED_STDARGS;
+UNREFERENCED(o);
UNREFERENCED(mode);
-
+tcn_ThrowException(e, "FIPS was not available to tcnative at build time.
You will need to re-build tcnative against an OpenSSL with FIPS.");
return 0;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607264 - in /tomcat/native/branches/1.1.x: ./ native/src/ssl.c xdocs/miscellaneous/changelog.xml
Author: kkolinko
Date: Wed Jul 2 07:38:22 2014
New Revision: 1607264
URL: http://svn.apache.org/r1607264
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56423
Provide stubs for methods fipsModeGet, fipsModeSet for the case if TCNative is
compiled without OpenSSL.
The methods throw an exception like their non-stub implementations do in case
FIPS mode is not available.
Not tested.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/ssl.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Propchange: tomcat/native/branches/1.1.x/
--
Merged /tomcat/native/trunk:r1607262
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1607264&r1=1607263&r2=1607264&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jul 2 07:38:22 2014
@@ -1165,11 +1165,18 @@ TCN_IMPLEMENT_CALL(void, SSL, randSet)(T
UNREFERENCED(file);
}
+TCN_IMPLEMENT_CALL(jint, SSL, fipsModeGet)(TCN_STDARGS)
+{
+UNREFERENCED(o);
+tcn_ThrowException(e, "FIPS was not available to tcnative at build time.
You will need to re-build tcnative against an OpenSSL with FIPS.");
+return 0;
+}
+
TCN_IMPLEMENT_CALL(jint, SSL, fipsModeSet)(TCN_STDARGS, jint mode)
{
-UNREFERENCED_STDARGS;
+UNREFERENCED(o);
UNREFERENCED(mode);
-
+tcn_ThrowException(e, "FIPS was not available to tcnative at build time.
You will need to re-build tcnative against an OpenSSL with FIPS.");
return 0;
}
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1607264&r1=1607263&r2=1607264&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Wed Jul 2
07:38:22 2014
@@ -41,7 +41,11 @@
56396: Do not create RSA keys shorter the 1024 bits
if inside FIPS mode. (mturk)
-
+
+
+ 56423: Implement stubs for methods fipsModeGet, fipsModeSet
+ when library is compiled without OpenSSL. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56423] Implement "fipsModeGet" method stub in case TCN is compiled without OpenSSL
https://issues.apache.org/bugzilla/show_bug.cgi?id=56423 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED OS||All --- Comment #2 from Konstantin Kolinko --- The patch was applied to native trunk and 1.1.x (r1607264). It will be in 1.1.31 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607267 - /tomcat/native/trunk/native/src/ssl.c
Author: kkolinko
Date: Wed Jul 2 07:54:11 2014
New Revision: 1607267
URL: http://svn.apache.org/r1607267
Log:
>From https://issues.apache.org/bugzilla/show_bug.cgi?id=55938
Simplify. Thanks to clang report of "Value stored to 'j' is never read".
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=1607267&r1=1607266&r2=1607267&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Jul 2 07:54:11 2014
@@ -981,7 +981,7 @@ TCN_IMPLEMENT_CALL(jlong, SSL, newBIO)(T
goto init_failed;
}
j = (BIO_JAVA *)bio->ptr;
-if ((j = (BIO_JAVA *)bio->ptr) == NULL) {
+if (j == NULL) {
tcn_ThrowException(e, "Create BIO failed");
goto init_failed;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607271 - in /tomcat/native/branches/1.1.x: ./ native/src/ssl.c
Author: kkolinko
Date: Wed Jul 2 07:55:56 2014
New Revision: 1607271
URL: http://svn.apache.org/r1607271
Log:
>From https://issues.apache.org/bugzilla/show_bug.cgi?id=55938
Simplify. Thanks to clang report of "Value stored to 'j' is never read".
Merged r1607267 from tomcat/native/trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/ssl.c
Propchange: tomcat/native/branches/1.1.x/
--
Merged /tomcat/native/trunk:r1607267
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1607271&r1=1607270&r2=1607271&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jul 2 07:55:56 2014
@@ -994,7 +994,7 @@ TCN_IMPLEMENT_CALL(jlong, SSL, newBIO)(T
goto init_failed;
}
j = (BIO_JAVA *)bio->ptr;
-if ((j = (BIO_JAVA *)bio->ptr) == NULL) {
+if (j == NULL) {
tcn_ThrowException(e, "Create BIO failed");
goto init_failed;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607278 - /tomcat/native/trunk/native/src/ssl.c
Author: kkolinko
Date: Wed Jul 2 08:19:21 2014
New Revision: 1607278
URL: http://svn.apache.org/r1607278
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=55938
Fix "Dereference of null pointer" issues identified by clang, in "jbs_read",
"jbs_write".
Not tested, but an obvious fix.
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=1607278&r1=1607277&r2=1607278&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Jul 2 08:19:21 2014
@@ -871,8 +871,8 @@ static int jbs_write(BIO *b, const char
if (b->init && in != NULL) {
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = NULL;
-jbyteArray jb = (*e)->NewByteArray(e, inl);
tcn_get_java_env(&e);
+jbyteArray jb = (*e)->NewByteArray(e, inl);
if (!(*e)->ExceptionOccurred(e)) {
(*e)->SetByteArrayRegion(e, jb, 0, inl, (jbyte *)in);
ret = (*e)->CallIntMethod(e, j->cb.obj,
@@ -890,8 +890,8 @@ static int jbs_read(BIO *b, char *out, i
if (b->init && out != NULL) {
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = NULL;
-jbyteArray jb = (*e)->NewByteArray(e, outl);
tcn_get_java_env(&e);
+jbyteArray jb = (*e)->NewByteArray(e, outl);
if (!(*e)->ExceptionOccurred(e)) {
ret = (*e)->CallIntMethod(e, j->cb.obj,
j->cb.mid[1], jb);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607285 - in /tomcat/native/branches/1.1.x: ./ native/src/ssl.c xdocs/miscellaneous/changelog.xml
Author: kkolinko
Date: Wed Jul 2 08:26:00 2014
New Revision: 1607285
URL: http://svn.apache.org/r1607285
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=55938
Fix "Dereference of null pointer" issues identified by clang-analyzer, in
"jbs_read", "jbs_write".
Merged r1607278 from tomcat/native/trunk.
Not tested, but an obvious fix.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/ssl.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Propchange: tomcat/native/branches/1.1.x/
--
Merged /tomcat/native/trunk:r1607278
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1607285&r1=1607284&r2=1607285&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jul 2 08:26:00 2014
@@ -884,8 +884,8 @@ static int jbs_write(BIO *b, const char
if (b->init && in != NULL) {
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = NULL;
-jbyteArray jb = (*e)->NewByteArray(e, inl);
tcn_get_java_env(&e);
+jbyteArray jb = (*e)->NewByteArray(e, inl);
if (!(*e)->ExceptionOccurred(e)) {
(*e)->SetByteArrayRegion(e, jb, 0, inl, (jbyte *)in);
ret = (*e)->CallIntMethod(e, j->cb.obj,
@@ -903,8 +903,8 @@ static int jbs_read(BIO *b, char *out, i
if (b->init && out != NULL) {
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = NULL;
-jbyteArray jb = (*e)->NewByteArray(e, outl);
tcn_get_java_env(&e);
+jbyteArray jb = (*e)->NewByteArray(e, outl);
if (!(*e)->ExceptionOccurred(e)) {
ret = (*e)->CallIntMethod(e, j->cb.obj,
j->cb.mid[1], jb);
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1607285&r1=1607284&r2=1607285&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Wed Jul 2
08:26:00 2014
@@ -39,6 +39,10 @@
+ 55938: Fix "Dereference of null pointer" issues in rarely
+ used methods in ssl.c, as identified by clang-analyzer. (kkolinko)
+
+
56396: Do not create RSA keys shorter the 1024 bits
if inside FIPS mode. (mturk)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607291 - /tomcat/native/trunk/native/src/network.c
Author: kkolinko Date: Wed Jul 2 08:36:11 2014 New Revision: 1607291 URL: http://svn.apache.org/r1607291 Log: For https://issues.apache.org/bugzilla/show_bug.cgi?id=55938 Fix "Dead assignment" issue identified by clang-analyzer, in Socket.sendto(). I expect that this bug would have lead to a memory leak, as GetByteArrayElements was not followed by ReleaseByteArrayElements. This method is never called by the current Tomcat 8, 7 or 6. Not tested, but an obvious fix. Modified: tomcat/native/trunk/native/src/network.c Modified: tomcat/native/trunk/native/src/network.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1607291&r1=1607290&r2=1607291&view=diff == --- tomcat/native/trunk/native/src/network.c (original) +++ tomcat/native/trunk/native/src/network.c Wed Jul 2 08:36:11 2014 @@ -697,13 +697,12 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendto) TCN_ASSERT(sock != 0); TCN_ASSERT(s->sock != NULL); -bytes = (*e)->GetByteArrayElements(e, buf, NULL); -TCN_ASSERT(bytes != NULL); apr_socket_opt_get(s->sock, APR_SO_NONBLOCK, &nb); if (nb) bytes = (*e)->GetPrimitiveArrayCritical(e, buf, NULL); else bytes = (*e)->GetByteArrayElements(e, buf, NULL); +TCN_ASSERT(bytes != NULL); ss = apr_socket_sendto(s->sock, w, flag, (char *)(bytes + offset), &nbytes); if (nb) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607296 - in /tomcat/native/branches/1.1.x: ./ native/src/network.c xdocs/miscellaneous/changelog.xml
Author: kkolinko Date: Wed Jul 2 08:45:42 2014 New Revision: 1607296 URL: http://svn.apache.org/r1607296 Log: For https://issues.apache.org/bugzilla/show_bug.cgi?id=55938 Fix "Dead assignment" issue identified by clang-analyzer, in Socket.sendto(). I expect that this bug would have lead to a memory leak, as GetByteArrayElements was not followed by ReleaseByteArrayElements. This method is never called by the current Tomcat 8, 7 or 6. Merged r1607291 from tomcat/native/trunk. Not tested, but an obvious fix. Modified: tomcat/native/branches/1.1.x/ (props changed) tomcat/native/branches/1.1.x/native/src/network.c tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Propchange: tomcat/native/branches/1.1.x/ -- Merged /tomcat/native/trunk:r1607291 Modified: tomcat/native/branches/1.1.x/native/src/network.c URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/network.c?rev=1607296&r1=1607295&r2=1607296&view=diff == --- tomcat/native/branches/1.1.x/native/src/network.c (original) +++ tomcat/native/branches/1.1.x/native/src/network.c Wed Jul 2 08:45:42 2014 @@ -719,13 +719,12 @@ TCN_IMPLEMENT_CALL(jint, Socket, sendto) TCN_ASSERT(sock != 0); TCN_ASSERT(s->sock != NULL); -bytes = (*e)->GetByteArrayElements(e, buf, NULL); -TCN_ASSERT(bytes != NULL); apr_socket_opt_get(s->sock, APR_SO_NONBLOCK, &nb); if (nb) bytes = (*e)->GetPrimitiveArrayCritical(e, buf, NULL); else bytes = (*e)->GetByteArrayElements(e, buf, NULL); +TCN_ASSERT(bytes != NULL); ss = apr_socket_sendto(s->sock, w, flag, (char *)(bytes + offset), &nbytes); if (nb) Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1607296&r1=1607295&r2=1607296&view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Wed Jul 2 08:45:42 2014 @@ -40,7 +40,8 @@ 55938: Fix "Dereference of null pointer" issues in rarely - used methods in ssl.c, as identified by clang-analyzer. (kkolinko) + used methods in ssl.c. Fix possible memory leak in Socket.sendto(). + The issues were identified with clang-analyzer. (kkolinko) 56396: Do not create RSA keys shorter the 1024 bits - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55938] clang-analyzer report for 1.1.29
https://issues.apache.org/bugzilla/show_bug.cgi?id=55938 --- Comment #3 from Konstantin Kolinko --- Thank you. An obvious "Dead assignment" issue in ssl.c fixed with r1607271. Two "Dereference of null pointer" issues in ssl.c fixed with r1607278. A "Dead assignment" issue in Socket.sendto() (network.c) fixed with r1607296. The fixes will be in TCNative 1.1.31 Two "Dead assignment" bugs in File.writeFull(), File.write() (file.c): - I think the fix should be on the Java side to remove "-1" as allowed value for size in Javadoc for these methods, and also in File.read() and others. - The unused GetArrayLength() calls can be removed from C code. Motivation: 1). The code does not work, and nobody complained. 2). It is easy to measure array length in Java. There is no need for this feature. 3). While is is easy to fix the assignment (it should assign to "nbytes" variable), the code is wrong and dangerous. It shall subtract "offset" from the array length, as "offset" can be non-zero. "Dead assignment" in SSL_callback_SSL_verify (sslutils.c) is some TODO code. No issue. "Argument with 'nonnull' attribute passed null" issues in Pool.dataGet(), Pool.dataSet() (pool.c) shall be taken care in Java code by never passing null as the value of "key". No issues here. -- 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: r1607309 - in /tomcat/trunk: java/org/apache/catalina/valves/SSLValve.java webapps/docs/changelog.xml
Author: remm
Date: Wed Jul 2 10:33:49 2014
New Revision: 1607309
URL: http://svn.apache.org/r1607309
Log:
Trivial change to add configuration fields to SSLValve for header names.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=1607309&r1=1607308&r2=1607309&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java Wed Jul 2
10:33:49 2014
@@ -64,6 +64,10 @@ public class SSLValve extends ValveBase
private static final Log log = LogFactory.getLog(SSLValve.class);
+protected String sslClientCertHeader = "ssl_client_cert";
+protected String sslCipherHeader = "ssl_cipher";
+protected String sslSessionIdHeader = "ssl_session_id";
+protected String sslCipherUserKeySizeHeader = "ssl_cipher_usekeysize";
//-- Constructor
public SSLValve() {
@@ -71,6 +75,38 @@ public class SSLValve extends ValveBase
}
+public String getSslClientCertHeader() {
+return sslClientCertHeader;
+}
+
+public void setSslClientCertHeader(String sslClientCertHeader) {
+this.sslClientCertHeader = sslClientCertHeader;
+}
+
+public String getSslCipherHeader() {
+return sslCipherHeader;
+}
+
+public void setSslCipherHeader(String sslCipherHeader) {
+this.sslCipherHeader = sslCipherHeader;
+}
+
+public String getSslSessionIdHeader() {
+return sslSessionIdHeader;
+}
+
+public void setSslSessionIdHeader(String sslSessionIdHeader) {
+this.sslSessionIdHeader = sslSessionIdHeader;
+}
+
+public String getSslCipherUserKeySizeHeader() {
+return sslCipherUserKeySizeHeader;
+}
+
+public void setSslCipherUserKeySizeHeader(String
sslCipherUserKeySizeHeader) {
+this.sslCipherUserKeySizeHeader = sslCipherUserKeySizeHeader;
+}
+
public String mygetHeader(Request request, String header) {
String strcert0 = request.getHeader(header);
@@ -88,7 +124,7 @@ public class SSLValve extends ValveBase
throws IOException, ServletException {
/* mod_header converts the '\n' into ' ' so we have to rebuild the
client certificate */
-String strcert0 = mygetHeader(request, "ssl_client_cert");
+String strcert0 = mygetHeader(request, sslClientCertHeader);
if (strcert0 != null && strcert0.length()>28) {
String strcert1 = strcert0.replace(' ', '\n');
String strcert2 = strcert1.substring(28, strcert1.length()-26);
@@ -119,15 +155,15 @@ public class SSLValve extends ValveBase
}
request.setAttribute(Globals.CERTIFICATES_ATTR, jsseCerts);
}
-strcert0 = mygetHeader(request, "ssl_cipher");
+strcert0 = mygetHeader(request, sslCipherHeader);
if (strcert0 != null) {
request.setAttribute(Globals.CIPHER_SUITE_ATTR, strcert0);
}
-strcert0 = mygetHeader(request, "ssl_session_id");
+strcert0 = mygetHeader(request, sslSessionIdHeader);
if (strcert0 != null) {
request.setAttribute(Globals.SSL_SESSION_ID_ATTR, strcert0);
}
-strcert0 = mygetHeader(request, "ssl_cipher_usekeysize");
+strcert0 = mygetHeader(request, sslCipherUserKeySizeHeader);
if (strcert0 != null) {
request.setAttribute(Globals.KEY_SIZE_ATTR,
Integer.valueOf(strcert0));
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1607309&r1=1607308&r2=1607309&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jul 2 10:33:49 2014
@@ -92,6 +92,9 @@
Fix storeconfig exception routing issues, so that a major problem
should avoid configuration overwrite. (remm)
+
+Add configuration fields for header names in SSLValve. (remm)
+
-
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/229 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1607309 Blamelist: remm 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
[Bug 56027] Unable to use TCN on RHEL6 boxes if box is booted in fips mode
https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 --- Comment #21 from Ben Mason --- I am still getting this error as well. Is this the key length issue? It is unclear in this thread whether that was ever fixed. Rob Sanders said he filed another bug, but it appears it was deleted. (In reply to Christopher Schultz from comment #20) > I believe the "SSL2 MD5" routines problem is different from this issue, > which was to allow Tomcat to start up with OpenSSL already in FIPS mode > (e.g. don't choke and die if we're already in FIPS mode). > > Next, Tomcat tries to initialize the SSL endpoint with a list of ciphers and > I think it request too many ciphers (and violates FIPS requirements). I'm > not sure why this fails when already in FIPS mode versus working when > explicitly entering FIPS mode first. I thought this failure had been > reported elewhere but I can't seem to find the reference right now. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607371 - /tomcat/native/branches/1.1.x/native/srclib/VERSIONS
Author: markt Date: Wed Jul 2 14:07:15 2014 New Revision: 1607371 URL: http://svn.apache.org/r1607371 Log: Update OpenSSL version Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS Modified: tomcat/native/branches/1.1.x/native/srclib/VERSIONS URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/srclib/VERSIONS?rev=1607371&r1=1607370&r2=1607371&view=diff == --- tomcat/native/branches/1.1.x/native/srclib/VERSIONS (original) +++ tomcat/native/branches/1.1.x/native/srclib/VERSIONS Wed Jul 2 14:07:15 2014 @@ -1,4 +1,4 @@ Use the following version of the libraries - APR 1.4.8, http://apr.apache.org -- OpenSSL 1.0.1g, http://www.openssl.org +- OpenSSL 1.0.1h, http://www.openssl.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607374 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Author: markt Date: Wed Jul 2 14:13:03 2014 New Revision: 1607374 URL: http://svn.apache.org/r1607374 Log: Update changelog Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1607374&r1=1607373&r2=1607374&view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Wed Jul 2 14:13:03 2014 @@ -51,6 +51,9 @@ 56423: Implement stubs for methods fipsModeGet, fipsModeSet when library is compiled without OpenSSL. (kkolinko) + + 56596: Use OpenSSL 1.0.1h with Windows binaries. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56027] Unable to use TCN on RHEL6 boxes if box is booted in fips mode
https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 --- Comment #22 from Konstantin Kolinko --- (In reply to Ben Mason from comment #21) > Is this the key length issue? It is > unclear in this thread whether that was ever fixed. Rob Sanders said he > filed another bug, but it appears it was deleted. Key length issue is bug 56396, should be fixed in TCNative 1.1.31. (r1587896) -- 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: [Bug 56027] Unable to use TCN on RHEL6 boxes if box is booted in fips mode
Now I'm confused. When Mladen posted his patch against bug 56396 I'd pulled that code and tested it and it worked. So I thought it would be in TCN 1.1.30. But when I look at TCNative 1.1.30 (included in Tomcat 6.0.41) I don't see that code, and without it my tests should have failed. So it looks like I not only messed up my testing against bug 56396 (pulled wrong code?), but also must have done something wrong when testing 6.0.41 with the included tcn1.1.30 last week. Let me see if I can figure out what I did wrong. -R From: bugzi...@apache.org [bugzi...@apache.org] Sent: Wednesday, July 02, 2014 10:26 AM To: dev@tomcat.apache.org Subject: [Bug 56027] Unable to use TCN on RHEL6 boxes if box is booted in fips mode https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 --- Comment #22 from Konstantin Kolinko --- (In reply to Ben Mason from comment #21) > Is this the key length issue? It is > unclear in this thread whether that was ever fixed. Rob Sanders said he > filed another bug, but it appears it was deleted. Key length issue is bug 56396, should be fixed in TCNative 1.1.31. (r1587896) -- 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 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: [Bug 56027] Unable to use TCN on RHEL6 boxes if box is booted in fips mode
Just double checked - error appears to be on my side. I stood up a pristine CentOS 6.5 box with Tomcat 6.0.41/TCN1.1.30 in FIPS mode and it fails to start. Manually applying the bugfix as suggested in bug 56396 does work. My apologies for flagging this as working earlier in this thread. I think there was some debris from testing that actually made things work when I tried to verify this earlier. -R From: Robert Sanders [rsand...@trustedcs.com] Sent: Wednesday, July 02, 2014 10:42 AM To: Tomcat Developers List Subject: RE: [Bug 56027] Unable to use TCN on RHEL6 boxes if box is booted in fips mode Now I'm confused. When Mladen posted his patch against bug 56396 I'd pulled that code and tested it and it worked. So I thought it would be in TCN 1.1.30. But when I look at TCNative 1.1.30 (included in Tomcat 6.0.41) I don't see that code, and without it my tests should have failed. So it looks like I not only messed up my testing against bug 56396 (pulled wrong code?), but also must have done something wrong when testing 6.0.41 with the included tcn1.1.30 last week. Let me see if I can figure out what I did wrong. -R From: bugzi...@apache.org [bugzi...@apache.org] Sent: Wednesday, July 02, 2014 10:26 AM To: dev@tomcat.apache.org Subject: [Bug 56027] Unable to use TCN on RHEL6 boxes if box is booted in fips mode https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 --- Comment #22 from Konstantin Kolinko --- (In reply to Ben Mason from comment #21) > Is this the key length issue? It is > unclear in this thread whether that was ever fixed. Rob Sanders said he > filed another bug, but it appears it was deleted. Key length issue is bug 56396, should be fixed in TCNative 1.1.31. (r1587896) -- 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 - 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
svn commit: r1607422 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: markt
Date: Wed Jul 2 17:06:31 2014
New Revision: 1607422
URL: http://svn.apache.org/r1607422
Log:
Tweak sed command so it does the same thing but works on OSX
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1607422&r1=1607421&r2=1607422&view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Wed Jul 2 17:06:31 2014
@@ -192,7 +192,7 @@ fi
# Remove first 25 lines from converted file which contains
# page navagation data.
# Remember to increase the lines when new file is added to news.
-sed -i '1,25d' ../../CHANGELOG.txt
+sed -i '' '1,25d' ../../CHANGELOG.txt
cd "$top"
mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
rm -rf ${JKJNIDIST}/jni/build
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Time for Tomcat Native 1.1.31 ?
On 01/07/2014 20:14, Mark Thomas wrote: > Folks, > > I think I have all the pieces in place to do a Tomcat Native 1.1.31 release. > > Is anyone aware of anything that needs fixing before 1.1.31 is tagged? > > Unless someone identifies an issue then I intend to tag 1.1.31 tomorrow > morning my time (in 12-14 hours time). So much for that prediction. I think the 1.1.x branch is now ready for tagging. I plan to tag in around an hour or so. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607445 - in /tomcat/native/tags/TOMCAT_NATIVE_1_1_31: ./ native/include/tcn_version.h
Author: markt
Date: Wed Jul 2 18:47:46 2014
New Revision: 1607445
URL: http://svn.apache.org/r1607445
Log:
Tag 1.1.31
Added:
tomcat/native/tags/TOMCAT_NATIVE_1_1_31/ (props changed)
- copied from r1607443, tomcat/native/branches/1.1.x/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_1_31/native/include/tcn_version.h
Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_31/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jul 2 18:47:46 2014
@@ -0,0 +1 @@
+dist
Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_31/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 2 18:47:46 2014
@@ -0,0 +1,3 @@
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291
+/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
+/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/tags/TOMCAT_NATIVE_1_1_31/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_1_31/native/include/tcn_version.h?rev=1607445&r1=1607443&r2=1607445&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_1_31/native/include/tcn_version.h
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_1_31/native/include/tcn_version.h Wed
Jul 2 18:47:46 2014
@@ -75,7 +75,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Trivial Update of "BuildTcNativeWin" by markt
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "BuildTcNativeWin" page has been changed by markt:
https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diff&rev1=13&rev2=14
Comment:
Minor fixes
{{{
c:
cd \
- svn co http://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x/
tomcat-native-1.1.x
+ svn co https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x/
tomcat-native-1.1.x
cd tomcat-native-1.1.x\native\srclib\apr
}}}
- Unpack APR 1.4.8 source distribution in this directory. ((Note that APR 1.4.8
source is not the current default. Visiting the APR project's page will steer
you towards APR 1.5.1 which requires a slightly different patch. The effect is
the same, but the line numbers are sufficiently different that the patch
included in the tcnative sources will not apply at all.))
+ Unpack APR 1.4.8 source distribution in this directory. (Note that APR 1.4.8
source is not the current default. Visiting the APR project's page will steer
you towards APR 1.5.1 which requires a slightly different patch. The effect is
the same, but the line numbers are sufficiently different that the patch
included in the tcnative sources will not apply at all.)
Apply the apr-enable-ipv6.patch.
{{{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607454 - /tomcat/native/branches/1.1.x/build.xml
Author: kkolinko Date: Wed Jul 2 19:37:15 2014 New Revision: 1607454 URL: http://svn.apache.org/r1607454 Log: Update version number (The number is already present in build.properties.default, so this should be unnecessary) Modified: tomcat/native/branches/1.1.x/build.xml Modified: tomcat/native/branches/1.1.x/build.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=1607454&r1=1607453&r2=1607454&view=diff == --- tomcat/native/branches/1.1.x/build.xml (original) +++ tomcat/native/branches/1.1.x/build.xml Wed Jul 2 19:37:15 2014 @@ -33,7 +33,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1607278 - /tomcat/native/trunk/native/src/ssl.c
On 02/07/2014 09:19, kkoli...@apache.org wrote:
> Author: kkolinko
> Date: Wed Jul 2 08:19:21 2014
> New Revision: 1607278
>
> URL: http://svn.apache.org/r1607278
> Log:
> For https://issues.apache.org/bugzilla/show_bug.cgi?id=55938
> Fix "Dereference of null pointer" issues identified by clang, in "jbs_read",
> "jbs_write".
> Not tested, but an obvious fix.
I need to brush up on my C to get my head around why, but this commit
has broken the build.
Complete error text follows:
cl -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS -DWINNT -D_WINNT
-D_WIN32_WINNT=0x0501 -DWINVER=0x0501 -D_WIN32_IE=0x0600 -W3 -EHsc
-D_MBCS -DMBCS -D_X86_=1 -
O2 -Ob2 -Oy- -Zi -DNDEBUG -D_MT -MD -DAPR_DECLARE_STATIC -DZLIB_WINAPI
-DNO_IDEA -DNO_RC5 -DNO_MDC2 -DOPENSSL_NO_IDEA -DOPENSSL_NO_RC5
-DOPENSSL_NO_MDC2 -DHAVE
_OPENSSL -DHAVE_SSL_SET_STATE=1 -I.\include -I
"\java\jdk1.7.0_60_x64\include" -I "\java\jdk1.7.0_60_x64\include\win32"
-IC:\deps-x86\apr-1.4.8\include -IC:\dep
s-x86\apr-1.4.8\include\arch\win32 -IC:\deps-x86\openssl-1.0.1h\include
-FoWINXP_X86_DLL_RELEASE\ -FdWINXP_X86_DLL_RELEASE\tcnative-1-src
.\src\ssl.c
ssl.c
.\src\ssl.c(888) : error C2275: 'jbyteArray' : illegal use of this type
as an expression
C:\java\jdk1.7.0_60_x64\include\jni.h(107) : see declaration of
'jbyteArray'
.\src\ssl.c(888) : error C2146: syntax error : missing ';' before
identifier 'jb'
.\src\ssl.c(888) : error C2065: 'jb' : undeclared identifier
.\src\ssl.c(888) : warning C4047: '=' : 'int' differs in levels of
indirection from 'jbyteArray'
.\src\ssl.c(890) : error C2065: 'jb' : undeclared identifier
.\src\ssl.c(890) : warning C4047: 'function' : 'jbyteArray' differs in
levels of indirection from 'int'
.\src\ssl.c(890) : warning C4024: 'function through pointer' : different
types for formal and actual parameter 2
.\src\ssl.c(892) : error C2065: 'jb' : undeclared identifier
.\src\ssl.c(893) : error C2065: 'jb' : undeclared identifier
.\src\ssl.c(893) : warning C4047: 'function' : 'jbyteArray' differs in
levels of indirection from 'int'
.\src\ssl.c(893) : warning C4024: 'function through pointer' : different
types for formal and actual parameter 2
.\src\ssl.c(894) : error C2065: 'jb' : undeclared identifier
.\src\ssl.c(894) : warning C4047: 'function' : 'jobject' differs in
levels of indirection from 'int'
.\src\ssl.c(894) : warning C4024: 'function through pointer' : different
types for formal and actual parameter 2
.\src\ssl.c(907) : error C2275: 'jbyteArray' : illegal use of this type
as an expression
C:\java\jdk1.7.0_60_x64\include\jni.h(107) : see declaration of
'jbyteArray'
.\src\ssl.c(907) : error C2146: syntax error : missing ';' before
identifier 'jb'
.\src\ssl.c(907) : error C2065: 'jb' : undeclared identifier
.\src\ssl.c(907) : warning C4047: '=' : 'int' differs in levels of
indirection from 'jbyteArray'
.\src\ssl.c(910) : error C2065: 'jb' : undeclared identifier
.\src\ssl.c(912) : error C2065: 'jb' : undeclared identifier
.\src\ssl.c(912) : warning C4047: 'function' : 'jarray' differs in
levels of indirection from 'int'
.\src\ssl.c(912) : warning C4024: 'function through pointer' : different
types for formal and actual parameter 2
.\src\ssl.c(914) : error C2065: 'jb' : undeclared identifier
.\src\ssl.c(914) : warning C4047: 'function' : 'jarray' differs in
levels of indirection from 'int'
.\src\ssl.c(914) : warning C4024: 'function through pointer' : different
types for formal and actual parameter 2
.\src\ssl.c(916) : error C2065: 'jb' : undeclared identifier
.\src\ssl.c(916) : warning C4047: 'function' : 'jobject' differs in
levels of indirection from 'int'
.\src\ssl.c(916) : warning C4024: 'function through pointer' : different
types for formal and actual parameter 2
NMAKE : fatal error U1077: 'c:\cmsc\msvc\bin\i386\cl.EXE' : return code
'0x2'
Stop.
>
> 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=1607278&r1=1607277&r2=1607278&view=diff
> ==
> --- tomcat/native/trunk/native/src/ssl.c (original)
> +++ tomcat/native/trunk/native/src/ssl.c Wed Jul 2 08:19:21 2014
> @@ -871,8 +871,8 @@ static int jbs_write(BIO *b, const char
> if (b->init && in != NULL) {
> BIO_JAVA *j = (BIO_JAVA *)b->ptr;
> JNIEnv *e = NULL;
> -jbyteArray jb = (*e)->NewByteArray(e, inl);
> tcn_get_java_env(&e);
> +jbyteArray jb = (*e)->NewByteArray(e, inl);
> if (!(*e)->ExceptionOccurred(e)) {
> (*e)->SetByteArrayRegion(e, jb, 0, inl, (jbyte *)in);
> ret = (*e)->CallIntMethod(e, j->cb.obj,
> @@ -890,8 +890,8 @@ static int jbs_read(BIO *b, char *out, i
> if (b->init && out != NULL) {
> BIO_JAVA *j = (BIO_JAVA *)b->ptr;
> JNIEnv *e = NULL;
> -jbyteArray jb = (*e)->NewByteArray(e, outl);
> tcn_get_java_env(&e
RE: svn commit: r1607278 - /tomcat/native/trunk/native/src/ssl.c
> From: Mark Thomas [mailto:ma...@apache.org]
> Subject: Re: svn commit: r1607278 - /tomcat/native/trunk/native/src/ssl.c
> I need to brush up on my C to get my head around why, but this commit
> has broken the build.
> Modified: tomcat/native/trunk/native/src/ssl.c
> URL:
> http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1607278&r1=1607277&r2=1607278&view=diff
> ==
> --- tomcat/native/trunk/native/src/ssl.c (original)
> +++ tomcat/native/trunk/native/src/ssl.c Wed Jul 2 08:19:21 2014
> @@ -871,8 +871,8 @@ static int jbs_write(BIO *b, const char
> if (b->init && in != NULL) {
> BIO_JAVA *j = (BIO_JAVA *)b->ptr;
> JNIEnv *e = NULL;
> -jbyteArray jb = (*e)->NewByteArray(e, inl);
> tcn_get_java_env(&e);
> +jbyteArray jb = (*e)->NewByteArray(e, inl);
> if (!(*e)->ExceptionOccurred(e)) {
> (*e)->SetByteArrayRegion(e, jb, 0, inl, (jbyte *)in);
> ret = (*e)->CallIntMethod(e, j->cb.obj,
> @@ -890,8 +890,8 @@ static int jbs_read(BIO *b, char *out, i
> if (b->init && out != NULL) {
> BIO_JAVA *j = (BIO_JAVA *)b->ptr;
> JNIEnv *e = NULL;
> -jbyteArray jb = (*e)->NewByteArray(e, outl);
> tcn_get_java_env(&e);
> +jbyteArray jb = (*e)->NewByteArray(e, outl);
> if (!(*e)->ExceptionOccurred(e)) {
> ret = (*e)->CallIntMethod(e, j->cb.obj,
>j->cb.mid[1], jb);
This is C, not C++, so the declaration for jb must come before any
non-declaration statements within the block:
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = NULL;
jbyteArray jb;
tcn_get_java_env(&e);
jb = (*e)->NewByteArray(e, inl);
- Chuck
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1607278 - /tomcat/native/trunk/native/src/ssl.c
On 02/07/2014 21:25, Caldarale, Charles R wrote:
>> From: Mark Thomas [mailto:ma...@apache.org]
>> Subject: Re: svn commit: r1607278 - /tomcat/native/trunk/native/src/ssl.c
>
>> I need to brush up on my C to get my head around why, but this commit
>> has broken the build.
>
>> Modified: tomcat/native/trunk/native/src/ssl.c
>> URL:
>> http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1607278&r1=1607277&r2=1607278&view=diff
>> ==
>> --- tomcat/native/trunk/native/src/ssl.c (original)
>> +++ tomcat/native/trunk/native/src/ssl.c Wed Jul 2 08:19:21 2014
>> @@ -871,8 +871,8 @@ static int jbs_write(BIO *b, const char
>> if (b->init && in != NULL) {
>> BIO_JAVA *j = (BIO_JAVA *)b->ptr;
>> JNIEnv *e = NULL;
>> -jbyteArray jb = (*e)->NewByteArray(e, inl);
>> tcn_get_java_env(&e);
>> +jbyteArray jb = (*e)->NewByteArray(e, inl);
>> if (!(*e)->ExceptionOccurred(e)) {
>> (*e)->SetByteArrayRegion(e, jb, 0, inl, (jbyte *)in);
>> ret = (*e)->CallIntMethod(e, j->cb.obj,
>> @@ -890,8 +890,8 @@ static int jbs_read(BIO *b, char *out, i
>> if (b->init && out != NULL) {
>> BIO_JAVA *j = (BIO_JAVA *)b->ptr;
>> JNIEnv *e = NULL;
>> -jbyteArray jb = (*e)->NewByteArray(e, outl);
>> tcn_get_java_env(&e);
>> +jbyteArray jb = (*e)->NewByteArray(e, outl);
>> if (!(*e)->ExceptionOccurred(e)) {
>> ret = (*e)->CallIntMethod(e, j->cb.obj,
>>j->cb.mid[1], jb);
>
> This is C, not C++, so the declaration for jb must come before any
> non-declaration statements within the block:
>
>BIO_JAVA *j = (BIO_JAVA *)b->ptr;
>JNIEnv *e = NULL;
>jbyteArray jb;
>tcn_get_java_env(&e);
>jb = (*e)->NewByteArray(e, inl);
Thank you! The next time you make it to an Apache event I'm at, I owe
you a beverage of your choice.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607476 - /tomcat/native/tags/TOMCAT_NATIVE_1_1_31/
Author: markt Date: Wed Jul 2 20:37:00 2014 New Revision: 1607476 URL: http://svn.apache.org/r1607476 Log: New to re-tag 1.1.31 due to build failure Removed: tomcat/native/tags/TOMCAT_NATIVE_1_1_31/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607477 - /tomcat/native/trunk/native/src/ssl.c
Author: markt
Date: Wed Jul 2 20:40:08 2014
New Revision: 1607477
URL: http://svn.apache.org/r1607477
Log:
Fix compilation failure. Thanks to Chuck Caldarale.
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=1607477&r1=1607476&r2=1607477&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Jul 2 20:40:08 2014
@@ -871,8 +871,9 @@ static int jbs_write(BIO *b, const char
if (b->init && in != NULL) {
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = NULL;
+jbyteArray jb;
tcn_get_java_env(&e);
-jbyteArray jb = (*e)->NewByteArray(e, inl);
+jb = (*e)->NewByteArray(e, inl);
if (!(*e)->ExceptionOccurred(e)) {
(*e)->SetByteArrayRegion(e, jb, 0, inl, (jbyte *)in);
ret = (*e)->CallIntMethod(e, j->cb.obj,
@@ -890,8 +891,9 @@ static int jbs_read(BIO *b, char *out, i
if (b->init && out != NULL) {
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = NULL;
+jbyteArray jb;
tcn_get_java_env(&e);
-jbyteArray jb = (*e)->NewByteArray(e, outl);
+jb = (*e)->NewByteArray(e, outl);
if (!(*e)->ExceptionOccurred(e)) {
ret = (*e)->CallIntMethod(e, j->cb.obj,
j->cb.mid[1], jb);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607479 - in /tomcat/native/branches/1.1.x: ./ native/src/ssl.c
Author: markt
Date: Wed Jul 2 20:41:18 2014
New Revision: 1607479
URL: http://svn.apache.org/r1607479
Log:
Fix compilation failure. Thanks to Chuck Caldarale.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/ssl.c
Propchange: tomcat/native/branches/1.1.x/
--
Merged /tomcat/native/trunk:r1607477
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1607479&r1=1607478&r2=1607479&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Wed Jul 2 20:41:18 2014
@@ -884,8 +884,9 @@ static int jbs_write(BIO *b, const char
if (b->init && in != NULL) {
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = NULL;
+jbyteArray jb;
tcn_get_java_env(&e);
-jbyteArray jb = (*e)->NewByteArray(e, inl);
+jb = (*e)->NewByteArray(e, inl);
if (!(*e)->ExceptionOccurred(e)) {
(*e)->SetByteArrayRegion(e, jb, 0, inl, (jbyte *)in);
ret = (*e)->CallIntMethod(e, j->cb.obj,
@@ -903,8 +904,9 @@ static int jbs_read(BIO *b, char *out, i
if (b->init && out != NULL) {
BIO_JAVA *j = (BIO_JAVA *)b->ptr;
JNIEnv *e = NULL;
+jbyteArray jb;
tcn_get_java_env(&e);
-jbyteArray jb = (*e)->NewByteArray(e, outl);
+jb = (*e)->NewByteArray(e, outl);
if (!(*e)->ExceptionOccurred(e)) {
ret = (*e)->CallIntMethod(e, j->cb.obj,
j->cb.mid[1], jb);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1607480 - in /tomcat/native/tags/TOMCAT_NATIVE_1_1_31: ./ native/include/tcn_version.h
Author: markt
Date: Wed Jul 2 20:44:15 2014
New Revision: 1607480
URL: http://svn.apache.org/r1607480
Log:
Tag 1.1.31
Added:
tomcat/native/tags/TOMCAT_NATIVE_1_1_31/ (props changed)
- copied from r1607479, tomcat/native/branches/1.1.x/
Modified:
tomcat/native/tags/TOMCAT_NATIVE_1_1_31/native/include/tcn_version.h
Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_31/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jul 2 20:44:15 2014
@@ -0,0 +1 @@
+dist
Propchange: tomcat/native/tags/TOMCAT_NATIVE_1_1_31/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jul 2 20:44:15 2014
@@ -0,0 +1,3 @@
+/tomcat/native/trunk:815411,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477
+/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
+/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/tags/TOMCAT_NATIVE_1_1_31/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/tags/TOMCAT_NATIVE_1_1_31/native/include/tcn_version.h?rev=1607480&r1=1607479&r2=1607480&view=diff
==
--- tomcat/native/tags/TOMCAT_NATIVE_1_1_31/native/include/tcn_version.h
(original)
+++ tomcat/native/tags/TOMCAT_NATIVE_1_1_31/native/include/tcn_version.h Wed
Jul 2 20:44:15 2014
@@ -75,7 +75,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "BuildTcNativeWin" by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "BuildTcNativeWin" page has been changed by markt: https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diff&rev1=14&rev2=15 Comment: Add the OSCP builds SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_60 c:\cmsc\setenv.bat /x86 + nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.4.8 WITH_OPENSSL=C:\deps-x86\openssl-1.0.1h APR_DECLARE_STATIC=1 ENABLE_OSCP=1 + move WINXP_X86_DLL_RELEASE WINXP_X86_OSCP_DLL_RELEASE nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.4.8 WITH_OPENSSL=C:\deps-x86\openssl-1.0.1h APR_DECLARE_STATIC=1 c:\cmsc\setenv.bat /x64 + nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.4.8 WITH_OPENSSL=C:\deps-x64\openssl-1.0.1h APR_DECLARE_STATIC=1 ENABLE_OSCP=1 + move WINXP_X64_DLL_RELEASE WINXP_X64_OSCP_DLL_RELEASE nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.4.8 WITH_OPENSSL=C:\deps-x64\openssl-1.0.1h APR_DECLARE_STATIC=1 c:\cmsc\setenv.bat /i64 + nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.4.8 WITH_OPENSSL=C:\deps-i64\openssl-1.0.1h APR_DECLARE_STATIC=1 ENABLE_OSCP=1 + move WINXP_I64_DLL_RELEASE WINXP_I64_OSCP_DLL_RELEASE nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.4.8 WITH_OPENSSL=C:\deps-i64\openssl-1.0.1h APR_DECLARE_STATIC=1 }}} - Tomcat Native Connector DLLs may then be found in C:\tomcat-native-1.1.x\native\WINXP_*_DLL_RELEASE + Tomcat Native Connector DLLs may then be found in C:\tomcat-native-1.1.x\native\WINXP_*_[OSCP_]DLL_RELEASE - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "BuildTcNativeWin" by markt
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "BuildTcNativeWin" page has been changed by markt:
https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diff&rev1=15&rev2=16
Comment:
Add the steps for building the binary distributions.
}}}
Tomcat Native Connector DLLs may then be found in
C:\tomcat-native-1.1.x\native\WINXP_*_[OSCP_]DLL_RELEASE
+ Construct the binary distributions
+ {{{
+ set VER=1.1.31
+ mkdir tomcat-native-%VER%-win32-bin
+ copy ..\LICENSE tomcat-native-%VER%-win32-bin\
+ copy ..\NOTICE tomcat-native-%VER%-win32-bin\
+ copy ..\README.txt tomcat-native-%VER%-win32-bin\
+ copy srclib\VERSIONS tomcat-native-%VER%-win32-bin\
+ mkdir tomcat-native-%VER%-win32-bin\bin
+ mkdir tomcat-native-%VER%-win32-bin\bin\i64
+ mkdir tomcat-native-%VER%-win32-bin\bin\x64
+ copy srclib\openssl\out32-x86\openssl.exe tomcat-native-%VER%-win32-bin\bin
+ xcopy /E tomcat-native-%VER%-win32-bin tomcat-native-%VER%-oscp-win32-bin\
+ copy WINXP_X86_DLL_RELEASE\tcnative-1.dll tomcat-native-%VER%-win32-bin\bin
+ copy WINXP_X86_OSCP_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-oscp-win32-bin\bin
+ copy WINXP_X86_DLL_RELEASE\tcnative-1-src.pdb
tomcat-native-%VER%-win32-bin\bin
+ copy WINXP_X86_OSCP_DLL_RELEASE\tcnative-1-src.pdb
tomcat-native-%VER%-oscp-win32-bin\bin
+ copy WINXP_I64_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-win32-bin\bin\i64
+ copy WINXP_I64_OSCP_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-oscp-win32-bin\bin\i64
+ copy WINXP_X64_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-win32-bin\bin\x64
+ copy WINXP_X64_OSCP_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-oscp-win32-bin\bin\x64
+ }}}
+ The unpacked binary distributions may then be found in
C:\tomcat-native-1.1.x\native`tomcat-native-%VER%-[oscp-]win32-bin
+
+ These need to be zipped up, signed etc.
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] Apache Tomcat 8.0.9 (stable) available
I'm also pleased to announce that Tomcat 8.0.9 is now available for Debian 7 (Wheezy) through the backport repository [1]. The repository has to be declared in /etc/apt/sources.list by adding this line: deb http://http.debian.net/debian wheezy-backports main The package can then be installed with: apt-get update apt-get install tomcat8 For Ubuntu users the package is also available for Utopic Unicorn [2] (to be released this fall). Emmanuel Bourg [1] http://backports.debian.org [2] http://packages.ubuntu.com/utopic/tomcat8 Le 26/06/2014 09:00, Mark Thomas a écrit : > The Apache Tomcat team announces the immediate availability of Apache > Tomcat 8.0.9, the first stable release of the 8.0.x series. > > Apache Tomcat 8 is an open source software implementation of the Java > Servlet, JavaServer Pages, Java Unified Expression Language and Java > WebSocket technologies. > > Apache Tomcat 8 is aligned with Java EE 7. In addition to supporting > updated versions of the Java EE specifications, Tomcat 8 includes a > number of improvements compared to Tomcat 7. The notable changes > include: > > - Support for Java Servlet 3.1, JavaServer Pages 2.3, Java Unified > Expression Language 3.0 and Java WebSocket 1.0. > > - The default connector implementation is now the Java non-blocking > implementation (NIO) for both HTTP and AJP. > > - A new resources implementation that replaces Aliases, VirtualLoader, > VirtualDirContext, JAR resources and external repositories with a > single, consistent approach for configuring additional web > application resources. The new resources implementation can also be > used to implement overlays (using a master WAR as the basis for > multiple web applications that each have their own > customizations). > > > Apache Tomcat 8.0.9 includes numerous fixes for issues identified > in 8.0.8 as well as a number of other enhancements and changes. The > notable changes since 8.0.8 include: > > - Start to move towards RFC6265 for cookie handling > > - Better error handling when the error occurs after the response has > been committed > > - Various Jasper improvements to make it easier for other containers > (e.g. Jetty) to consume > > > Please refer to the change log for the complete list of changes: > http://tomcat.apache.org/tomcat-8.0-doc/changelog.html > > Note: This version has 4 zip binaries: a generic one and three > bundled with Tomcat native binaries for Windows operating systems > running on different CPU architectures. > > Downloads: > http://tomcat.apache.org/download-80.cgi > > Migration guides from Apache Tomcat 5.5.x, 6.0.x and 7.0.x: > http://tomcat.apache.org/migration.html > > Enjoy! > > - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r5738 - /release/tomcat/tomcat-connectors/native/1.1.29/
Author: markt Date: Wed Jul 2 21:37:20 2014 New Revision: 5738 Log: Remove old version Removed: release/tomcat/tomcat-connectors/native/1.1.29/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r5739 - /release/tomcat/tomcat-connectors/jk/
Author: markt Date: Wed Jul 2 21:38:40 2014 New Revision: 5739 Log: Remove old version Removed: release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.sha1 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.asc release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.md5 release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.sha1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "BuildTcNativeWin" by markt
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "BuildTcNativeWin" page has been changed by markt:
https://wiki.apache.org/tomcat/BuildTcNativeWin?action=diff&rev1=16&rev2=17
Comment:
Fix typo
SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0_60
c:\cmsc\setenv.bat /x86
- nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.4.8
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1h APR_DECLARE_STATIC=1 ENABLE_OSCP=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.4.8
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1h APR_DECLARE_STATIC=1 ENABLE_OCSP=1
- move WINXP_X86_DLL_RELEASE WINXP_X86_OSCP_DLL_RELEASE
+ move WINXP_X86_DLL_RELEASE WINXP_X86_OCSP_DLL_RELEASE
nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-1.4.8
WITH_OPENSSL=C:\deps-x86\openssl-1.0.1h APR_DECLARE_STATIC=1
c:\cmsc\setenv.bat /x64
- nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.4.8
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1h APR_DECLARE_STATIC=1 ENABLE_OSCP=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.4.8
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1h APR_DECLARE_STATIC=1 ENABLE_OCSP=1
- move WINXP_X64_DLL_RELEASE WINXP_X64_OSCP_DLL_RELEASE
+ move WINXP_X64_DLL_RELEASE WINXP_X64_OCSP_DLL_RELEASE
nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-1.4.8
WITH_OPENSSL=C:\deps-x64\openssl-1.0.1h APR_DECLARE_STATIC=1
c:\cmsc\setenv.bat /i64
- nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.4.8
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1h APR_DECLARE_STATIC=1 ENABLE_OSCP=1
+ nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.4.8
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1h APR_DECLARE_STATIC=1 ENABLE_OCSP=1
- move WINXP_I64_DLL_RELEASE WINXP_I64_OSCP_DLL_RELEASE
+ move WINXP_I64_DLL_RELEASE WINXP_I64_OCSP_DLL_RELEASE
nmake -f NMAKEMakefile WITH_APR=C:\deps-i64\apr-1.4.8
WITH_OPENSSL=C:\deps-i64\openssl-1.0.1h APR_DECLARE_STATIC=1
}}}
- Tomcat Native Connector DLLs may then be found in
C:\tomcat-native-1.1.x\native\WINXP_*_[OSCP_]DLL_RELEASE
+ Tomcat Native Connector DLLs may then be found in
C:\tomcat-native-1.1.x\native\WINXP_*_[OCSP_]DLL_RELEASE
Construct the binary distributions
{{{
@@ -155, +155 @@
mkdir tomcat-native-%VER%-win32-bin\bin\i64
mkdir tomcat-native-%VER%-win32-bin\bin\x64
copy srclib\openssl\out32-x86\openssl.exe tomcat-native-%VER%-win32-bin\bin
- xcopy /E tomcat-native-%VER%-win32-bin tomcat-native-%VER%-oscp-win32-bin\
+ xcopy /E tomcat-native-%VER%-win32-bin tomcat-native-%VER%-ocsp-win32-bin\
copy WINXP_X86_DLL_RELEASE\tcnative-1.dll tomcat-native-%VER%-win32-bin\bin
- copy WINXP_X86_OSCP_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-oscp-win32-bin\bin
+ copy WINXP_X86_OCSP_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-ocsp-win32-bin\bin
copy WINXP_X86_DLL_RELEASE\tcnative-1-src.pdb
tomcat-native-%VER%-win32-bin\bin
- copy WINXP_X86_OSCP_DLL_RELEASE\tcnative-1-src.pdb
tomcat-native-%VER%-oscp-win32-bin\bin
+ copy WINXP_X86_OCSP_DLL_RELEASE\tcnative-1-src.pdb
tomcat-native-%VER%-ocsp-win32-bin\bin
copy WINXP_I64_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-win32-bin\bin\i64
- copy WINXP_I64_OSCP_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-oscp-win32-bin\bin\i64
+ copy WINXP_I64_OCSP_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-ocsp-win32-bin\bin\i64
copy WINXP_X64_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-win32-bin\bin\x64
- copy WINXP_X64_OSCP_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-oscp-win32-bin\bin\x64
+ copy WINXP_X64_OCSP_DLL_RELEASE\tcnative-1.dll
tomcat-native-%VER%-ocsp-win32-bin\bin\x64
}}}
- The unpacked binary distributions may then be found in
C:\tomcat-native-1.1.x\native`tomcat-native-%VER%-[oscp-]win32-bin
+ The unpacked binary distributions may then be found in
C:\tomcat-native-1.1.x\native`tomcat-native-%VER%-[ocsp-]win32-bin
These need to be zipped up, signed etc.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r5740 - in /dev/tomcat/tomcat-connectors: ./ native/ native/1.1.31/ native/1.1.31/binaries/ native/1.1.31/source/
Author: markt Date: Wed Jul 2 22:02:30 2014 New Revision: 5740 Log: Upload tc native 1.1.31 for voting Added: dev/tomcat/tomcat-connectors/ dev/tomcat/tomcat-connectors/native/ dev/tomcat/tomcat-connectors/native/1.1.31/ dev/tomcat/tomcat-connectors/native/1.1.31/binaries/ dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.md5 dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.sha1 dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-win32-bin.zip.md5 dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-win32-bin.zip.sha1 dev/tomcat/tomcat-connectors/native/1.1.31/source/ dev/tomcat/tomcat-connectors/native/1.1.31/source/tomcat-native-1.1.31-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/1.1.31/source/tomcat-native-1.1.31-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/1.1.31/source/tomcat-native-1.1.31-src.tar.gz.md5 dev/tomcat/tomcat-connectors/native/1.1.31/source/tomcat-native-1.1.31-src.tar.gz.sha1 dev/tomcat/tomcat-connectors/native/1.1.31/source/tomcat-native-1.1.31-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/1.1.31/source/tomcat-native-1.1.31-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/1.1.31/source/tomcat-native-1.1.31-win32-src.zip.md5 dev/tomcat/tomcat-connectors/native/1.1.31/source/tomcat-native-1.1.31-win32-src.zip.sha1 Added: dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.asc Wed Jul 2 22:02:30 2014 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.9 (MingW32) + +iQIcBAABAgAGBQJTtH7qAAoJEBDAHFovYFnnv84P/3uRklpQOFYjNOb67r8S0F+u +W/aYjQJSDzIaX86xBLiGX4sbSEToPjQLO9kjLvrc0C34A3PYaCTi2v5qcw8KMRT6 +KVwExxXRwg6eTdYowiZ367xk2r7DdiScMuqS6FVol9RXkCITmeDmZ61sqSrg3tzj +kv4A0r88GokP5snTOoGhcfjaSHmL1u5tDaBJ07tLuK5sku/w5cyh2r3gAS9W0aQ1 +Ms+M/2m3Vesw9yZEEBbIowK1RXdV09d7cqop7ms7s0yEWvxAgWGEguAevDwjktKw +45v9w1uS57I4Cacihb2mwaoW4eWPQa+BtbTiHv4Bc66LZqBpEpzA11SdJHgpuNES +TPh2n/yCm19ENlcFR4o0szb1hshXGHhiJcF9pVVf89t2EXQjaQkTzFwC2klbM7Wb +FISb53gicZTUGWoStE5DcMs9ITgOSzT1esqit8HCNj5tQlL8ZJ4m4iXr5xmlNV/G +8iZ8dcCyqeSBgWni9t6+oF7QvsNsRqivEtPhhowNEqz1/tE/mYvdYtG4sP9KMyYj +xmq+iCLoLAPyvzn+iTpLXOIDcbOLtqtqJkDq1pQMH4Th0ao4Q9HCW2JiVKxGFHHI +j2lB1h0Uf8jdL0INaJS7ua+PdRIJJuRJj8D2F5PvXVHhkbokmNU0Nz6DsP1T8Uv6 +fgihHtbmMpYCSexcTkvT +=4xP6 +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.md5 == --- dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.md5 (added) +++ dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.md5 Wed Jul 2 22:02:30 2014 @@ -0,0 +1 @@ +a3d5f4b2713fdd8e084f83b05f4f9922 *tomcat-native-1.1.31-ocsp-win32-bin.zip Added: dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.sha1 == --- dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.sha1 (added) +++ dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-ocsp-win32-bin.zip.sha1 Wed Jul 2 22:02:30 2014 @@ -0,0 +1 @@ +d6094dfc4d9c147092e11b6b4ce69ecac0dc91fc *tomcat-native-1.1.31-ocsp-win32-bin.zip Added: dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/1.1.31/binaries/tomcat-native-1.1.31-win32-bin.zip
[VOTE] Release Apache Tomcat Native 1.1.31
Version 1.1.31 is bug fix with an update to OpenSSL 1.0.1h to address CVE-2014-0224. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The VOTE will remain open for at least 72 hours. The Apache Tomcat Native 1.1.31 is [ ] Stable, go ahead and release [ ] Broken because of ... [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.1.31/ [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_1_31 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56692] New: request.getParameterNames(); returns empty Enumerations in Valve if servlet never call request.getParameterNames()
https://issues.apache.org/bugzilla/show_bug.cgi?id=56692 Bug ID: 56692 Summary: request.getParameterNames(); returns empty Enumerations in Valve if servlet never call request.getParameterNames() Product: Tomcat 7 Version: 7.0.54 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: chanjars...@gmail.com I'm writing a custom Valve and find a strange bug. if the servlet never call request.getParameterNames(), then i will get an empty Enumerations if i call request.getParameterNames();in a Valve. -- 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 56530] WebappClassLoader.loadClass synchronization issue due to coarse lock at WebappClassLoader instance level instead of been by class name
https://issues.apache.org/bugzilla/show_bug.cgi?id=56530 Mario Lukica changed: What|Removed |Added CC||mluk...@gmail.com -- 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
