cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni SSLServer.java
jfclere 2005/06/21 09:20:45 Modified:jni/examples/org/apache/tomcat/jni SSLServer.java Log: typo. Revision ChangesPath 1.12 +1 -2 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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- SSLServer.java21 Jun 2005 13:51:03 - 1.11 +++ SSLServer.java21 Jun 2005 16:20:45 - 1.12 @@ -192,7 +192,6 @@ continue; else if (buf[0] == '!') { doClose = true; -break; } Socket.send(clientSock, buf, 0, 1); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni SSLServer.java
jfclere 2005/06/21 06:51:03 Modified:jni/examples/org/apache/tomcat/jni SSLServer.java Log: Prevent it from looping when the client closes the communication. Revision ChangesPath 1.11 +13 -9 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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- SSLServer.java18 Jun 2005 08:03:21 - 1.10 +++ SSLServer.java21 Jun 2005 13:51:03 - 1.11 @@ -183,15 +183,19 @@ while (!doClose) { /* Do a blocking read byte at a time */ byte [] buf = new byte[1]; -while (Socket.recv(clientSock, buf, 0, 1) == 1) { -if (buf[0] == '\n') -break; -else if (buf[0] == '!') { -doClose = true; -break; -} -Socket.send(clientSock, buf, 0, 1); +int ret; +ret = Socket.recv(clientSock, buf, 0, 1); +if (ret != 1) +throw(new Exception("Socket.recv failed")); + +if (buf[0] == '\n') +continue; +else if (buf[0] == '!') { +doClose = true; +break; } +Socket.send(clientSock, buf, 0, 1); + if (doClose) { try { byte [] msg = ("Bye from worker: " + workerId + "\r\n").getBytes(); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni SSLServer.java
jfclere 2005/06/15 08:15:54 Modified:jni/examples/org/apache/tomcat/jni SSLServer.java Log: test retcode of recv() to prevent the example for looping. BTW: When testing with openssl 'Q' closes the socket in openssl ' Q' could be used to get the closing in SSLServer. Revision ChangesPath 1.7 +7 -9 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SSLServer.java12 Jun 2005 10:31:16 - 1.6 +++ SSLServer.java15 Jun 2005 15:15:54 - 1.7 @@ -183,14 +183,12 @@ while (!doClose) { /* Do a blocking read byte at a time */ byte [] buf = new byte[1]; -while (SSLSocket.recv(clientSock, buf, 0, 1) == 1) { -if (buf[0] == '\n') -break; -else if (buf[0] == 'Q') { -doClose = true; -break; -} -} +int ret; +ret = SSLSocket.recv(clientSock, buf, 0, 1); +if (ret != 1) +throw(new Exception("SSLSocket.recv failed")); +if (buf[0] == 'Q') +doClose = true; if (doClose) { try { byte [] msg = ("Bye from worker: " + workerId + "\r\n").getBytes(); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]