Re: JDK 11 Early Access build 22 & JDK 12 Early Access b02 are available.
Hi Mark, Did you include the latest patch - by the way this is being discussed on security-dev mailing list ? see http://mail.openjdk.java.net/pipermail/security-dev/2018-August/017751.html Rgds,Rory On 02/08/2018 14:39, Mark Thomas wrote: On 02/08/18 13:42, Rory O'Donnell wrote: That would be very useful, thanks. Rory, I have testing this locally and the proposed patch for JDK-8207009 *does not* address the issue described in JDK-8208642. I was concerned that I wasn't building the JDK correctly and/or picking up the wrong JDK but I've added a bunch of System.out.println() statements that confirm I am running the correct (current source plus JDK-8207009 patch) and that the failure described in JDK-8208642 is still happening in the same way. Mark Rgds,Rory On 02/08/2018 10:31, Mark Thomas wrote: On 02/08/18 10:06, Rory O'Donnell wrote: Hi Mark, Your bug (JDK-8208642) has been closed as a duplicate of another issue : https://bugs.openjdk.java.net/browse/JDK-8207009 I will let you know when the fix get's into a build. Thanks Rory. I should be able to build jdk11 from source and test the proposed patch. I'll let you know how I get on. Mark Rgds,Rory On 01/08/2018 10:47, Rory O'Donnell wrote: Thanks Mark, I'll follow up and advise when it's moved into JBS Rgds,Rory On 01/08/2018 10:41, Mark Thomas wrote: Rory, I can confirm that there is a JDK bug here. The short version is that server initiated renegotiation of a TLSv1.2 connection fails if the Java client is configured to allow TLSv1.3 Details available under internal review ID : 9056398 As always, I'm happy to provide further details if required. Cheers, Mark On 31/07/18 15:19, Rory O'Donnell wrote: Hi Mark, Does the latest JDK 11 EA build 24 also fail ? If yes, could you log a bug as we are now in Rampdown Phase 2. Thanks,Rory On 31/07/2018 15:10, Mark Thomas wrote: On 17/07/18 12:26, Rory O'Donnell wrote: *JDK 12 Early Access Build 02 is available at **http://jdk.java.net/12/* I've just run the Tomcat 9 test suite with the JDK 12 EA4 build and I see a few TLS related failures: [concat] Testsuites with failed tests: [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt I haven't dug into why the tests are failing yet. I also saw some failures in the OpenSSL tests but those are expected due to the OpenSSL version I have installed locally. Mark - To unsubscribe, e-mail:dev-unsubscr...@tomcat.apache.org For additional commands, e-mail:dev-h...@tomcat.apache.org -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA, Dublin,Ireland - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA , Dublin, Ireland
Re: JDK 11 Early Access build 22 & JDK 12 Early Access b02 are available.
On 03/08/18 09:13, Rory O'Donnell wrote: > Hi Mark, > > Did you include the latest patch - by the way this is being discussed on > security-dev mailing list ? Ah. No. I was using webrev.00 which was the one listed in the bug report for JDK-8207009. I'll try again with webrev.01 and report back. Mark > > see > http://mail.openjdk.java.net/pipermail/security-dev/2018-August/017751.html > > Rgds,Rory > > > On 02/08/2018 14:39, Mark Thomas wrote: >> On 02/08/18 13:42, Rory O'Donnell wrote: >>> That would be very useful, thanks. >> Rory, >> >> I have testing this locally and the proposed patch for JDK-8207009 *does >> not* address the issue described in JDK-8208642. >> >> I was concerned that I wasn't building the JDK correctly and/or picking >> up the wrong JDK but I've added a bunch of System.out.println() >> statements that confirm I am running the correct (current source plus >> JDK-8207009 patch) and that the failure described in JDK-8208642 is >> still happening in the same way. >> >> Mark >> >> >>> Rgds,Rory >>> >>> >>> On 02/08/2018 10:31, Mark Thomas wrote: On 02/08/18 10:06, Rory O'Donnell wrote: > Hi Mark, > > Your bug (JDK-8208642) has been closed as a duplicate of another issue : > > https://bugs.openjdk.java.net/browse/JDK-8207009 > > I will let you know when the fix get's into a build. Thanks Rory. I should be able to build jdk11 from source and test the proposed patch. I'll let you know how I get on. Mark > Rgds,Rory > > > On 01/08/2018 10:47, Rory O'Donnell wrote: >> Thanks Mark, I'll follow up and advise when it's moved into JBS >> >> Rgds,Rory >> >> >> On 01/08/2018 10:41, Mark Thomas wrote: >>> Rory, >>> >>> I can confirm that there is a JDK bug here. >>> >>> The short version is that server initiated renegotiation of a TLSv1.2 >>> connection fails if the Java client is configured to allow TLSv1.3 >>> >>> Details available under internal review ID : 9056398 >>> >>> As always, I'm happy to provide further details if required. >>> >>> Cheers, >>> >>> Mark >>> >>> >>> On 31/07/18 15:19, Rory O'Donnell wrote: Hi Mark, Does the latest JDK 11 EA build 24 also fail ? If yes, could you log a bug as we are now in Rampdown Phase 2. Thanks,Rory On 31/07/2018 15:10, Mark Thomas wrote: > On 17/07/18 12:26, Rory O'Donnell wrote: > > > >> *JDK 12 Early Access Build 02 is available at >> **http://jdk.java.net/12/* > I've just run the Tomcat 9 test suite with the JDK 12 EA4 build > and I > see a few TLS related failures: > > [concat] Testsuites with failed tests: > [concat] > TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt > [concat] > TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt > [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt > [concat] > TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt > > I haven't dug into why the tests are failing yet. > > I also saw some failures in the OpenSSL tests but those are > expected due > to the OpenSSL version I have installed locally. > > Mark > > - > > To unsubscribe, e-mail:dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail:dev-h...@tomcat.apache.org > >> -- >> Rgds,Rory O'Donnell >> Quality Engineering Manager >> Oracle EMEA, Dublin,Ireland >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > -- > Rgds,Rory O'Donnell > Quality Engineering Manager > Oracle EMEA , Dublin, Ireland > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JDK 11 Early Access build 22 & JDK 12 Early Access b02 are available.
On 03/08/18 11:11, Mark Thomas wrote: > On 03/08/18 09:13, Rory O'Donnell wrote: >> Hi Mark, >> >> Did you include the latest patch - by the way this is being discussed on >> security-dev mailing list ? > > Ah. No. I was using webrev.00 which was the one listed in the bug report > for JDK-8207009. > > I'll try again with webrev.01 and report back. Good news. I can confirm that the 01 patch does fix this issue. Mark > > Mark > >> >> see >> http://mail.openjdk.java.net/pipermail/security-dev/2018-August/017751.html >> >> Rgds,Rory >> >> >> On 02/08/2018 14:39, Mark Thomas wrote: >>> On 02/08/18 13:42, Rory O'Donnell wrote: That would be very useful, thanks. >>> Rory, >>> >>> I have testing this locally and the proposed patch for JDK-8207009 *does >>> not* address the issue described in JDK-8208642. >>> >>> I was concerned that I wasn't building the JDK correctly and/or picking >>> up the wrong JDK but I've added a bunch of System.out.println() >>> statements that confirm I am running the correct (current source plus >>> JDK-8207009 patch) and that the failure described in JDK-8208642 is >>> still happening in the same way. >>> >>> Mark >>> >>> Rgds,Rory On 02/08/2018 10:31, Mark Thomas wrote: > On 02/08/18 10:06, Rory O'Donnell wrote: >> Hi Mark, >> >> Your bug (JDK-8208642) has been closed as a duplicate of another issue : >> >> https://bugs.openjdk.java.net/browse/JDK-8207009 >> >> I will let you know when the fix get's into a build. > Thanks Rory. > > I should be able to build jdk11 from source and test the proposed patch. > I'll let you know how I get on. > > Mark > > >> Rgds,Rory >> >> >> On 01/08/2018 10:47, Rory O'Donnell wrote: >>> Thanks Mark, I'll follow up and advise when it's moved into JBS >>> >>> Rgds,Rory >>> >>> >>> On 01/08/2018 10:41, Mark Thomas wrote: Rory, I can confirm that there is a JDK bug here. The short version is that server initiated renegotiation of a TLSv1.2 connection fails if the Java client is configured to allow TLSv1.3 Details available under internal review ID : 9056398 As always, I'm happy to provide further details if required. Cheers, Mark On 31/07/18 15:19, Rory O'Donnell wrote: > Hi Mark, > > Does the latest JDK 11 EA build 24 also fail ? If yes, could you > log a > bug as we are now > > in Rampdown Phase 2. > > Thanks,Rory > > > On 31/07/2018 15:10, Mark Thomas wrote: >> On 17/07/18 12:26, Rory O'Donnell wrote: >> >> >> >>> *JDK 12 Early Access Build 02 is available at >>> **http://jdk.java.net/12/* >> I've just run the Tomcat 9 test suite with the JDK 12 EA4 build >> and I >> see a few TLS related failures: >> >> [concat] Testsuites with failed tests: >> [concat] >> TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt >> [concat] >> TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt >> [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt >> [concat] >> TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt >> >> I haven't dug into why the tests are failing yet. >> >> I also saw some failures in the OpenSSL tests but those are >> expected due >> to the OpenSSL version I have installed locally. >> >> Mark >> >> - >> >> To unsubscribe, e-mail:dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail:dev-h...@tomcat.apache.org >> >>> -- >>> Rgds,Rory O'Donnell >>> Quality Engineering Manager >>> Oracle EMEA, Dublin,Ireland >>> - >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >>> For additional commands, e-mail: dev-h...@tomcat.apache.org >>> >> >> -- >> Rgds,Rory O'Donnell >> Quality Engineering Manager >> Oracle EMEA , Dublin, Ireland >> > > > - > 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: JDK 11 Early Access build 22 & JDK 12 Early Access b02 are available.
That is great news Mark. Thanks again for all your efforts ! Rgds,Rory On 03/08/2018 12:24, Mark Thomas wrote: On 03/08/18 11:11, Mark Thomas wrote: On 03/08/18 09:13, Rory O'Donnell wrote: Hi Mark, Did you include the latest patch - by the way this is being discussed on security-dev mailing list ? Ah. No. I was using webrev.00 which was the one listed in the bug report for JDK-8207009. I'll try again with webrev.01 and report back. Good news. I can confirm that the 01 patch does fix this issue. Mark Mark see http://mail.openjdk.java.net/pipermail/security-dev/2018-August/017751.html Rgds,Rory On 02/08/2018 14:39, Mark Thomas wrote: On 02/08/18 13:42, Rory O'Donnell wrote: That would be very useful, thanks. Rory, I have testing this locally and the proposed patch for JDK-8207009 *does not* address the issue described in JDK-8208642. I was concerned that I wasn't building the JDK correctly and/or picking up the wrong JDK but I've added a bunch of System.out.println() statements that confirm I am running the correct (current source plus JDK-8207009 patch) and that the failure described in JDK-8208642 is still happening in the same way. Mark Rgds,Rory On 02/08/2018 10:31, Mark Thomas wrote: On 02/08/18 10:06, Rory O'Donnell wrote: Hi Mark, Your bug (JDK-8208642) has been closed as a duplicate of another issue : https://bugs.openjdk.java.net/browse/JDK-8207009 I will let you know when the fix get's into a build. Thanks Rory. I should be able to build jdk11 from source and test the proposed patch. I'll let you know how I get on. Mark Rgds,Rory On 01/08/2018 10:47, Rory O'Donnell wrote: Thanks Mark, I'll follow up and advise when it's moved into JBS Rgds,Rory On 01/08/2018 10:41, Mark Thomas wrote: Rory, I can confirm that there is a JDK bug here. The short version is that server initiated renegotiation of a TLSv1.2 connection fails if the Java client is configured to allow TLSv1.3 Details available under internal review ID : 9056398 As always, I'm happy to provide further details if required. Cheers, Mark On 31/07/18 15:19, Rory O'Donnell wrote: Hi Mark, Does the latest JDK 11 EA build 24 also fail ? If yes, could you log a bug as we are now in Rampdown Phase 2. Thanks,Rory On 31/07/2018 15:10, Mark Thomas wrote: On 17/07/18 12:26, Rory O'Donnell wrote: *JDK 12 Early Access Build 02 is available at **http://jdk.java.net/12/* I've just run the Tomcat 9 test suite with the JDK 12 EA4 build and I see a few TLS related failures: [concat] Testsuites with failed tests: [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestClientCert.NIO2.txt [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO.txt [concat] TEST-org.apache.tomcat.util.net.TestCustomSsl.NIO2.txt I haven't dug into why the tests are failing yet. I also saw some failures in the OpenSSL tests but those are expected due to the OpenSSL version I have installed locally. Mark - To unsubscribe, e-mail:dev-unsubscr...@tomcat.apache.org For additional commands, e-mail:dev-h...@tomcat.apache.org -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA, Dublin,Ireland - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA , Dublin, Ireland - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA , Dublin, Ireland - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62596] New: WsWebSocketContainer#connectToServer throws BufferOverflowException
https://bz.apache.org/bugzilla/show_bug.cgi?id=62596 Bug ID: 62596 Summary: WsWebSocketContainer#connectToServer throws BufferOverflowException Product: Tomcat 8 Version: 8.5.x-trunk Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: WebSocket Assignee: dev@tomcat.apache.org Reporter: erik.mccal...@edge-technologies.com Target Milestone: Created attachment 36071 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36071&action=edit Contrived example to trigger BufferOverflowException in WsWebSocketContainer#connectToServer WsWebSocketContainer#connectToServer throws BufferOverflowException when headers supplied by ClientEndpointConfig.Configurator#beforeRequest are too large. Exception in thread "main" java.nio.BufferOverflowException at java.nio.HeapByteBuffer.put(HeapByteBuffer.java:189) at java.nio.ByteBuffer.put(ByteBuffer.java:859) at org.apache.tomcat.websocket.WsWebSocketContainer.addHeader(WsWebSocketContainer.java:755) at org.apache.tomcat.websocket.WsWebSocketContainer.createRequest(WsWebSocketContainer.java:736) at org.apache.tomcat.websocket.WsWebSocketContainer.connectToServerRecursive(WsWebSocketContainer.java:275) at org.apache.tomcat.websocket.WsWebSocketContainer.connectToServer(WsWebSocketContainer.java:195) In our application, we are forwarding an Authorization header/token of close to 4000 bytes, which when combined with other headers results in a request larger than the 4096 allocated to the ByteBuffer in WsWebSocketContainer#createRequest. Suggest making this buffer size configurable via a new setting in org.apache.tomcat.websocket.Constants. I can contribute a fix if that is appropriate. Our local patch has the following in Constants: static final int WS_UPGRADE_REQUEST_SIZE = Integer.getInteger( "org.apache.tomcat.websocket.WS_UPGRADE_REQUEST_SIZE", 8 * 1024) .intValue(); So, a new default buffer size of 8k, and the option of setting a system property if it needs to be bumped up further. I've attached some code that will trigger the exception. -- 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: r1837369 - in /tomcat/jk/trunk: native/apache-2.0/NWGNUmakefile native/netscape/Makefile.netware xdocs/miscellaneous/changelog.xml
Author: markt Date: Fri Aug 3 13:18:31 2018 New Revision: 1837369 URL: http://svn.apache.org/viewvc?rev=1837369&view=rev Log: Remove the Novell Netware make files since there has not been a supported version of Netware available for over five years. Removed: tomcat/jk/trunk/native/apache-2.0/NWGNUmakefile tomcat/jk/trunk/native/netscape/Makefile.netware Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1837369&r1=1837368&r2=1837369&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Fri Aug 3 13:18:31 2018 @@ -41,6 +41,15 @@ + + + + +Remove the Novell Netware make files since there has not been a +supported version of Netware available for over five years. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837370 - in /tomcat/jk/trunk: native/common/jk_nwmain.c native/iis/Makefile.amd64 native/iis/Makefile.x86 native/iis/isapi.dsp xdocs/miscellaneous/changelog.xml
Author: markt Date: Fri Aug 3 13:24:14 2018 New Revision: 1837370 URL: http://svn.apache.org/viewvc?rev=1837370&view=rev Log: Remove Netware specific source files as OS is no longer supported Removed: tomcat/jk/trunk/native/common/jk_nwmain.c Modified: tomcat/jk/trunk/native/iis/Makefile.amd64 tomcat/jk/trunk/native/iis/Makefile.x86 tomcat/jk/trunk/native/iis/isapi.dsp tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/jk/trunk/native/iis/Makefile.amd64 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1837370&r1=1837369&r2=1837370&view=diff == --- tomcat/jk/trunk/native/iis/Makefile.amd64 (original) +++ tomcat/jk/trunk/native/iis/Makefile.amd64 Fri Aug 3 13:24:14 2018 @@ -55,7 +55,6 @@ CLEAN : -@erase "$(INTDIR)\jk_map.obj" -@erase "$(INTDIR)\jk_md5.obj" -@erase "$(INTDIR)\jk_msg_buff.obj" - -@erase "$(INTDIR)\jk_nwmain.obj" -@erase "$(INTDIR)\jk_pool.obj" -@erase "$(INTDIR)\jk_shm.obj" -@erase "$(INTDIR)\jk_sockbuf.obj" @@ -94,7 +93,6 @@ LINK32_OBJS= \ "$(INTDIR)\jk_map.obj" \ "$(INTDIR)\jk_md5.obj" \ "$(INTDIR)\jk_msg_buff.obj" \ - "$(INTDIR)\jk_nwmain.obj" \ "$(INTDIR)\jk_pool.obj" \ "$(INTDIR)\jk_shm.obj" \ "$(INTDIR)\jk_sockbuf.obj" \ @@ -231,12 +229,6 @@ SOURCE=..\common\jk_msg_buff.c $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\common\jk_nwmain.c - -"$(INTDIR)\jk_nwmain.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - SOURCE=..\common\jk_pool.c "$(INTDIR)\jk_pool.obj" : $(SOURCE) "$(INTDIR)" Modified: tomcat/jk/trunk/native/iis/Makefile.x86 URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1837370&r1=1837369&r2=1837370&view=diff == --- tomcat/jk/trunk/native/iis/Makefile.x86 (original) +++ tomcat/jk/trunk/native/iis/Makefile.x86 Fri Aug 3 13:24:14 2018 @@ -55,7 +55,6 @@ CLEAN : -@erase "$(INTDIR)\jk_map.obj" -@erase "$(INTDIR)\jk_md5.obj" -@erase "$(INTDIR)\jk_msg_buff.obj" - -@erase "$(INTDIR)\jk_nwmain.obj" -@erase "$(INTDIR)\jk_pool.obj" -@erase "$(INTDIR)\jk_shm.obj" -@erase "$(INTDIR)\jk_sockbuf.obj" @@ -94,7 +93,6 @@ LINK32_OBJS= \ "$(INTDIR)\jk_map.obj" \ "$(INTDIR)\jk_md5.obj" \ "$(INTDIR)\jk_msg_buff.obj" \ - "$(INTDIR)\jk_nwmain.obj" \ "$(INTDIR)\jk_pool.obj" \ "$(INTDIR)\jk_shm.obj" \ "$(INTDIR)\jk_sockbuf.obj" \ @@ -231,12 +229,6 @@ SOURCE=..\common\jk_msg_buff.c $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\common\jk_nwmain.c - -"$(INTDIR)\jk_nwmain.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - SOURCE=..\common\jk_pool.c "$(INTDIR)\jk_pool.obj" : $(SOURCE) "$(INTDIR)" Modified: tomcat/jk/trunk/native/iis/isapi.dsp URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/isapi.dsp?rev=1837370&r1=1837369&r2=1837370&view=diff == --- tomcat/jk/trunk/native/iis/isapi.dsp (original) +++ tomcat/jk/trunk/native/iis/isapi.dsp Fri Aug 3 13:24:14 2018 @@ -148,10 +148,6 @@ SOURCE=..\common\jk_msg_buff.c # End Source File # Begin Source File -SOURCE=..\common\jk_nwmain.c -# End Source File -# Begin Source File - SOURCE=..\common\jk_pool.c # End Source File # Begin Source File Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1837370&r1=1837369&r2=1837370&view=diff == --- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Fri Aug 3 13:24:14 2018 @@ -45,10 +45,11 @@ -Remove the Novell Netware make files since there has not been a -supported version of Netware available for over five years. (markt) +Remove the Novell Netware make files and Netware specific source code +since there has not been a supported version of Netware available for +over five years. (markt) - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837372 - in /tomcat/jk/trunk: native/netscape/jk_nsapi_plugin.c tools/dist/binaries/netware/ xdocs/webserver_howto/apache.xml
Author: markt
Date: Fri Aug 3 13:49:43 2018
New Revision: 1837372
URL: http://svn.apache.org/viewvc?rev=1837372&view=rev
Log:
Remove Netware from list of supported operating systems
Removed:
tomcat/jk/trunk/tools/dist/binaries/netware/
Modified:
tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
Modified: tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c?rev=1837372&r1=1837371&r2=1837372&view=diff
==
--- tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/jk/trunk/native/netscape/jk_nsapi_plugin.c Fri Aug 3 13:49:43 2018
@@ -67,10 +67,6 @@ static jk_map_t *init_map = NULL;
static jk_uri_worker_map_t *uw_map = NULL;
static int jk_shm_size = 0;
-#ifdef NETWARE
-int (*PR_IsSocketSecure) (SYS_NETFD * csd); /* pointer to
PR_IsSocketSecure function */
-#endif
-
static int JK_METHOD start_response(jk_ws_service_t *s,
int status,
const char *reason,
@@ -203,38 +199,11 @@ static int JK_METHOD ws_read(jk_ws_servi
unsigned i;
netbuf *inbuf = p->sn->inbuf;
-/* Until we get a service pack for NW5.1 and earlier that has the latest */
-/* Enterprise Server, we have to go through the else version of this code*/
-#if defined(netbuf_getbytes) && !defined(NETWARE)
i = netbuf_getbytes(inbuf, b, l);
if (NETBUF_EOF == i || NETBUF_ERROR == i) {
return JK_FALSE;
}
-#else
-char *buf = b;
-int ch;
-for (i = 0; i < l; i++) {
-ch = netbuf_getc(inbuf);
-/*
- * IO_EOF is 0 (zero) which is a very reasonable byte
- * when it comes to binary data. So we are not breaking
- * out of the read loop when reading it.
- *
- * We are protected from an infinit loop by the Java part of
- * Tomcat.
- */
-if (IO_ERROR == ch) {
-break;
-}
-
-buf[i] = ch;
-}
-
-if (0 == i) {
-return JK_FALSE;
-}
-#endif
*a = i;
}
@@ -292,7 +261,7 @@ NSAPI_PUBLIC int jk_init(pblock * pb, Se
if (shm_file) {
shm_file_safe = shm_file;
}
-#if !defined(WIN32) && !defined(NETWARE)
+#if !defined(WIN32)
else {
fprintf(stderr,
"Missing attribute %s in magnus.conf (jk_init) - aborting!\n",
JK_SHM_FILE_TAG);
@@ -354,21 +323,11 @@ NSAPI_PUBLIC int jk_init(pblock * pb, Se
}
}
-#ifdef NETWARE
-PR_IsSocketSecure =
-(int (*)(void **))ImportSymbol(GetNLMHandle(), "PR_IsSocketSecure");
-#endif
return rc;
}
NSAPI_PUBLIC void jk_term(void *p)
{
-#ifdef NETWARE
-if (NULL != PR_IsSocketSecure) {
-UnimportSymbol(GetNLMHandle(), "PR_IsSocketSecure");
-PR_IsSocketSecure = NULL;
-}
-#endif
if (uw_map) {
uri_worker_map_free(&uw_map, logger);
}
@@ -496,30 +455,12 @@ static int init_ws_service(nsapi_private
s->local_addr = server_hostname;
s->server_name = server_hostname;
-#ifdef NETWARE
-/* On NetWare, since we have virtual servers, we have a different way of
- * getting the port that we need to try first.
- */
-tmp = pblock_findval("server_port", private_data->sn->client);
-if (NULL != tmp)
-s->server_port = atoi(tmp);
-else
-#endif
s->server_port = server_portnum;
s->server_software = system_version();
s->uw_map = uw_map;
-#ifdef NETWARE
-/* on NetWare, we can have virtual servers that are secure.
- * PR_IsSocketSecure is an api made available with virtual servers to check
- * if the socket is secure or not
- */
-if (NULL != PR_IsSocketSecure)
-s->is_ssl = PR_IsSocketSecure(private_data->sn->csd);
-else
-#endif
-s->is_ssl = security_active;
+s->is_ssl = security_active;
if (s->is_ssl) {
char *ssl_cert = pblock_findval("auth-cert", private_data->rq->vars);
Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1837372&r1=1837371&r2=1837372&view=diff
==
--- tomcat/jk/trunk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Fri Aug 3 13:49:43 2018
@@ -97,9 +97,6 @@ WinNT4.0-i386 SP4/SP5/SP6a (should be ab
Cygwin (until you have an Apache server and autoconf/automake support tools)
-Netware
-
-
i5/OS V5R4 (System I) with Apache HTTP Server 2.0.58. Be sure to have the
latest Apache PTF installed.
-
svn commit: r1837373 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c
Author: markt
Date: Fri Aug 3 13:51:29 2018
New Revision: 1837373
URL: http://svn.apache.org/viewvc?rev=1837373&view=rev
Log:
Remove Netware references from httpd specific source
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1837373&r1=1837372&r2=1837373&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Fri Aug 3 13:51:29 2018
@@ -64,7 +64,7 @@
# define JK_NEED_SET_MUTEX_PERMS AP_NEED_SET_MUTEX_PERMS
#else
/* A special case for httpd-2.0 */
-# if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
&& !defined(AS400)
+# if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(AS400)
# define JK_NEED_SET_MUTEX_PERMS 1
# else
# define JK_NEED_SET_MUTEX_PERMS 0
@@ -77,15 +77,6 @@
/*
* jk_ include files
*/
-#ifdef NETWARE
-#define __sys_types_h__
-#define __sys_socket_h__
-#define __netdb_h__
-#define __netinet_in_h__
-#define __arpa_inet_h__
-#define __sys_timeval_h__
-#endif
-
#include "jk_global.h"
#include "jk_ajp13.h"
#include "jk_logger.h"
@@ -3509,7 +3500,7 @@ static int init_jk(apr_pool_t * pconf, j
#if _MT_CODE
/* _MT_CODE */
if (JK_IS_DEBUG_LEVEL(conf->log)) {
-#if !defined(WIN32) && !defined(NETWARE)
+#if !defined(WIN32)
#if USE_FLOCK_LK
jk_log(conf->log, JK_LOG_DEBUG,
"Using flock() for locking.");
@@ -3551,7 +3542,7 @@ static int init_jk(apr_pool_t * pconf, j
return JK_FALSE;
}
-#if !defined(WIN32) && !defined(NETWARE)
+#if !defined(WIN32)
if (!jk_shm_file) {
jk_shm_file = ap_server_root_relative(pconf, JK_SHM_DEF_FILE);
if (jk_shm_file)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837375 - in /tomcat/jk/trunk/native/common: jk_pool.h jk_shm.c jk_status.c jk_util.c
Author: markt
Date: Fri Aug 3 13:59:41 2018
New Revision: 1837375
URL: http://svn.apache.org/viewvc?rev=1837375&view=rev
Log:
Remove some Netware references from the common code
Modified:
tomcat/jk/trunk/native/common/jk_pool.h
tomcat/jk/trunk/native/common/jk_shm.c
tomcat/jk/trunk/native/common/jk_status.c
tomcat/jk/trunk/native/common/jk_util.c
Modified: tomcat/jk/trunk/native/common/jk_pool.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_pool.h?rev=1837375&r1=1837374&r2=1837375&view=diff
==
--- tomcat/jk/trunk/native/common/jk_pool.h (original)
+++ tomcat/jk/trunk/native/common/jk_pool.h Fri Aug 3 13:59:41 2018
@@ -59,8 +59,6 @@ extern "C"
typedef long long jk_pool_atom_t;
#elif defined(OS2)
typedef long long jk_pool_atom_t;
-#elif defined(NETWARE)
-typedef long long jk_pool_atom_t;
#elif defined(HPUX11)
typedef long long jk_pool_atom_t;
#elif defined(IRIX)
Modified: tomcat/jk/trunk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1837375&r1=1837374&r2=1837375&view=diff
==
--- tomcat/jk/trunk/native/common/jk_shm.c (original)
+++ tomcat/jk/trunk/native/common/jk_shm.c Fri Aug 3 13:59:41 2018
@@ -188,7 +188,7 @@ int jk_shm_calculate_size(jk_map_t *init
}
-#if defined (WIN32) || defined(NETWARE)
+#if defined (WIN32)
/* Use plain memory */
int jk_shm_open(const char *fname, int sz, jk_logger_t *l)
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1837375&r1=1837374&r2=1837375&view=diff
==
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Fri Aug 3 13:59:41 2018
@@ -539,24 +539,13 @@ static int jk_printf(jk_ws_service_t *s,
{
int rc = 0;
va_list args;
-#ifdef NETWARE
-/* On NetWare, this can get called on a thread that has a limited stack so */
-/* we will allocate and free the temporary buffer in this function */
-char *buf;
-#else
char buf[HUGE_BUFFER_SIZE];
-#endif
if (!s || !fmt) {
return -1;
}
va_start(args, fmt);
-#ifdef NETWARE
-buf = (char *)malloc(HUGE_BUFFER_SIZE);
-if (NULL == buf)
-return -1;
-#endif
rc = vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args);
va_end(args);
if (rc > 0 && rc < HUGE_BUFFER_SIZE)
@@ -564,9 +553,6 @@ static int jk_printf(jk_ws_service_t *s,
else
jk_log(l, JK_LOG_WARNING,
"Insufficient buffer size %d in status worker, some output was
dropped", HUGE_BUFFER_SIZE);
-#ifdef NETWARE
-free(buf);
-#endif
return rc;
}
Modified: tomcat/jk/trunk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=1837375&r1=1837374&r2=1837375&view=diff
==
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Fri Aug 3 13:59:41 2018
@@ -394,8 +394,6 @@ void jk_sleep(int ms)
DosSleep(ms);
#elif defined(BEOS)
snooze(ms * 1000);
-#elif defined(NETWARE)
-delay(ms);
#elif defined(WIN32)
Sleep(ms);
#else
@@ -711,13 +709,7 @@ int jk_log(jk_logger_t *l,
}
if ((l->level <= level) || (level == JK_LOG_REQUEST_LEVEL)) {
-#ifdef NETWARE
-/* On NetWare, this can get called on a thread that has a limited
stack so */
-/* we will allocate and free the temporary buffer in this function
*/
-char *buf;
-#else
char buf[LOG_BUFFER_SIZE];
-#endif
char *f = (char *)(file + strlen(file) - 1);
va_list args;
int used = 0;
@@ -729,11 +721,6 @@ int jk_log(jk_logger_t *l,
f++;
}
-#ifdef NETWARE
-buf = (char *)malloc(LOG_BUFFER_SIZE);
-if (NULL == buf)
-return -1;
-#endif
used = set_time_str(buf, usable_size, l);
if (line) { /* line==0 only used for request log item */
@@ -814,9 +801,6 @@ int jk_log(jk_logger_t *l,
}
l->log(l, level, used, buf);
-#ifdef NETWARE
-free(buf);
-#endif
}
return rc;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837376 - in /tomcat/jk/trunk/native/common: ap_snprintf.c jk_ajp_common.c jk_connect.h jk_mt.h
Author: markt Date: Fri Aug 3 14:03:36 2018 New Revision: 1837376 URL: http://svn.apache.org/viewvc?rev=1837376&view=rev Log: Remove some Netware references from the common code Modified: tomcat/jk/trunk/native/common/ap_snprintf.c tomcat/jk/trunk/native/common/jk_ajp_common.c tomcat/jk/trunk/native/common/jk_connect.h tomcat/jk/trunk/native/common/jk_mt.h Modified: tomcat/jk/trunk/native/common/ap_snprintf.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/ap_snprintf.c?rev=1837376&r1=1837375&r2=1837376&view=diff == --- tomcat/jk/trunk/native/common/ap_snprintf.c (original) +++ tomcat/jk/trunk/native/common/ap_snprintf.c Fri Aug 3 14:03:36 2018 @@ -29,9 +29,7 @@ #include #include -#ifndef NETWARE #include -#endif #include #include #include Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1837376&r1=1837375&r2=1837376&view=diff == --- tomcat/jk/trunk/native/common/jk_ajp_common.c (original) +++ tomcat/jk/trunk/native/common/jk_ajp_common.c Fri Aug 3 14:03:36 2018 @@ -32,9 +32,6 @@ #if defined(AS400) && !defined(AS400_UTF8) #include "util_ebcdic.h" #endif -#if defined(NETWARE) && defined(__NOVELL_LIBC__) -#include "novsock2.h" -#endif /* Macro for checking the availability of the cache slot */ Modified: tomcat/jk/trunk/native/common/jk_connect.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.h?rev=1837376&r1=1837375&r2=1837376&view=diff == --- tomcat/jk/trunk/native/common/jk_connect.h (original) +++ tomcat/jk/trunk/native/common/jk_connect.h Fri Aug 3 14:03:36 2018 @@ -27,7 +27,7 @@ #include "jk_logger.h" #include "jk_global.h" -#if !defined(WIN32) && !(defined(NETWARE) && defined(__NOVELL_LIBC__)) +#if !defined(WIN32) #define closesocket close #endif Modified: tomcat/jk/trunk/native/common/jk_mt.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_mt.h?rev=1837376&r1=1837375&r2=1837376&view=diff == --- tomcat/jk/trunk/native/common/jk_mt.h (original) +++ tomcat/jk/trunk/native/common/jk_mt.h Fri Aug 3 14:03:36 2018 @@ -29,8 +29,6 @@ #if defined(WIN32) #define jk_gettid()((jk_uint32_t)GetCurrentThreadId()) -#elif defined(NETWARE) && !defined(__NOVELL_LIBC__) -#define getpid() ((int)GetThreadGroupID()) #endif #ifdef JK_PREFORK @@ -66,9 +64,9 @@ typedef pthread_mutex_t JK_CRIT_SEC; #define JK_ENTER_CS(x) pthread_mutex_lock(x) #define JK_LEAVE_CS(x) pthread_mutex_unlock(x) -#if defined(AS400) || defined(NETWARE) +#if defined(AS400) #define jk_pthread_t jk_uint32_t -#endif /* AS400 || NETWARE */ +#endif /* AS400 */ jk_pthread_t jk_gettid(void); #endif /* WIN32 */ @@ -82,7 +80,7 @@ typedef void *JK_CRIT_SEC; #define jk_gettid() 0 #endif /* MT_CODE */ -#if !defined(WIN32) && !defined(NETWARE) +#if !defined(WIN32) #include #include @@ -139,7 +137,7 @@ typedef void *JK_CRIT_SEC; #endif /* USE_FLOCK_LK */ -#else /* WIN32 || NETWARE */ +#else /* WIN32 */ #define JK_ENTER_LOCK(x, rc) rc = JK_TRUE #define JK_LEAVE_LOCK(x, rc) rc = JK_TRUE #endif - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837377 - /tomcat/jk/trunk/native/common/jk_global.h
Author: markt
Date: Fri Aug 3 14:07:35 2018
New Revision: 1837377
URL: http://svn.apache.org/viewvc?rev=1837377&view=rev
Log:
Remove some Netware references from the common code
Modified:
tomcat/jk/trunk/native/common/jk_global.h
Modified: tomcat/jk/trunk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1837377&r1=1837376&r2=1837377&view=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Fri Aug 3 14:07:35 2018
@@ -142,24 +142,10 @@ extern char *strdup(const char *str);
#include
#else /* WIN32 */
#include
-#if defined(NETWARE) && defined(__NOVELL_LIBC__)
-#include
-#define __sys_socket_h__
-#define __netdb_h__
-#define __netinet_in_h__
-#define HAVE_VSNPRINTF
-#define HAVE_SNPRINTF
-#endif
#include
#include
#include
#include
-#ifdef NETWARE
-#ifndef _SOCKLEN_T
-#define _SOCKLEN_T
-typedef int socklen_t;
-#endif
-#else
#include
#include
#include
@@ -169,7 +155,6 @@ typedef int socklen_t;
#if !defined(HPUX11) && !defined(AS400)
#include
#endif
-#endif /* NETWARE */
#include
#include
@@ -206,7 +191,7 @@ extern "C"
#define JK_SESSION_IDENTIFIER "JSESSIONID"
#define JK_PATH_SESSION_IDENTIFIER ";jsessionid"
-#if defined(WIN32) || defined(NETWARE)
+#if defined(WIN32)
#ifdef __GNUC__
#define JK_METHOD
#define C_LEVEL_TRY_START
@@ -228,7 +213,7 @@ extern "C"
#ifndef strcasecmp
#define strcasecmp stricmp
#endif
-#else /* defined(WIN32) || defined(NETWARE) */
+#else /* defined(WIN32) */
#define JK_METHOD
#define C_LEVEL_TRY_START
#define C_LEVEL_TRY_END
@@ -237,7 +222,7 @@ extern "C"
#define PATH_SEPERATOR (':')
#define FILE_SEPERATOR ('/')
#define PATH_ENV_VARIABLE ("LD_LIBRARY_PATH")
-#endif /* defined(WIN32) || defined(NETWARE) */
+#endif /* defined(WIN32) */
/* HTTP Error codes
*/
@@ -343,7 +328,7 @@ extern "C"
#define JK_UINT64_T_HEX_FMT "I64x"
#define JK_PID_T_FMT "d"
#define JK_PTHREAD_T_FMT "d"
-#elif defined(AS400) || defined(NETWARE)
+#elif defined(AS400)
typedef unsigned int jk_uint32_t;
#define JK_UINT32_T_FMT "u"
#define JK_UINT32_T_HEX_FMT "x"
@@ -401,7 +386,7 @@ extern "C"
#endif
#endif
-#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
+#if defined(WIN32)
typedef SOCKET jk_sock_t;
#define IS_VALID_SOCKET(s) ((s) != INVALID_SOCKET)
#define JK_INVALID_SOCKET INVALID_SOCKET
@@ -410,13 +395,6 @@ typedef int jk_sock_t;
#define IS_VALID_SOCKET(s) ((s) > 0)
#define JK_INVALID_SOCKET (-1)
#endif
-#ifdef NETWARE
-#ifdef __NOVELL_LIBC__
-#define MAX_PATH 511
-#else
-#define MAX_PATH 255
-#endif
-#endif
#if defined(_MSC_VER) && (_MSC_VER > 1200)
#define stat_stat
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1837378 - /tomcat/jk/trunk/native/common/jk_connect.c
Author: markt
Date: Fri Aug 3 14:15:55 2018
New Revision: 1837378
URL: http://svn.apache.org/viewvc?rev=1837378&view=rev
Log:
Remove some Netware references from the common code
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1837378&r1=1837377&r2=1837378&view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Fri Aug 3 14:15:55 2018
@@ -47,7 +47,7 @@ static apr_pool_t *jk_apr_pool = NULL;
#include
#endif
-#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
+#if defined(WIN32)
#define JK_IS_SOCKET_ERROR(x) ((x) == SOCKET_ERROR)
#define JK_GET_SOCKET_ERRNO() errno = WSAGetLastError() - WSABASEERR
#else
@@ -55,10 +55,6 @@ static apr_pool_t *jk_apr_pool = NULL;
#define JK_GET_SOCKET_ERRNO() ((void)0)
#endif /* WIN32 */
-#if defined(NETWARE) && defined(__NOVELL_LIBC__)
-#define USE_SOCK_CLOEXEC
-#endif
-
#ifndef INET6_ADDRSTRLEN
/* Maximum size of an IPv6 address in ASCII */
#define INET6_ADDRSTRLEN 46
@@ -98,7 +94,7 @@ typedef const char* SET_TYPE;
static int soblock(jk_sock_t sd)
{
/* BeOS uses setsockopt at present for non blocking... */
-#if defined (WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
+#if defined (WIN32)
u_long on = 0;
if (JK_IS_SOCKET_ERROR(ioctlsocket(sd, FIONBIO, &on))) {
JK_GET_SOCKET_ERRNO();
@@ -120,7 +116,7 @@ static int soblock(jk_sock_t sd)
if (fcntl(sd, F_SETFL, fd_flags) == -1) {
return errno;
}
-#endif /* WIN32 || (NETWARE && __NOVELL_LIBC__) */
+#endif /* WIN32 */
return 0;
}
@@ -132,7 +128,7 @@ static int soblock(jk_sock_t sd)
*/
static int sononblock(jk_sock_t sd)
{
-#if defined (WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
+#if defined (WIN32)
u_long on = 1;
if (JK_IS_SOCKET_ERROR(ioctlsocket(sd, FIONBIO, &on))) {
JK_GET_SOCKET_ERRNO();
@@ -154,11 +150,11 @@ static int sononblock(jk_sock_t sd)
if (fcntl(sd, F_SETFL, fd_flags) == -1) {
return errno;
}
-#endif /* WIN32 || (NETWARE && __NOVELL_LIBC__) */
+#endif /* WIN32 */
return 0;
}
-#if defined (WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
+#if defined (WIN32)
/* WIN32 implementation */
/** Non-blocking socket connect
* @param sd socket to connect
@@ -243,7 +239,7 @@ static int nb_connect(jk_sock_t sd, jk_s
return 0;
}
-#elif !defined(NETWARE)
+#else
/* POSIX implementation */
/** Non-blocking socket connect
* @param sd socket to connect
@@ -318,58 +314,6 @@ static int nb_connect(jk_sock_t sd, jk_s
JK_TRACE_EXIT(l);
return rc;
}
-#else
-/* NETWARE implementation - blocking for now */
-/** Non-blocking socket connect
- * @param sd socket to connect
- * @param addr address to connect to
- * @param source optional source address
- * @param timeout connect timeout in seconds (ignored!)
- * @param llogger
- * @return -1: some kind of error occured
- * 0: success
- */
-static int nb_connect(jk_sock_t sd, jk_sockaddr_t *addr, jk_sockaddr_t *source,
- int timeout, jk_logger_t *l)
-{
-int rc;
-char buf[64];
-
-JK_TRACE_ENTER(l);
-
-if (source != NULL) {
-if (bind(sd, (const struct sockaddr *)&source->sa.sin, source->salen))
{
-JK_GET_SOCKET_ERRNO();
-jk_log(l, JK_LOG_ERROR,
- "error during source bind on socket %d [%s] (errno=%d)",
- sd, jk_dump_hinfo(source, buf, sizeof(buf)), errno);
-}
-}
-rc = connect(sd, (const struct sockaddr *)&addr->sa.sin, addr->salen);
-JK_TRACE_EXIT(l);
-return rc;
-}
-#endif
-
-
-#ifdef AS400_UTF8
-
-/*
- * i5/OS V5R4 need EBCDIC for its runtime calls but APR/APACHE works in UTF
- */
-in_addr_t jk_inet_addr(const char * addrstr)
-{
-in_addr_t addr;
-char *ptr;
-
-ptr = (char *)malloc(strlen(addrstr) + 1);
-jk_ascii2ebcdic((char *)addrstr, ptr);
-addr = inet_addr(ptr);
-free(ptr);
-
-return(addr);
-}
-
#endif
/** Clone a jk_sockaddr_t
@@ -564,11 +508,7 @@ int jk_resolve(const char *host, int por
/* XXX : WARNING : We should really use gethostbyname_r in
multi-threaded env */
/* Fortunatly when APR is available, ie under Apache 2.0, we use it */
-#if defined(NETWARE) && !defined(__NOVELL_LIBC__)
-hoste = gethostbyname((char*)host);
-#else
hoste = gethostbyname(host);
-#endif
if (!hoste) {
JK_TRACE_EXIT(l);
return JK_FALSE;
@@ -675,7 +615,7 @@ jk_sock_t jk_open_socket(jk_sockaddr_t *
jk_log(l, JK_LOG_DEBUG,
"socket TCP_NODELAY set to On");
if (keepalive) {
-#if defined(WIN32) && !defined(NETWARE)
+#if defined(WIN32)
svn commit: r1837379 - /tomcat/jk/trunk/native/common/jk_connect.c
Author: markt
Date: Fri Aug 3 14:23:01 2018
New Revision: 1837379
URL: http://svn.apache.org/viewvc?rev=1837379&view=rev
Log:
Remove last of Novell / Netware references in source code
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1837379&r1=1837378&r2=1837379&view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Fri Aug 3 14:23:01 2018
@@ -78,13 +78,6 @@ static apr_pool_t *jk_apr_pool = NULL;
#define EAFNOSUPPORT WSAEAFNOSUPPORT
#endif
-/* our compiler cant deal with char* <-> const char* ... */
-#if defined(NETWARE) && !defined(__NOVELL_LIBC__)
-typedef char* SET_TYPE;
-#else
-typedef const char* SET_TYPE;
-#endif
-
/** Set socket to blocking
* @param sd socket to manipulate
* @returnerrno: fcntl returns -1 (!WIN32)
@@ -602,7 +595,7 @@ jk_sock_t jk_open_socket(jk_sockaddr_t *
#endif
/* Disable Nagle algorithm */
-if (setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, (SET_TYPE)&set,
+if (setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, (const char*)&set,
sizeof(set))) {
JK_GET_SOCKET_ERRNO();
jk_log(l, JK_LOG_ERROR,
@@ -639,7 +632,7 @@ jk_sock_t jk_open_socket(jk_sockaddr_t *
ka.keepalivetime / 1000);
#else
set = 1;
-if (setsockopt(sd, SOL_SOCKET, SO_KEEPALIVE, (SET_TYPE)&set,
+if (setsockopt(sd, SOL_SOCKET, SO_KEEPALIVE, (const char*)&set,
sizeof(set))) {
JK_GET_SOCKET_ERRNO();
jk_log(l, JK_LOG_ERROR,
@@ -657,7 +650,7 @@ jk_sock_t jk_open_socket(jk_sockaddr_t *
if (sock_buf > 0) {
set = sock_buf;
/* Set socket send buffer size */
-if (setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (SET_TYPE)&set,
+if (setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (const char*)&set,
sizeof(set))) {
JK_GET_SOCKET_ERRNO();
jk_log(l, JK_LOG_ERROR,
@@ -668,7 +661,7 @@ jk_sock_t jk_open_socket(jk_sockaddr_t *
}
set = sock_buf;
/* Set socket receive buffer size */
-if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (SET_TYPE)&set,
+if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (const char*)&set,
sizeof(set))) {
JK_GET_SOCKET_ERRNO();
jk_log(l, JK_LOG_ERROR,
@@ -724,7 +717,7 @@ jk_sock_t jk_open_socket(jk_sockaddr_t *
#ifdef SO_LINGER
/* Make hard closesocket by disabling lingering */
li.l_linger = li.l_onoff = 0;
-if (setsockopt(sd, SOL_SOCKET, SO_LINGER, (SET_TYPE)&li,
+if (setsockopt(sd, SOL_SOCKET, SO_LINGER, (const char*)&li,
sizeof(li))) {
JK_GET_SOCKET_ERRNO();
jk_log(l, JK_LOG_ERROR,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump-vm3]: Project tomcat-trunk-test-nio2 (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-nio2 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-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on bnd exists, no need to add for property bndlib.jar. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 26 mins 43 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 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 -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dbndlib.jar=/srv/gump/packages/bnd/bndlib-4.0.0/biz.aQute.bndlib-4.0.0.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20180803/bin/openssl -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dbnd.jar=/srv/gump/packages/bnd/bnd-4.0.0/biz.aQute.bnd-4.0.0.jar -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dtest.relaxTiming=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.7-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/tomcat-api.jar:/srv/gump/public/workspace/tomcat-t
