Commit Graph

10851 Commits

Author SHA1 Message Date
Jan Bartel a1bf23233e Update to org.eclipse.jetty.parent 24 2015-03-27 16:18:58 +11:00
Jan Bartel 247a94c8e5 Integrate cdi with jetty-maven-plugin 2015-03-27 16:18:58 +11:00
Greg Wilkins bf7df1fa55 463036 - system properties to set ssl password and keypasword
Changes so that system properties only provide default
2015-03-27 10:47:05 +11:00
Simone Bordet cd4ab9f369 Merged branch 'jetty-9.2.x' into 'master'. 2015-03-26 11:54:40 +01:00
Simone Bordet 07d29fb1b3 461499 - ConnectionPool may leak connections.
Avoid that the complete event is notified before or concurrently with
the response success event.
2015-03-26 11:33:17 +01:00
Greg Wilkins 55f92e8229 updated NOTICE.txt for possible ALPN inclusion 2015-03-26 14:24:38 +11:00
Greg Wilkins fd12bb8c5c fixed java 1.7 import 2015-03-26 13:53:03 +11:00
Greg Wilkins e093041040 enabled delayed dispatch by default 2015-03-26 12:42:09 +11:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Greg Wilkins 7da5db8dc9 458478 - JarFileResource improve performance of exist method
Use JarFile.getJarEntry() rather than interation

