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
7,048 Commits 55 Branches 466 Tags
Commit Graph

1758 Commits

Author SHA1 Message Date
Greg Wilkins
3de2ba33f1 fixed merge 2013-06-11 10:52:15 +10:00
Greg Wilkins
d2794584e1 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
 2013-06-07 15:48:22 +10:00
Thomas Becker
82b73c065f 409953 return buffer.slice() instead of buffer.asReadOnlyBuffer() in ResourceCache to avoid using inefficent path in BufferUtil.writeTo 2013-06-06 14:09:27 +02:00
Thomas Becker
b274fdb0d6 409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte 2013-06-05 15:31:24 +02:00
Simone Bordet
e65e4e168d 409842 - Suspended request completed by a request thread does not set read interest. 
HttpConnection.completed() now performs the right check about the current connection.
 2013-06-05 11:34:12 +02:00
Greg Wilkins
bacff75b31 Replace reponse.commit with response.closeOutput 2013-06-04 10:51:49 +10:00
Greg Wilkins
7bb3a7be28 409556 Resource files not closed 
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.

FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
 2013-06-03 18:21:11 +10:00
Greg Wilkins
41ac4a0877 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-31 18:46:10 +10:00
Greg Wilkins
0e11c82307 fixed merge 2013-05-31 18:07:01 +10:00
Greg Wilkins
842309e656 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-05-31 18:06:34 +10:00
Greg Wilkins
3849c893e1 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-31 11:07:40 +10:00
Greg Wilkins
3094f93ed9 408642 setContentType from addHeader 2013-05-31 11:06:33 +10:00
Greg Wilkins
b9014f29dc fixed bad merge 2013-05-31 10:01:13 +10:00
Greg Wilkins
b59949253d Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
 2013-05-30 17:17:54 +10:00
Greg Wilkins
d8f2350f50 398467 Servlet 3.1 Non Blocking IO 
Removed double dispatch due to HttpPArser content handler returning true for deferred dispatch.
 2013-05-30 16:15:04 +10:00
Greg Wilkins
76457d4807 409441 jetty.xml threadpool arg injection 
Do not use arg injection for ThreadPool
 2013-05-30 11:59:36 +10:00
Jan Bartel
af02e9b16d Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00
Greg Wilkins
c961d65697 398467 Servlet 3.1 Non Blocking IO 
completed removal of HttpOutput.closeIfAllContentWritten
 2013-05-30 09:09:47 +10:00
Greg Wilkins
579f8994ca 398467 Servlet 3.1 Non Blocking IO 
continue after double dispatch with just a logged error
 2013-05-29 09:37:43 +10:00
Greg Wilkins
ddd187882f 398467 Servlet 3.1 Non Blocking IO 
removed experiment input handling
 2013-05-28 23:30:49 +10:00
Greg Wilkins
ce662c7ddc 398467 Servlet 3.1 Non Blocking IO 
cleaned up test harness
 2013-05-28 23:29:38 +10:00
Greg Wilkins
f03bc398f8 398467 Servlet 3.1 Non Blocking IO 
Looking at async input
 2013-05-28 23:28:07 +10:00
Greg Wilkins
942f8a5c40 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2013-05-28 22:51:31 +10:00
Greg Wilkins
6f0195e0de 398467 Servlet 3.1 Non Blocking IO 
Fixed handling of empty writes
fixed double close sendContent
 2013-05-28 22:46:16 +10:00
Greg Wilkins
288a452881 398467 Servlet 3.1 Non Blocking IO 
some cleanup/fixes of SPDY tests.  More work needed
 2013-05-25 17:07:30 +10:00
Greg Wilkins
c7be106423 398467 Servlet 3.1 Non Blocking IO 
Working async writes after HttpChannelState refactor
 2013-05-25 15:45:16 +10:00
Greg Wilkins
94d1f4a020 398467 Servlet 3.1 Non Blocking IO 
Check point progress as I dispair at the insane complexity of servlet 3.1 specification
 2013-05-24 14:34:27 +10:00
Greg Wilkins
6f8ed5e809 398467 Servlet 3.1 Non Blocking IO 
Refactored HttpChannel to be ready to control onWritePossible callbacks
 2013-05-23 17:34:28 +10:00
Jan Bartel
db2615ab29 408723 Jetty Maven plugin reload ignores web.xml listeners 2013-05-23 17:28:12 +10:00
Greg Wilkins
15e0d50b79 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-23 09:50:27 +10:00
Greg Wilkins
79486b5949 408720 NPE in AsyncContext.getRequest() 
Do not null the _event during the complete method
 2013-05-23 09:48:06 +10:00
Jesse McConnell
725dc261c8 Merge branch 'release-8' into jetty-8 2013-05-22 10:44:14 -05:00
Jesse McConnell
a1a6f0e5f2 Merge branch 'release-7' into jetty-7 2013-05-22 10:39:24 -05:00
Jesse McConnell
74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Jesse McConnell
742f6a063d [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:16:39 -05:00
Jesse McConnell
bdbd92dbc9 [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:10:07 -05:00
Jesse McConnell
0858e69cb1 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:19:34 -05:00
Jesse McConnell
d469b77663 [maven-release-plugin] prepare release jetty-8.1.11.v20130520 2013-05-20 07:19:25 -05:00
Jesse McConnell
497c2f7819 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:15:00 -05:00
Jesse McConnell
b32d0260c9 [maven-release-plugin] prepare release jetty-7.6.11.v20130520 2013-05-20 07:14:52 -05:00
Jan Bartel
cf71e9559b Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-17 17:19:54 +10:00
Jan Bartel
b6d1158c22 408167 JDBCSessionManager don't mark session as dirty if same attribute value set 2013-05-17 17:18:54 +10:00
Greg Wilkins
d703319c87 398467 Servlet 3.1 Non Blocking IO 
simplified write
 2013-05-17 16:35:58 +10:00
Greg Wilkins
5397f16559 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2013-05-17 14:09:17 +10:00
Greg Wilkins
8a6ab9ab9d 408117 isAsyncStarted is false on redispatch 2013-05-17 11:41:22 +10:00
Greg Wilkins
b22d280e2a 398467 Servlet 3.1 Non Blocking IO 
Cleaned up exceptions and HttpOutput.write
 2013-05-16 19:00:00 +10:00
Jan Bartel
67a1b2a18f Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
 2013-05-16 16:06:41 +10:00
Jan Bartel
427c59e2f2 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-16 15:47:22 +10:00
Jan Bartel
51c1017b3d 408077 HashSessionManager leaves file handles open after being stopped 2013-05-16 15:39:50 +10:00
Greg Wilkins
01768562ca 398467 Servlet 3.1 Non Blocking IO 
fixed ResourceHandler
 2013-05-16 14:27:32 +10:00