Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,840 Commits 78 Branches 465 Tags 373 MiB
Commit Graph

9840 Commits

Author SHA1 Message Date
Jan Bartel e4454965d4 Make annotations and JNDI wortk with OSGi 2014-09-05 17:49:17 +10:00
Greg Wilkins 07ec47adfa improved SSL debug logging 2014-09-04 19:09:39 +10:00
Greg Wilkins 5b97d652e1 Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
 2014-09-04 17:43:18 +10:00
Greg Wilkins 8d332b0962 added npn and alpn license messages 2014-09-04 12:29:59 +10:00
Jan Bartel 2adb029764 443172 web-fragment.xml wrongly parsed for applications running in serlvet 2.4 mode 2014-09-04 12:10:55 +10:00
Jan Bartel 51715dbcdb 443231 java.lang.NullPointerException on scavenge scheduling when session id manager declared before shared scheduler 2014-09-04 11:31:08 +10:00
Jan Bartel a1587d807e 443262 Distinguish situation where jetty looks for tlds in META-INF but finds none vs does not look 2014-09-04 10:22:40 +10:00
Greg Wilkins 610bac49b9 435322 Added a idleTimeout to the SharedBlockerCallback 2014-09-04 09:30:21 +10:00
Greg Wilkins ed8abd1d53 443049 Improved HttpParser illegal character messages 2014-09-04 09:27:42 +10:00
Jan Bartel c0aef8975d Switch to apache-jsp for jetty-osgi 2014-09-04 08:16:35 +10:00
Greg Wilkins 5be1fb6270 Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2014-09-03 15:19:54 +10:00
Greg Wilkins c3647f9d9f 443158 Fixed HttpOutput spin 2014-09-03 15:01:10 +10:00
Greg Wilkins e03b511415 trying to catch intermittent test failure 2014-09-03 15:00:40 +10:00
Greg Wilkins 0a2aeb54a1 435322 Added a idleTimeout to the SharedBlockerCallback 2014-09-03 10:46:18 +10:00
Simone Bordet bb1d4946bc Merged branch 'master' into 'jetty-http2'. 2014-09-02 10:25:31 +02:00
Simone Bordet 7be9f0d7a4 Fixed doStop() to call super before interrupting the reference queue thread. 2014-09-01 21:16:40 +02:00
Simone Bordet 5370f3c8cb 442950 - Embedded Jetty client requests to localhost hangs with high cpu usage (NIO OP_CONNECT Solaris/Sparc). 2014-09-01 12:06:18 +02:00
Simone Bordet ee3ab1f8ea Merged branch 'master' into 'jetty-http2'. 2014-09-01 11:57:09 +02:00
Simone Bordet 9dbd2cd9d8 442950 - Embedded Jetty client requests to localhost hangs with high cpu usage (NIO OP_CONNECT Solaris/Sparc). 
Now checking the return value of SocketChannel.connect() to determine
whether to register the channel (true) or finish the connect (false).
 2014-09-01 11:28:59 +02:00
Simone Bordet ca2a23c35d Improved Javadocs and code cleanup. 2014-09-01 11:28:59 +02:00
Greg Wilkins 277ca5c065 fixed merge 2014-08-29 17:54:28 +10:00
Greg Wilkins dacc796831 Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	tests/test-quickstart/pom.xml
 2014-08-29 17:52:58 +10:00
Greg Wilkins 17c9a32268 moved quickstart to test-quickstart 2014-08-29 17:35:26 +10:00
Greg Wilkins a4debf68c4 fixed merge 2014-08-29 16:03:32 +10:00
Greg Wilkins 5507e267ae Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-server/src/main/config/etc/jetty-https.xml
	jetty-server/src/main/config/modules/ssl.mod
	jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
 2014-08-29 15:49:25 +10:00
Greg Wilkins 69390954dc 435322 acceptor and selector configuration/priority 2014-08-29 15:36:19 +10:00
Greg Wilkins edcb56ae6b Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2014-08-29 12:41:52 +10:00
Greg Wilkins eee2ba206e 435322 Added a idleTimeout to the SharedBlockerCallback 2014-08-29 11:55:06 +10:00
Jan Bartel 21d590a74a 442759 Allow specific ServletContainerInitializers to be excluded 2014-08-28 16:52:26 +10:00
Greg Wilkins d8e6331434 442477 Allow Symlink aliases by default 2014-08-27 17:33:27 +10:00
Jan Bartel 8f62be9fef 442628 Update example xml file for second server instance to extract wars 2014-08-27 17:22:37 +10:00
Jan Bartel 0aeebc4ec0 435988 ContainerLifeCycle: beans never stopped on remove 2014-08-27 17:13:07 +10:00
Greg Wilkins 4c8e2a6635 442642 Quickstart generates valid XML 
Fixed issues with XmlParser and WebDescriptor that were stopping validation.
 2014-08-27 16:38:49 +10:00
Jan Bartel 8ce96cdd2e 441475 org.eclipse.jetty.server.ResourceCache exceptions under high load 2014-08-27 14:46:22 +10:00
Greg Wilkins adb56b3d90 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-27 12:53:54 +10:00
Greg Wilkins 1a0eb64a1f 442383 Improved insufficient threads message 2014-08-27 12:40:54 +10:00
Greg Wilkins 9a52d92f03 442048 fixed sendRedirect %2F encoding 2014-08-27 12:34:15 +10:00
Jan Bartel b49fefd626 Update to 8.0.9.M2 version of org.mortbay.apache.jasper. 2014-08-27 11:17:43 +10:00
Greg Wilkins e5c1d66916 avoid default port in http2 push 2014-08-22 16:25:20 +10:00
Greg Wilkins b02cdc10c1 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-22 16:11:47 +10:00
Greg Wilkins 589d05afe0 Added 3rd party module licenses 2014-08-22 11:48:55 +10:00
Jesse McConnell 2e034c5749 reset for more dev 2014-08-21 11:58:18 -05:00
Jesse McConnell c23e5f4889 [maven-release-plugin] prepare for next development iteration 2014-08-21 09:13:38 -05:00
Jesse McConnell 3347e11281 [maven-release-plugin] prepare release jetty-9.2.3.v20140821 2014-08-21 09:13:32 -05:00
Jesse McConnell 3be7cded1d set for release 2014-08-21 08:44:20 -05:00
Jesse McConnell 8ba0d600b9 Merge branch 'master' into release-9 2014-08-21 08:42:10 -05:00
Jesse McConnell 8619a12ca0 Revert "added console modules" 
This reverts commit fb53617a55.
 2014-08-21 08:30:34 -05:00
Jesse McConnell 39d597da74 Revert "Improved console modules to put wars in lib" 
This reverts commit 49f0e7af43.
 2014-08-21 08:30:19 -05:00
Jesse McConnell 9baae458a4 Revert "improved jamon configuration" 
This reverts commit b7408757c3.
 2014-08-21 08:27:50 -05:00
Simone Bordet 2cdc48e97f Moved NPNModuleTest to module 'jetty-npn-server'. 
This follows where npn module files have been moved to.
 2014-08-21 15:18:10 +02:00