Commit Graph

7963 Commits

Author SHA1 Message Date
Greg Wilkins d2ff475834 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
	tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
2013-08-23 17:17:34 +10:00
Greg Wilkins 2a178a29fd 413684 deprecated unsafe alias checkers
removed debugs
2013-08-23 17:11:57 +10:00
Greg Wilkins b33b5f2f5d 413684 deprecated unsafe alias checkers 2013-08-23 16:49:42 +10:00
Greg Wilkins c27020740f 415062 SelectorManager wakeup optimisation 2013-08-23 11:01:54 +10:00
Greg Wilkins a6b6891d8b 415641 Remove remaining calls to deprecated HttpTranspoert.send
Actually removed the impl of the deprecated method that is no longer called.
2013-08-23 10:23:52 +10:00
Joakim Erdfelt a396563340 414635 Modular start.d and jetty.base property
+ More work on startup of real jetty server.
2013-08-22 14:52:02 -07:00
Joakim Erdfelt b8e1f42b37 414635 Modular start.d and jetty.base property
+ More mod cleanup
 + Adding cyclic module reference detection and reporting
2013-08-22 14:21:52 -07:00
Joakim Erdfelt 5b2d9bc825 More work to get jetty to start 2013-08-22 12:45:52 -07:00
Joakim Erdfelt bddeb8cb77 Re-enabling PropertyPassingTest 2013-08-22 12:16:44 -07:00
Joakim Erdfelt e17cee533a More cleanup in start.jar 2013-08-22 12:00:52 -07:00
Jesse McConnell 0032c1443d add spdy and websocket mod 2013-08-22 13:23:29 -05:00
Jesse McConnell 54091990cb remove duplicate schema.jar 2013-08-22 13:08:51 -05:00
Jesse McConnell f99a517c1d update mod files 2013-08-22 12:52:56 -05:00
Joakim Erdfelt 766de7fb4f Merge branch 'jetty-9.1-altstart' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1-altstart 2013-08-22 10:40:56 -07:00
Joakim Erdfelt 314169b49d Removing start.config related classes 2013-08-22 10:40:25 -07:00
Jesse McConnell 5c87965ff1 server depends on xml.. 2013-08-22 12:23:29 -05:00
Jesse McConnell 450cdb3ef4 add servlet/s mod 2013-08-22 12:21:52 -05:00
Jesse McConnell e7d33f52a4 add security mod 2013-08-22 12:07:51 -05:00
Jesse McConnell 6ef6841a2e add modules directory 2013-08-22 12:04:11 -05:00
Jesse McConnell 8efba9fb40 bring back start.ini 2013-08-22 11:59:07 -05:00
Jesse McConnell 725e405dac first pass for mod files for distribution 2013-08-22 11:53:58 -05:00
Joakim Erdfelt 5600d411ed Start.d in-progress, coordinating with Jesse 2013-08-22 08:50:38 -07:00
Greg Wilkins 56353349c2 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-22 23:02:10 +10:00
Greg Wilkins 59540abeda Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2013-08-22 22:58:58 +10:00
Thomas Becker 465f151669 415641 Remove remaining calls to deprecated HttpTranspoert.send(HttpGenerator.ResponseInfo info, ByteBuffer content, boolean lastContent) throws IOException 2013-08-22 14:00:27 +02:00
Thomas Becker 525b268d41 415656 SPDY - add IdleTimeout per Stream functionality 2013-08-22 14:00:27 +02:00
Greg Wilkins c4583918a3 415330 Avoid multiple callbacks at EOF 2013-08-22 21:31:29 +10:00
Greg Wilkins 16191da3ac reduced test times 2013-08-22 21:31:29 +10:00
Simone Bordet c0ed8375d3 Removed unnecessary hack to determine the logger name. 2013-08-22 12:20:18 +02:00
Simone Bordet 8f41e33938 Improved idle timeout mechanism. 2013-08-22 12:17:13 +02:00
Jan Bartel a64319b9b1 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-22 20:11:08 +10:00
Jan Bartel 1ad9d6cff6 411934 War overlay configuration assumes src/main/webapp exists 2013-08-22 20:03:46 +10:00
Greg Wilkins 15f3a4e7c7 reduced test times 2013-08-22 18:17:50 +10:00
Joakim Erdfelt 2605c90d23 Merge branch 'jetty-9.1' into jetty-9.1-altstart 2013-08-21 15:59:44 -07:00
Joakim Erdfelt 03cd15ea82 Adding Module / Modules system classes for start.d 2013-08-21 15:12:17 -07:00
Joakim Erdfelt 77cbd9ec4b Import cleanup 2013-08-21 15:12:17 -07:00
Jan Bartel 48ae7ec3f6 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-22 07:56:22 +10:00
David Harrigan e351f04002 bug 415302
Patch to protect against null input's.

-=david=-

Signed-off-by: David Harrigan <dharrigan@gmail.com>
2013-08-22 07:47:10 +10:00
Simone Bordet 4f21d42b78 Fixed recycling of fields, now correctly restored to their initial
values.
2013-08-21 22:22:05 +02:00
Simone Bordet 0cdd884672 Merged branch 'master' into 'jetty-9.1'. 2013-08-21 22:20:11 +02:00
Simone Bordet 8951c4c773 Added tests for AsyncContext listeners behaviour. 2013-08-21 22:18:56 +02:00
Joakim Erdfelt 00e5daa37e Adding some WebSocket examples 2013-08-21 11:13:45 -07:00
Thomas Becker f11d9ba4d6 Remove HttpStalledServerConnectionTest 2013-08-21 10:43:07 +02:00
Joakim Erdfelt 4d9cb44536 WebSocket - Calling setPayload() outside of ContinuationFrame 2013-08-20 16:51:11 -07:00
Joakim Erdfelt e56fddfc4a WebSocket - Calling setPayload() outside of TextFrame and BinaryFrame 2013-08-20 16:45:26 -07:00
Joakim Erdfelt a089780701 WebSocket - Calling setPayload() outside of PingFrame and PongFrame 2013-08-20 16:39:26 -07:00
Joakim Erdfelt 975d9870d2 WebSocket - more code cleanup 2013-08-20 16:28:51 -07:00
Joakim Erdfelt c6a4af4f78 WebSocket - cleaning up frame initialization and use 2013-08-20 15:45:07 -07:00
Joakim Erdfelt 8c77fe2404 WebSocket - addressing bug in Partial message support 2013-08-20 15:31:12 -07:00
Joakim Erdfelt c548cba71c WebSocket - fixing windowed parse issue with masked frames 2013-08-20 12:56:32 -07:00