Also-by: alienisty@gmail.com
Signed-off-by: gregw@intalio.com
2015-03-26 12:18:06 +11:00
Greg Wilkins eca04f401a TreeTrie getBest String implementation 2015-03-26 12:18:06 +11:00
Greg Wilkins 5d14d0ca7a removed extra HttpInput synchronization 2015-03-26 12:18:06 +11:00
Joakim Erdfelt ea8a0f0e9a Moving CDI tests into /jetty-cdi/ tree 2015-03-25 17:23:23 -07:00
Joakim Erdfelt 739b6c9556 Fixing CDI module behavior 2015-03-25 15:33:26 -07:00
Simone Bordet 999177ccc2 Fixed race sending SETTINGS with INITIAL_WINDOW_SIZE.
Before, the sender was updating the window size after the SETTINGS
frame was written.
This was leading to a race where the receiver saw the updated window
size and sent DATA frames; these were received by the original sender
before it had the chance to update its local window size, causing an
error.
Now, the update of the window size happen just before writing the
SETTINGS frame to avoid this race.
2015-03-25 19:24:28 +01:00
Jesse McConnell 7bc2d50bf7 set for dev 2015-03-25 09:54:16 -05:00
Jesse McConnell da4f95f3d3 [maven-release-plugin] prepare for next development iteration 2015-03-25 09:08:27 -05:00
Jesse McConnell e92fd438fd [maven-release-plugin] prepare release jetty-9.2.11.M0 2015-03-25 09:08:21 -05:00
Jesse McConnell cf544ef708 update for milestone release 2015-03-25 08:13:39 -05:00
Simone Bordet b8623c125f Merged branch 'jetty-9.2.x' into 'master'. 2015-03-25 11:11:49 +01:00
Simone Bordet aa096d56c1 Fixed Javadocs. 2015-03-25 11:11:12 +01:00
Greg Wilkins 1d99c0af7b Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-03-25 14:00:23 +11:00
Greg Wilkins 8c652fd5bd 462546 - ShutdownMonitor should bind to jetty.host
Added STOP.HOST system property.  jetty.host is specific to a connector and a server may listen to many hosts
2015-03-25 13:58:19 +11:00
Simone Bordet d20c7707b7 Merged branch 'jetty-9.2.x' into 'master'. 2015-03-24 20:56:26 +01:00
Simone Bordet 1dc66b72dd 461499 - ConnectionPool may leak connections.
Made associate(), disassociate() and abort() atomic operations using
the HttpExchange state to coordinate atomicity.
In this way, it's not possible to associate a HttpChannel and a
HttpExchange if the latter has been aborted.
2015-03-24 16:19:45 +01:00
Simone Bordet 3b31d6aa12 Added ALPN files for JDK 8u40. 2015-03-24 12:52:16 +01:00
Simone Bordet 161317a5ef Merged branch 'jetty-9.2.x' into 'master'. 2015-03-23 22:32:40 +01:00
Simone Bordet 517b575c7f Fixed logging statement. 2015-03-23 22:27:00 +01:00
Simone Bordet 85999058e0 Updated ALPN version for JDK 8u40. 2015-03-23 22:14:02 +01:00
Simone Bordet e255bda694 459845 - Support upgrade from http1 to http2.
Simplified upgrade mechanism, and made it available through clearer
internal APIs.
2015-03-20 15:02:40 +01:00
Simone Bordet 2a21f8cb2f Renamed ISession.control() to ISession.frames(). 2015-03-20 15:02:07 +01:00
Simone Bordet 4107444beb Tests for async proxy functionality. 2015-03-20 14:53:11 +01:00
Simone Bordet c22088bfd0 Fixed CSS to remove space between rows. 2015-03-20 13:31:39 +01:00
Jan Bartel 576892d739 461415 Maven Jetty Plugin ignores ZIP overlays 2015-03-20 16:42:30 +11:00
Jan Bartel f6b4be9abe 457508 Add flag to scan exploded jars in jetty-jspc-maven-plugin 2015-03-20 15:51:22 +11:00
Simone Bordet 79e74c64e1 Introduced a generic Sweeper.
The Sweeper class periodically sweeps resources added to it.
Currently used to check whether the HttpClient code does not leak
connections.
2015-03-20 00:42:24 +01:00
Simone Bordet 6fa30da0eb Fixed code that compared enum values. 2015-03-20 00:25:42 +01:00
Simone Bordet d47ef4b846 462616 - Race between finishing a connect and timing it out. 2015-03-20 00:22:16 +01:00
Jan Bartel 7c53dfe5a4 459734 Update to apache jsp 8.0.20 2015-03-19 17:19:05 +11:00
Greg Wilkins ad4854dafe Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-03-19 15:13:15 +11:00
Greg Wilkins 7acbb05060 fixed test that failed on second boundary 2015-03-19 15:12:43 +11:00
Greg Wilkins caacebc223 459845 - Support upgrade from http1 to http2
functioning implementation.  Not exactly the most elegant solution, but works with nghttp2 -u
2015-03-19 12:02:54 +11:00
Joakim Erdfelt e21d24b035 454934 - WebSocketClient / connectToServer can block indefinitely during upgrade failure
+ Handling EOF and Timeout in a clearer way inside UpgradeConnection
2015-03-18 16:23:39 -07:00
Joakim Erdfelt 57b6debb87 454934 - WebSocketClient / connectToServer can block indefinitely during upgrade failure
+ Handling EOF and Timeout in a clearer way inside UpgradeConnection
2015-03-18 16:20:50 -07:00
John Myers a9be633816 [Bug 462098] Support setting ThreadGroup in ScheduledExecutorScheduler
Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com>
2015-03-18 18:14:53 -04:00
John Myers c8b84e0291 [Bug 462098] Support setting ThreadGroup in QueuedThreadPool
Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com>
2015-03-18 18:10:56 -04:00
Greg Wilkins c082848f93 462193 - Asynchronous HttpOutput.close()
Dispatch to handle on return from onWritePossible()
2015-03-18 10:28:14 +11:00
Joakim Erdfelt bb3243182e Cleaning up CDI WebSocketScope behavior 2015-03-17 10:22:23 -07:00
Joakim Erdfelt 1e3fe991e3 Increasing logging level for when websocket fails to open due to exception 2015-03-17 10:22:05 -07:00
Joakim Erdfelt 6e952d4618 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-start/src/test/java/org/eclipse/jetty/start/LicensingTest.java
2015-03-16 10:25:15 -07:00