Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,764 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

3764 Commits

Author SHA1 Message Date
Greg Wilkins d8b1d80e4e Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
 2012-03-19 17:22:02 +11:00
Greg Wilkins 7e3b8bcfd4 374611: do not redispatch if already dispatched when SSL reads content on write 2012-03-19 15:48:39 +11:00
Greg Wilkins cf2c283653 protect dump from bad object toString()s 2012-03-19 11:11:48 +11:00
Jesse McConnell c7a4c80da5 [Bug 373421] address potential race condition related to the nonce queue 
removing the same nonce twice
 2012-03-16 15:39:10 -05:00
Jesse McConnell d717be1450 [Bug 374367] NPE in QueuedThreadPool.dump() with early java6 jvms 2012-03-16 14:52:49 -05:00
Jesse McConnell ec2ccec766 [Bug 373952] bind called too frequently on refresh 2012-03-16 14:49:17 -05:00
Jesse McConnell b3ac9235f7 add spdy to the distribution and make npn-boot test dependency pull from internal to build as opposed to out of a local repository 2012-03-16 12:46:47 -05:00
Jesse McConnell fc1e57a315 fix line in spnego readme 2012-03-16 12:44:21 -05:00
Jan Bartel 4b2d976f24 JETTY-1495 Ensure dynamic servlet addition does not cause servlets to be inited. 2012-03-16 15:48:02 +11:00
Greg Wilkins 7842e9c101 374450: use temp read only buffers instead of synchronisation 2012-03-16 10:05:38 +11:00
Greg Wilkins a6eda90594 fixed merge issue 2012-03-16 09:16:46 +11:00
Greg Wilkins 25213b83fa 374158: improved test harness 2012-03-16 09:07:20 +11:00
Simone Bordet 90ef835825 Reverted changes to SuspendHandler to make tests pass again. 2012-03-15 15:01:24 +01:00
Simone Bordet 13f0ae732d Test fixes. 2012-03-15 12:12:22 +01:00
Jan Bartel f2400e5f78 Harmonized jetty-8 with jetty-7 for Ajp13SocketConnector 2012-03-15 10:54:15 +11:00
Jan Bartel 64e526dad4 Remove duplicate websocket entry in start.config 2012-03-15 10:47:16 +11:00
Jan Bartel 83ce567e66 Add missing test from jetty-7 2012-03-15 09:53:12 +11:00
Simone Bordet fef74963af Forgotten modifications from Jetty7 2012-03-14 19:39:21 +01:00
Simone Bordet 5624a5721e Merged from master. 2012-03-14 18:24:57 +01:00
Simone Bordet 44017f18af 374258 - SPDY leaks SSLEngines. Made the test more reliable. 2012-03-14 17:49:57 +01:00
Simone Bordet 2e2247bde5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-14 16:32:03 +01:00
Simone Bordet ab9bcf26b2 374258 - SPDY leaks SSLEngines 2012-03-14 16:31:29 +01:00
Simone Bordet 4a02fdb6c0 374252 - SslConnection.onClose() does not forward to nested connection. 2012-03-14 16:12:46 +01:00
Jan Bartel 15b620c2d5 374152 jetty-all-server MANIFEST contains wrong import: javax.servlet.annotation;version="[2.6,3)" 2012-03-14 12:07:25 +11:00
Greg Wilkins 708f8ccaeb 374158: do not asyncDispatch from SSL if suspended 2012-03-14 11:48:06 +11:00
Greg Wilkins 56e726c201 374018 correctly handle requestperminuted underflow 2012-03-13 10:33:04 +11:00
Simone Bordet 2f7f232d12 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-12 15:31:54 +01:00
Simone Bordet 9158115a82 Improved SPDY connector to take into account confidential and integral settings. 2012-03-12 15:31:23 +01:00
Simone Bordet 41874b5fbe Made the test portable between Jetty7 and Jetty8. 2012-03-12 15:30:26 +01:00
Greg Wilkins 9155ee46d0 373951: regexrewrite will apply URI for all non null rule returns, even if target has not changed 2012-03-12 23:59:23 +11:00
Greg Wilkins 67ce45928c added $Q handling to RewriteReqexRule 2012-03-12 12:25:24 +11:00
Greg Wilkins d3b2a3ee0c 373269: only setHandled(true) if a servlet matches 2012-03-12 12:24:52 +11:00
Jesse McConnell fd699e6994 Merge branch 'release-8' into jetty-8 2012-03-09 00:42:42 -06:00
Jesse McConnell 200d9b5de0 reset for dev 2012-03-09 00:42:24 -06:00
Jesse McConnell 567d61083c fix import 2012-03-09 00:29:09 -06:00
Jesse McConnell b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell 7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jan Bartel 309a58647e Fix package of org.glassfish.jsp 2012-03-09 16:30:13 +11:00
Jesse McConnell 1a8fe20fc2 Merge branch 'jetty-8' into release-8 2012-03-08 22:39:47 -06:00
Jan Bartel 5b98ee4e1d Fix manifest versions. 2012-03-09 15:38:44 +11:00
Jesse McConnell 7f12b203d7 Merge branch 'release' 2012-03-08 21:53:41 -06:00
Jesse McConnell 3561bcbf40 set for dev 2012-03-08 21:53:24 -06:00
Jesse McConnell 246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Jesse McConnell fed765cf27 Updating VERSION.txt top section 2012-03-08 20:55:56 -06:00
Jesse McConnell ba5089cac1 Merge branch 'jetty-8' into release-8 2012-03-08 20:54:57 -06:00
Jesse McConnell 67f3f05d70 Updating VERSION.txt top section 2012-03-08 20:44:47 -06:00
Jesse McConnell ec7fc0313c Merge branch 'master' into release 2012-03-08 20:43:37 -06:00
Jesse McConnell 2e61650264 merge from master and adjust osgi bits 2012-03-08 20:32:20 -06:00
Jesse McConnell d3b6384c37 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-08 20:21:07 -06:00