Author: markt
Date: Tue Sep 15 14:45:18 2009
New Revision: 815348
URL: http://svn.apache.org/viewvc?rev=815348&view=rev
Log:
Port the native component of the BZ 46457 fixes to the 1.1.x branch.
See http://svn.apache.org/viewvc?view=rev&revision=730523 for the full original
fix.
Modified:
tomcat/native/branches/1.1.x/native/src/address.c
tomcat/native/branches/1.1.x/native/src/file.c
tomcat/native/branches/1.1.x/native/src/lock.c
tomcat/native/branches/1.1.x/native/src/multicast.c
tomcat/native/branches/1.1.x/native/src/ssl.c
Modified: tomcat/native/branches/1.1.x/native/src/address.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/address.c?rev=815348&r1=815347&r2=815348&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/address.c (original)
+++ tomcat/native/branches/1.1.x/native/src/address.c Tue Sep 15 14:45:18 2009
@@ -103,7 +103,7 @@
return P2J(sa);
}
-TCN_IMPLEMENT_CALL(jint, Address, equal)(TCN_STDARGS,
+TCN_IMPLEMENT_CALL(jboolean, Address, equal)(TCN_STDARGS,
jlong a, jlong b)
{
apr_sockaddr_t *sa = J2P(a, apr_sockaddr_t *);
Modified: tomcat/native/branches/1.1.x/native/src/file.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/file.c?rev=815348&r1=815347&r2=815348&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/file.c (original)
+++ tomcat/native/branches/1.1.x/native/src/file.c Tue Sep 15 14:45:18 2009
@@ -92,7 +92,7 @@
TCN_IMPLEMENT_CALL(jlong, File, mktemp)(TCN_STDARGS, jstring templ,
jint flags,
- jint pool)
+ jlong pool)
{
apr_pool_t *p = J2P(pool, apr_pool_t *);
apr_file_t *f = NULL;
Modified: tomcat/native/branches/1.1.x/native/src/lock.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/lock.c?rev=815348&r1=815347&r2=815348&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/lock.c (original)
+++ tomcat/native/branches/1.1.x/native/src/lock.c Tue Sep 15 14:45:18 2009
@@ -84,7 +84,7 @@
return (jint)apr_proc_mutex_unlock(m);
}
-TCN_IMPLEMENT_CALL(jint, Lock, destoy)(TCN_STDARGS, jlong mutex)
+TCN_IMPLEMENT_CALL(jint, Lock, destroy)(TCN_STDARGS, jlong mutex)
{
apr_proc_mutex_t *m = J2P(mutex, apr_proc_mutex_t *);
@@ -192,7 +192,7 @@
return (jint)apr_global_mutex_unlock(m);
}
-TCN_IMPLEMENT_CALL(jint, Global, destoy)(TCN_STDARGS, jlong mutex)
+TCN_IMPLEMENT_CALL(jint, Global, destroy)(TCN_STDARGS, jlong mutex)
{
apr_global_mutex_t *m = J2P(mutex, apr_global_mutex_t *);
Modified: tomcat/native/branches/1.1.x/native/src/multicast.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/multicast.c?rev=815348&r1=815347&r2=815348&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/multicast.c (original)
+++ tomcat/native/branches/1.1.x/native/src/multicast.c Tue Sep 15 14:45:18 2009
@@ -22,7 +22,7 @@
#include "tcn.h"
-TCN_IMPLEMENT_CALL(jint, Mulicast, join)(TCN_STDARGS,
+TCN_IMPLEMENT_CALL(jint, Multicast, join)(TCN_STDARGS,
jlong sock, jlong join,
jlong iface, jlong source)
{
@@ -34,7 +34,7 @@
return (jint)apr_mcast_join(s->sock, ja, ia, sa);
};
-TCN_IMPLEMENT_CALL(jint, Mulicast, leave)(TCN_STDARGS,
+TCN_IMPLEMENT_CALL(jint, Multicast, leave)(TCN_STDARGS,
jlong sock, jlong addr,
jlong iface, jlong source)
{
@@ -46,7 +46,7 @@
return (jint)apr_mcast_leave(s->sock, aa, ia, sa);
};
-TCN_IMPLEMENT_CALL(jint, Mulicast, hops)(TCN_STDARGS,
+TCN_IMPLEMENT_CALL(jint, Multicast, hops)(TCN_STDARGS,
jlong sock, jint ttl)
{
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
@@ -54,7 +54,7 @@
return (jint)apr_mcast_hops(s->sock, (apr_byte_t)ttl);
};
-TCN_IMPLEMENT_CALL(jint, Mulicast, loopback)(TCN_STDARGS,
+TCN_IMPLEMENT_CALL(jint, Multicast, loopback)(TCN_STDARGS,
jlong sock, jboolean opt)
{
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
@@ -65,7 +65,7 @@
return (jint)apr_mcast_loopback(s->sock, on);
};
-TCN_IMPLEMENT_CALL(jint, Mulicast, ointerface)(TCN_STDARGS,
+TCN_IMPLEMENT_CALL(jint, Multicast, ointerface)(TCN_STDARGS,
jlong sock, jlong iface)
{
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
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=815348&r1=815347&r2=815348&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Tue Sep 15 14:45:18 2009
@@ -859,6 +859,12 @@
return JNI_FALSE;
}
+TCN_IMPLEMENT_CALL(void, SSL, randSet)(TCN_STDARGS, jstring file)
+{
+ UNREFERENCED_STDARGS;
+ UNREFERENCED(file);
+}
+
TCN_IMPLEMENT_CALL(jlong, SSL, newBIO)(TCN_STDARGS, jlong pool,
jobject callback)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
