Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-23 16:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,791 Commits 55 Branches 466 Tags
Commit Graph

571 Commits

Author SHA1 Message Date
Jan Bartel
17269583fb Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-30 12:05:46 +11:00
Greg Wilkins
65725b0025 357318: make the cancel key work around conditional on running on windows 2012-03-23 09:21:00 +11:00
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
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
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
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
4a02fdb6c0 374252 - SslConnection.onClose() does not forward to nested connection. 2012-03-14 16:12:46 +01:00
Greg Wilkins
708f8ccaeb 374158: do not asyncDispatch from SSL if suspended 2012-03-14 11:48:06 +11: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
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
381615f52d merge from master 2012-03-07 16:44:31 -06:00
Jesse McConnell
50d92ec8ef reset versions 2012-03-06 17:07:53 -06:00
Jesse McConnell
f12e3c390c reset versions 2012-03-06 17:06:10 -06:00
Thomas Becker
ff75d9e38a 373394: fix for IllegalArgumentException in SelectChannelEndpoint.blockWritable() when wait is called with a negative value. 2012-03-06 21:26:46 +01:00
Simone Bordet
ffdcfa5dde Avoid reading field twice (may lead to spurious NPEs). 2012-03-06 18:09:58 +01:00
Jesse McConnell
54493cd80d Merge "373246: IOTest.testReset uses dynamic port now instead of static hard coded one" 2012-03-05 09:18:08 -05:00
Thomas Becker
0adec36c29 373246: IOTest.testReset uses dynamic port now instead of static hard coded one 
Change-Id: I9b254937fa02ba745832bf1b5c99069bea641bbd
 2012-03-05 15:15:23 +01:00
Jesse McConnell
d1c8c477ea [maven-release-plugin] prepare for next development iteration 2012-03-02 08:57:43 -06:00
Jesse McConnell
b75868e84f [maven-release-plugin] prepare release jetty-8.1.2.v20120302 2012-03-02 08:57:19 -06:00
Jesse McConnell
51311d050e [maven-release-plugin] prepare for next development iteration 2012-03-02 08:37:46 -06:00
Jesse McConnell
a8296ec3d5 [maven-release-plugin] prepare release jetty-7.6.2.v20120302 2012-03-02 08:37:38 -06:00
Jan Bartel
959a4a2743 Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-02 10:39:17 +11:00
Greg Wilkins
79ce93ba94 357318: cancel key before close as speculative work around for JVM bug 2012-03-02 08:07:16 +11:00
Jan Bartel
c7b42cdb06 Merge remote-tracking branch 'origin/master' into jetty-8 2012-02-29 20:07:33 +11:00
Simone Bordet
556ff1a2c6 372457 - Big response + slow clients + pipelined requests cause Jetty spinning and eventually closing connections. 
Added a TODO for a method renaming that will happen in the next major release (to avoid break implementers).
 2012-02-28 09:21:52 +01:00
Jesse McConnell
ac79497dee [maven-release-plugin] prepare for next development iteration 2012-02-15 14:29:36 -06:00
Jesse McConnell
3705b424c8 [maven-release-plugin] prepare release jetty-8.1.1.v20120215 2012-02-15 14:29:28 -06:00
Jesse McConnell
efb6883cf0 [maven-release-plugin] prepare for next development iteration 2012-02-15 14:22:19 -06:00
Jesse McConnell
baf2b94f77 [maven-release-plugin] prepare release jetty-7.6.1.v20120215 2012-02-15 14:22:12 -06:00
Jesse McConnell
6b079ae3d8 merge from master 2012-02-01 17:25:08 -06:00
Greg Wilkins
2197854308 369121 simplified test 2012-01-31 15:35:35 +11:00
Jesse McConnell
6e44f4db5f [maven-release-plugin] prepare for next development iteration 2012-01-27 08:15:45 -06:00
Jesse McConnell
9d1ca3593e [maven-release-plugin] prepare release jetty-8.1.0.v20120127 2012-01-27 08:15:38 -06:00
Jesse McConnell
ad6126553b [maven-release-plugin] prepare for next development iteration 2012-01-27 08:13:06 -06:00
Jesse McConnell
4e25f7bb05 [maven-release-plugin] prepare release jetty-7.6.0.v20120127 2012-01-27 08:13:00 -06:00
Jesse McConnell
f2d0fd3cc8 revert back to 8.1.0-SNAPSHOT 2012-01-26 10:45:06 -06:00
Jesse McConnell
7ac9eb585f revert back to 7.6.0-SNAPSHOT 2012-01-26 10:42:11 -06:00
Jesse McConnell
e98ae91ca6 [maven-release-plugin] prepare for next development iteration 2012-01-25 11:16:11 -06:00
Jesse McConnell
fb30166a7f [maven-release-plugin] prepare release jetty-8.1.0.v20120125 2012-01-25 11:16:05 -06:00
Jesse McConnell
c918bb4e3c Merge branch 'master' into jetty-8 2012-01-25 10:31:44 -06:00
Jesse McConnell
0c96fc40ea [maven-release-plugin] prepare for next development iteration 2012-01-25 09:31:06 -06:00
Jesse McConnell
b455b7d94e [maven-release-plugin] prepare release jetty-7.6.0.v20120125 2012-01-25 09:30:55 -06:00
Greg Wilkins
f3735fab7b 368992 avoid update key while flushing during a write 2012-01-24 18:27:59 +11:00
Greg Wilkins
e1b12a633b Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-distribution/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
 2012-01-20 13:00:32 +11:00
Greg Wilkins
02d53f9612 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-20 12:40:58 +11:00