Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,750 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

7750 Commits

Author SHA1 Message Date
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
Jesse McConnell 307fdced91 Merge branch 'master' into jetty-9.1 2013-08-20 14:02:45 -05:00
Jesse McConnell fd5d789ff5 [Bug 411069] better set compiler defaults to 1.7, including webdefault.xml for jsp 2013-08-20 13:34:33 -05:00
Jesse McConnell 724b96955d Merge branch 'jetty-8' 2013-08-20 13:03:26 -05:00
Jesse McConnell b4fab3fbc5 Merge branch 'jetty-7' into jetty-8 2013-08-20 13:02:40 -05:00
Jesse McConnell 3d6711b4ab [Bug 413484] setAttribute in nosql session management better handles _dirty status 2013-08-20 13:01:52 -05:00
Jesse McConnell a69deacc4c [Bug 411069] update minimum jdk versions in pom.xml's 2013-08-20 12:40:33 -05:00
Joakim Erdfelt 34f03cb0e8 WebSocket / releasing (header) buffer acquired during generation 2013-08-20 09:57:57 -07:00
Greg Wilkins 9bb6d91742 414635 Modular start.d and jetty.base property 
dependencies
 2013-08-20 17:04:20 +10:00
Greg Wilkins 26fbd41376 414635 Modular start.d and jetty.base property 
Transitive dependencies. Working jetty.base
 2013-08-20 17:03:30 +10:00
Jan Bartel ccf59bf75d 412934 Ignore any re-definition of an init-param within a descriptor 
Also tidy of code.
 2013-08-20 09:45:02 +10:00
Joakim Erdfelt f08aa88fbd jetty-start / HomeBase -> BaseHome and fix to ini expansion order 2013-08-19 16:17:32 -07:00
Joakim Erdfelt 8e66da396e Merge branch 'jetty-9.1-wssplitframe' into jetty-9.1 2013-08-19 15:27:09 -07:00
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
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 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