10169 Commits

Author SHA1 Message Date
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 fb53617a55a62ee7ad30b071711180e510039b8b.
2014-08-21 08:30:34 -05:00
Jesse McConnell
39d597da74 Revert "Improved console modules to put wars in lib"
This reverts commit 49f0e7af4346b8cfc96e9f490407ceb7b81a26a6.
2014-08-21 08:30:19 -05:00
Jesse McConnell
9baae458a4 Revert "improved jamon configuration"
This reverts commit b7408757c31e064a26b0ff0ea9dd51d06ae177b8.
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
Simone Bordet
790678d460 Moved NPN module files in the right directory after merge. 2014-08-21 12:27:58 +02:00
Simone Bordet
a1ea9af3f9 Merged branch 'master' into 'jetty-http2'. 2014-08-21 12:20:08 +02:00
Simone Bordet
6e58e3b00e Properly updated NPN and ALPN files and configuration for JDK 7u65
and 8u20.
2014-08-21 12:19:23 +02:00
Simone Bordet
17c8f71724 Renamed onConnect() to onAccept() to reflect its server-side role. 2014-08-21 11:54:03 +02:00
Simone Bordet
c07ea68b51 Improved configurability of stream idle timeout. 2014-08-21 11:54:03 +02:00
Simone Bordet
75c1322adc Rewritten close workflow to make sure that connections are correctly closed. 2014-08-21 11:54:03 +02:00
Simone Bordet
7a61c96ba1 Removed debug logging (wrongly assumes the ByteBuffer has a backing array). 2014-08-21 11:54:03 +02:00
Simone Bordet
c10e5e8833 Renamed PushTest -> PushCacheFilterTest. 2014-08-21 11:54:02 +02:00
Greg Wilkins
abcce1140e alpn-1.7.0_67 2014-08-21 17:13:18 +10:00
Greg Wilkins
23eba39748 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-21 16:39:45 +10:00
Greg Wilkins
b7408757c3 improved jamon configuration 2014-08-21 16:03:27 +10:00
Greg Wilkins
49f0e7af43 Improved console modules to put wars in lib 2014-08-21 15:45:55 +10:00
Greg Wilkins
fb53617a55 added console modules 2014-08-21 14:03:38 +10:00
Greg Wilkins
af27566d2b fixed JSP issues 2014-08-21 11:42:21 +10:00
Greg Wilkins
c1b66a3ea3 Fixed start.jar property as properties issue 2014-08-21 10:45:28 +10:00
Greg Wilkins
bd8bcd62e9 updated npn alpn for java 1.7.0_76 2014-08-21 10:44:48 +10:00
Greg Wilkins
420df3b5d6 441756 Ssl Stackoverflow on renegotiate 2014-08-21 09:47:01 +10:00
Greg Wilkins
7584488702 javadoc 2014-08-21 09:43:35 +10:00
Greg Wilkins
984c7fdd85 various updates 2014-08-20 17:54:01 +10:00
Greg Wilkins
9b36f999d1 fixed merge 2014-08-20 12:22:16 +10:00
Greg Wilkins
ae8e7f0067 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-20 12:02:09 +10:00