1737 Commits

Author SHA1 Message Date
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
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
74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -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
Jan Bartel
76b767fc22 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
2013-05-16 12:33:08 +10:00
Jan Bartel
4a562f8d89 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-16 12:25:19 +10:00
Jan Bartel
8a1ea2f69c 407976 JDBCSessionIdManager potentially leaves server in bad state after startup 2013-05-16 12:18:04 +10:00
Greg Wilkins
76d4859eda 398467 Servlet 3.1 Non Blocking IO
Improved sendContent API and javadoc. Added FastFileServer example
2013-05-16 09:26:37 +10:00
Jan Bartel
cbac0ea5fa Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-16 07:24:49 +10:00
Greg Wilkins
c03cb95e8a removed debug prints 2013-05-14 17:57:52 +10:00
Greg Wilkins
4dd80e9128 398467 Servlet 3.1 Non Blocking IO
More refinements to avoid duplicate code and optimise common paths
2013-05-14 17:52:46 +10:00
Greg Wilkins
0116f45ff0 398467 Servlet 3.1 Non Blocking IO
Asynchronous default servlet
2013-05-14 10:09:09 +10:00
Greg Wilkins
9f3e4dc5b7 398467 Servlet 3.1 Non Blocking IO
Added callbacks to HttpOutput
2013-05-14 10:09:09 +10:00
Jan Bartel
73bee3af4b 407708 - HttpUpgradeHandler must support injection 2013-05-13 17:47:53 +10:00
Greg Wilkins
fe582e544a 398467 Non Blocking IO
Working towards 3.1 by exposing more of the underlying async IO operations.
added async support to write in HttpChannel
2013-05-10 20:11:19 +10:00
Greg Wilkins
ccc7a71c74 398467 Non Blocking IO
Working towards 3.1 by exposing more of the underlying async IO operations.
2013-05-10 19:45:32 +10:00
Greg Wilkins
09476ac235 406923 Accept CRLF or LF but not CR as line termination
Better handling of FF character
2013-05-09 15:01:50 +10:00
Jesse McConnell
3d600ed95e [maven-release-plugin] prepare for next development iteration 2013-05-06 18:13:04 -05:00
Jesse McConnell
d832f3dc7e [maven-release-plugin] prepare release jetty-9.0.3.v20130506 2013-05-06 18:12:55 -05:00
Jan Bartel
b182f09b2c 405944 Check annotation and resource injection is supported for AsyncListener 2013-05-06 16:32:38 +10:00
Jan Bartel
8d0cf5e949 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-06 14:46:28 +10:00
Jan Bartel
e7564c9dcd Merge remote-tracking branch 'origin/jetty-8' 2013-05-06 13:30:53 +10:00
Jan Bartel
488c1755e0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-06 13:22:26 +10:00
Greg Wilkins
9ec10734e5 fixed warn output 2013-05-06 13:04:39 +10:00
Jan Bartel
f10a1d709b 407173 java.lang.IllegalStateException: null when using JDBCSessionManager 2013-05-06 12:24:53 +10:00