Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,137 Commits 67 Branches 465 Tags 359 MiB
Commit Graph

10137 Commits

Author SHA1 Message Date
Greg Wilkins 0f4a4cdac6 Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
 2014-12-05 08:11:54 +01:00
Joakim Erdfelt 35b86eed16 454152 - Remove mux remnants from WebSocketClient 2014-12-04 10:40:22 -07:00
Greg Wilkins 07e87f0ecf 454157 abort to avoid spin in async HttpInput.consumeAll 2014-12-04 17:39:53 +01:00
Greg Wilkins 1ff23803f7 453627 Fixed FileSystem test for nanosecond filesystems 2014-12-04 15:02:12 +01:00
Greg Wilkins a04a576c45 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-12-04 14:17:47 +01:00
Greg Wilkins 2536c1cc3f Handle HTTP2-16 black listed ciphers 2014-12-04 14:17:25 +01:00
Greg Wilkins 867feedca4 453629 Fixed big write test 2014-12-04 13:34:53 +01:00
Jan Bartel 7fa276b7ec 452261 Ensure <jsp-file> works with new JettyJspServlet 2014-12-04 12:35:58 +01:00
Greg Wilkins c3472f01c4 updated hpack for draft 10 name changes 2014-12-04 10:27:14 +01:00
Greg Wilkins 4296d84a7b updated hpack for draft 10 name changes 2014-12-04 10:17:06 +01:00
Jan Bartel dd6ab36867 453801 Jetty does not check for already registered services when bootstrapping 2014-12-04 10:05:54 +01:00
Greg Wilkins 20ef482d6f Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-12-04 07:36:41 +01:00
Greg Wilkins 9752b906fe Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 
Conflicts:
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRule.java
	jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java
 2014-12-04 07:36:16 +01:00
Joakim Erdfelt 46ebe86e28 Fixing broken build (due to license header format) 2014-12-03 10:50:45 -07:00
Joakim Erdfelt 9190cac406 Fixing broken build 2014-12-03 10:46:39 -07:00
Jesse McConnell 127b48c932 [maven-release-plugin] prepare for next development iteration 2014-12-03 09:00:57 -06:00
Jesse McConnell 028f4b9610 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 09:00:46 -06:00
Greg Wilkins 71529bdde3 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-12-04 01:36:49 +11:00
Greg Wilkins 65c7b621f6 453829 removed code with yahoo copyright 2014-12-04 01:36:14 +11:00
Greg Wilkins 88ddab9892 Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	VERSION.txt
 2014-12-04 01:33:56 +11:00
Greg Wilkins e30a8705d8 453829 Added HeaderRegexRule 
Also-by: Charlie Kim <charlesk@yahoo-inc.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
 2014-12-04 01:32:25 +11:00
Greg Wilkins d39a995acf 453829 Added HeaderRegexRule 
Also-by: Charlie Kim <charlesk@yahoo-inc.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
 2014-12-04 01:30:15 +11:00
Jesse McConnell 1263d1f3c8 [maven-release-plugin] prepare for next development iteration 2014-12-03 08:26:47 -06:00
Jesse McConnell 5c7f706496 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 08:26:35 -06:00
Greg Wilkins 904b6a113f update javadoc for DoSFilter 2014-12-04 01:01:18 +11:00
Jesse McConnell a3b89897d3 set for release 2014-12-03 07:25:36 -06:00
Simone Bordet 04b74d5ffe Merged branch 'jetty-9.2.x' into 'master'. 2014-12-02 21:09:23 +01:00
Simone Bordet ba3228fa21 453793 - _maxHeaderBytes>0 is not verified in parseNext() when in State.CLOSED. 
Added expression to check whether _maxHeaderBytes>0.
 2014-12-02 21:06:51 +01:00
Simone Bordet 3fddabbba0 Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202 in *.mod files. 2014-12-02 17:49:31 +01:00
Simone Bordet 12b25b786e Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202 in *.mod 
files.
 2014-12-02 17:42:51 +01:00
Simone Bordet b573848a45 Merged branch 'jetty-9.2.x' into 'master'. 2014-12-02 12:15:13 +01:00
Simone Bordet 948450d724 Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202. 2014-12-02 12:12:20 +01:00
Greg Wilkins 0a144ed3ac 453487 Recycle HttpChannelOverHTTP2 
This is an initial recyling of the channel.   The pool is a concurrent linked list, but it may be better to use an array backed list/stack that can easily enforce a maximum pool size.
The pool is currently on the session listener, when it really should be on the HTTP2ServerConnection, but more refactoring is needed for that.
Also the pool is currently inaccessible to the push mechanism
 2014-11-28 12:09:59 +11:00
Simone Bordet 007b7dac1c Merged branch 'jetty-9.2.x' into branch 'master'. 2014-11-27 12:01:02 +01:00
Simone Bordet ae3e491f26 453386 - Jetty not working when configuring QueuedThreadPool with minThreads=0. 
Fixed by properly initializing the queue capacity and by making sure
that if minThreads=0 at least one thread is always started to handle
the job.
 2014-11-27 11:32:59 +01:00
Greg Wilkins 981e27b383 452246 Fixed SSL hang on last chunk 
Back ported refinements from 9.3 to handle empty arrays
 2014-11-27 18:23:21 +11:00
Greg Wilkins a181b09d4c 439374 Use utf-8 as default charset for html 2014-11-27 17:41:19 +11:00
Greg Wilkins 174f2992a8 439374 Use utf-8 as default charset for html 2014-11-27 17:04:54 +11:00
Jan Bartel a129b0bcd1 451634 DefaultServlet: useFileMappedBuffer javadoc is misleading 2014-11-27 14:35:49 +11:00
Greg Wilkins 30776f9662 fixed merge 2014-11-27 14:32:09 +11:00
Greg Wilkins 1159111c52 Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
 2014-11-27 13:34:45 +11:00
Greg Wilkins a39dcd6fe5 452246 Fixed SSL hang on last chunk 
Fixed WriteFlusher to distinguish between a flush that consumes all content and returns false, from one
that consumes all content and returns true.
If false is returned, the flusher needs to remain in pending so encrypted buffers can be flushed.
 2014-11-27 11:45:08 +11:00
Jan Bartel 16737804c8 452261 - Multiple servlets map to path *.jsp when using jsp-property-group 2014-11-26 15:36:36 +11:00
Greg Wilkins bd0cd80b58 Merge branch 'jetty-9.2.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.2.x 2014-11-26 15:35:55 +11:00
Greg Wilkins 44ab3ba134 better debug 2014-11-26 15:35:42 +11:00
Joakim Erdfelt ed594425d3 Merge branch 'jetty-9.2.x' 
Conflicts:
	jetty-server/src/main/config/etc/jetty.xml
	jetty-server/src/main/config/modules/server.mod
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2014-11-25 12:09:21 -07:00
Joakim Erdfelt 07647e8a5f 443652 - Remove dependency on java.lang.management classes 
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
   - Server.java
   - Log.java
   - AbstractLifeCycle.java
 2014-11-25 08:25:35 -07:00
Greg Wilkins f853adb43c fixed debug 2014-11-21 16:01:31 +11:00
Greg Wilkins ed0954f6d6 ignore bad test 2014-11-21 10:53:57 +11:00
Joakim Erdfelt 1d12decce7 changing .getEnabled() to .getSelected() 2014-11-20 16:25:00 -07:00