mturk 2005/06/17 05:03:51
Modified: jni/examples/org/apache/tomcat/jni Echo.java SSLServer.java
Removed: jni/examples/org/apache/tomcat/jni BIOSSLServer.java
Log:
Update examples and remove BIOSSLServer because now
it needs a total rewrite.
Revision Changes Path
1.13 +2 -2
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java
Index: Echo.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Echo.java 17 Jun 2005 11:23:33 -0000 1.12
+++ Echo.java 17 Jun 2005 12:03:51 -0000 1.13
@@ -242,7 +242,7 @@
while (Socket.recv(clientSock, buf, 0, 1) == 1) {
if (buf[0] == '\n')
break;
- else if (buf[0] == 'Q') {
+ else if (buf[0] == '!') {
doClose = true;
break;
}
1.9 +7 -6
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java
Index: SSLServer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/SSLServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SSLServer.java 17 Jun 2005 11:23:33 -0000 1.8
+++ SSLServer.java 17 Jun 2005 12:03:51 -0000 1.9
@@ -142,11 +142,11 @@
}
Socket.timeoutSet(clientSock, 10000000);
- long sslSocket = SSLSocket.attach(SSLServer.serverCtx,
clientSock, pool);
- i = SSLSocket.handshake(sslSocket);
+ SSLSocket.attach(SSLServer.serverCtx, clientSock, pool);
+ i = SSLSocket.handshake(clientSock);
if (i == 0) {
- Worker worker = new Worker(sslSocket, i++,
+ Worker worker = new Worker(clientSock, i++,
this.getClass().getName());
SSLServer.incThreads();
worker.start();
@@ -154,7 +154,7 @@
}
else {
System.out.println("Handshake error: " +
SSL.getLastError());
- Socket.destroy(sslSocket);
+ Socket.destroy(clientSock);
}
}
}
@@ -186,10 +186,11 @@
while (Socket.recv(clientSock, buf, 0, 1) == 1) {
if (buf[0] == '\n')
break;
- else if (buf[0] == 'Q') {
+ else if (buf[0] == '!') {
doClose = true;
break;
}
+ Socket.send(clientSock, buf, 0, 1);
}
if (doClose) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
