Joakim Erdfelt
3dbcc04b73
Breaking apart WebSocketFrame into sub-frame types
...
+ Performance improvements?
+ Less copying of data
2013-08-19 15:26:07 -07:00
Simone Bordet
45724b63ec
Improved masking performance by using ints instead of bytes.
2013-08-19 22:11:52 +02:00
Simone Bordet
1c73ce674f
Using direct buffers for reads, to avoid copy of the bytes by the
...
JDK, and because they yield better performance for masking.
2013-08-19 22:11:40 +02:00
Joakim Erdfelt
344eab0bbf
Merge branch 'jetty-9.1' into jetty-9.1-altstart
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
jetty-start/src/main/java/org/eclipse/jetty/start/HomeBase.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2013-08-19 09:03:47 -07:00
Jan Bartel
ad8db51ed5
415314 Jetty should not commit response on output if < Response.setBufferSize() bytes are written
2013-08-19 17:52:39 +10:00
Greg Wilkins
c0402dec4a
414635 Modular start.d and jetty.base property
...
Merged branch jetty-9.1-altstart with cherry picks of
ecf30e4
72f8143
998f95b
46a9495
fe4b922
3443593
2b40990
07636db
4e1a62b
aed6811
578613e
b1b394b
2013-08-19 16:29:01 +10:00
Joakim Erdfelt
b1b394b4bf
jetty.base is always defined.
2013-08-19 15:26:29 +10:00
Joakim Erdfelt
578613e901
Consolidating filters
2013-08-19 15:25:27 +10:00
Joakim Erdfelt
aed68112ce
Fixing enable/disable
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2013-08-19 15:25:14 +10:00
Joakim Erdfelt
4e1a62b5c5
Using try-with-resources more consistently
2013-08-19 15:23:38 +10:00
Joakim Erdfelt
07636dbe62
Fixing up confusion over OPTIONS vs OPTION
2013-08-19 15:19:50 +10:00
Joakim Erdfelt
2b4099007f
Making Config use HomeBase q
...
+ Cleaning up Start INI handling with new StartIni class
+ Eliminating recursive sub-ini directory issue
+ Adding NaturalSort utility class
+ Adding FS utility class
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Config.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2013-08-19 15:18:49 +10:00
Joakim Erdfelt
3443593136
Reducing code duplication
2013-08-19 14:49:46 +10:00
Joakim Erdfelt
fe4b922127
Making warning show on System.err
2013-08-19 14:49:06 +10:00
Joakim Erdfelt
46a94956ee
Adding HomeBase to simplify file access logic between jetty.home and jetty.base
2013-08-19 14:47:49 +10:00
Joakim Erdfelt
998f95bfc0
More javadoc, minor cleanup
2013-08-19 14:46:36 +10:00
Joakim Erdfelt
72f8143d5e
Removing CORBA reference?? and adding improved debug method
2013-08-19 14:44:38 +10:00
Joakim Erdfelt
ecf30e41cb
Fixing Jar close resource leak
2013-08-19 14:43:53 +10:00
Greg Wilkins
bead95314a
414635 Modular start.d and jetty.base property
...
Added more info in README.TXT files
2013-08-19 13:22:02 +10:00
Greg Wilkins
84df81c288
414635 Modular start.d and jetty.base property
...
Fixed NPE from XmlConfiguration
reordered so command line comes after start.ini and start.d
2013-08-19 12:30:53 +10:00
Joakim Erdfelt
d92ee024d2
jetty.base is always defined.
2013-08-18 10:40:15 -07:00
Joakim Erdfelt
b2e194a890
Consolidating filters
2013-08-18 10:29:57 -07:00
Joakim Erdfelt
22c65c8f10
Fixing enable/disable
2013-08-18 10:22:25 -07:00
Joakim Erdfelt
bb3d8e3a52
Using try-with-resources more consistently
2013-08-18 08:27:45 -07:00
Joakim Erdfelt
637be5259e
Fixing up confusion over OPTIONS vs OPTION
2013-08-18 08:20:55 -07:00
Joakim Erdfelt
b081559435
Making Config use HomeBase q
...
+ Cleaning up Start INI handling with new StartIni class
+ Eliminating recursive sub-ini directory issue
+ Adding NaturalSort utility class
+ Adding FS utility class
2013-08-17 16:22:20 -07:00
Joakim Erdfelt
a1ca1dd6f8
Reducing code duplication
2013-08-17 14:30:13 -07:00
Joakim Erdfelt
432bcf5e35
Making warning show on System.err
2013-08-17 14:27:18 -07:00
Joakim Erdfelt
2da91a1bdb
Adding HomeBase to simplify file access logic between jetty.home and jetty.base
2013-08-17 14:26:12 -07:00
Joakim Erdfelt
fde5e58318
More javadoc, minor cleanup
2013-08-17 12:00:25 -07:00
Joakim Erdfelt
4a8902885a
Removing CORBA reference?? and adding improved debug method
2013-08-17 11:59:56 -07:00
Joakim Erdfelt
053b9fe34b
Fixing Jar close resource leak
2013-08-17 11:59:16 -07:00
Joakim Erdfelt
3c28bf8c60
Revert "415062 SelectorManager wakeup optimisation"
...
This reverts commit edbf6e07aa
.
2013-08-16 14:38:10 -07:00
Joakim Erdfelt
fd3537e012
Revert "415062 SelectorManager wakeup optimisation"
...
This reverts commit 2f0becff8f
.
2013-08-16 14:38:08 -07:00
Joakim Erdfelt
d351c82de8
Revert "415062 SelectorManager wakeup optimisation"
...
This reverts commit b58c05d77c
.
2013-08-16 14:38:02 -07:00
Joakim Erdfelt
26faa5f0d7
WebSocket - fixing flush->write->complete spinning loop
2013-08-16 13:08:10 -07:00
Greg Wilkins
b58c05d77c
415062 SelectorManager wakeup optimisation
...
Some further cleanup after sbordet review
2013-08-17 00:01:20 +10:00
Jesse McConnell
70e7a69d19
squash test osgi jars on deploy
2013-08-16 06:44:08 -05:00
Greg Wilkins
2f0becff8f
415062 SelectorManager wakeup optimisation
...
removed wakeup spin
2013-08-16 19:23:59 +10:00
Greg Wilkins
edbf6e07aa
415062 SelectorManager wakeup optimisation
2013-08-16 16:35:38 +10:00
Greg Wilkins
669f26566f
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-16 11:44:30 +10:00
Greg Wilkins
2761abb658
415194 Deployer gives management of context to context collection
2013-08-16 11:40:23 +10:00
Jan Bartel
1691618024
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-08-16 11:06:42 +10:00
Jan Bartel
54a899d55f
415192 <jsp-file> maps to JspPropertyGroupServlet instead of JspServlet
2013-08-16 11:02:29 +10:00
Joakim Erdfelt
4016ba571c
JSR-356 working javax.websocket demo in the distribution.
2013-08-15 12:20:06 -07:00
Joakim Erdfelt
662d00855d
Adding javax.websocket chat to test-jetty-webapp
2013-08-15 12:20:06 -07:00
Jesse McConnell
42387785bd
fix start.ini
2013-08-15 12:07:47 -05:00
Greg Wilkins
484aa94cd0
415131 Avoid autoboxing on debug
2013-08-15 22:57:43 +10:00
Greg Wilkins
145f544861
414635 Modular start.d and jetty.base property
...
Added --enable and --disable
2013-08-15 22:57:43 +10:00
Thomas Becker
e34ba252a2
413737 hide stacktrace in ReferrerPushStrategyTest
2013-08-15 13:13:23 +02:00