Commit Graph

3783 Commits

Author SHA1 Message Date
Jan Bartel 17269583fb Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-30 12:05:46 +11:00
Simone Bordet ec5f424c8c Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-28 11:41:36 +02:00
Simone Bordet 294c588023 375509 - Stalled stream stalls other streams or session control frames. 2012-03-28 11:41:06 +02:00
Jan Bartel ef0d6d32f9 374881 Ensure setCopyWebInf(true) only copies WEB-INF if !setCopyWebDir(true) 2012-03-28 19:27:06 +11:00
Jan Bartel 22f437c36d 375490 NPE with --help on command line 2012-03-28 14:47:27 +11:00
Jan Bartel 72951403d3 375096 If starting a server instance fails in osgi it is cleaned up. 2012-03-26 22:48:50 +11:00
Greg Wilkins 241997b449 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-23 09:21:35 +11:00
Greg Wilkins 65725b0025 357318: make the cancel key work around conditional on running on windows 2012-03-23 09:21:00 +11:00
Simone Bordet bb66cfc877 375083 - Flow control should take in account window size changes from concurrent SETTINGS 2012-03-22 17:08:11 +01:00
Thomas Becker 875bcb5bb8 374995: configure jmx rmi port via SystemProperty
Change-Id: I35f336d4754c79717b741aea0896bd71b46ed28d

374995: configure jmx rmi host via SystemProperty,change objectname and jmxpath from jettyjmx to jmxrmi

Change-Id: Ib469d631682c9fb31aea584c38906aae0958198f

374995: configure jmx rmi host via SystemProperty,change objectname and jmxpath from jettyjmx to jmxrmi

Change-Id: I02c88c518810e03c7ae59453fa6752d80108960e
2012-03-22 13:03:22 +01:00
Jan Bartel 6a2c5fc9fd 375009 Filter initialization error will throw MultiException 2012-03-22 13:50:36 +11:00
Jan Bartel 0f9a898c1c 349110 MultiPartFilter records the content-type in request params 2012-03-22 09:59:57 +11:00
pgdad c81dbb8694 374891 - enhancement to how ProxyServlet determines the proxy target 2012-03-21 08:44:02 -04:00
Jan Bartel 48982ced4a Fix up version number in manifests; reformat code; tidy xml and tweak 2012-03-21 16:39:55 +11:00
Jesse McConnell 2a67ebca95 noop change to test commit and push speed 2012-03-20 11:25:11 -05:00
Jan Bartel 9d54ea4cde JETTY-1500 form parameters from multipart request not available via request.getParameter 2012-03-20 18:35:21 +11:00
Simone Bordet 3218298798 Merge branch 'master' into jetty-8 2012-03-19 15:14:57 +01:00
Jesse McConnell 8e0dd32286 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-19 08:24:08 -05:00
Jesse McConnell 422b41cfd1 fix a typo from bug 373952 2012-03-19 08:23:54 -05:00
Greg Wilkins d8b1d80e4e Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
Greg Wilkins 7e3b8bcfd4 374611: do not redispatch if already dispatched when SSL reads content on write 2012-03-19 15:48:39 +11:00
Greg Wilkins cf2c283653 protect dump from bad object toString()s 2012-03-19 11:11:48 +11:00
Jesse McConnell c7a4c80da5 [Bug 373421] address potential race condition related to the nonce queue
removing the same nonce twice
2012-03-16 15:39:10 -05:00
Jesse McConnell d717be1450 [Bug 374367] NPE in QueuedThreadPool.dump() with early java6 jvms 2012-03-16 14:52:49 -05:00
Jesse McConnell ec2ccec766 [Bug 373952] bind called too frequently on refresh 2012-03-16 14:49:17 -05:00
Jesse McConnell b3ac9235f7 add spdy to the distribution and make npn-boot test dependency pull from internal to build as opposed to out of a local repository 2012-03-16 12:46:47 -05:00
Jesse McConnell fc1e57a315 fix line in spnego readme 2012-03-16 12:44:21 -05:00
Jan Bartel 4b2d976f24 JETTY-1495 Ensure dynamic servlet addition does not cause servlets to be inited. 2012-03-16 15:48:02 +11:00
Greg Wilkins 7842e9c101 374450: use temp read only buffers instead of synchronisation 2012-03-16 10:05:38 +11:00
Greg Wilkins a6eda90594 fixed merge issue 2012-03-16 09:16:46 +11:00
Greg Wilkins 25213b83fa 374158: improved test harness 2012-03-16 09:07:20 +11:00
Simone Bordet 90ef835825 Reverted changes to SuspendHandler to make tests pass again. 2012-03-15 15:01:24 +01:00
Simone Bordet 13f0ae732d Test fixes. 2012-03-15 12:12:22 +01:00
Jan Bartel f2400e5f78 Harmonized jetty-8 with jetty-7 for Ajp13SocketConnector 2012-03-15 10:54:15 +11:00
Jan Bartel 64e526dad4 Remove duplicate websocket entry in start.config 2012-03-15 10:47:16 +11:00
Jan Bartel 83ce567e66 Add missing test from jetty-7 2012-03-15 09:53:12 +11:00
Simone Bordet fef74963af Forgotten modifications from Jetty7 2012-03-14 19:39:21 +01:00
Simone Bordet 5624a5721e Merged from master. 2012-03-14 18:24:57 +01:00
Simone Bordet 44017f18af 374258 - SPDY leaks SSLEngines. Made the test more reliable. 2012-03-14 17:49:57 +01:00
Simone Bordet 2e2247bde5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-14 16:32:03 +01:00
Simone Bordet ab9bcf26b2 374258 - SPDY leaks SSLEngines 2012-03-14 16:31:29 +01:00
Simone Bordet 4a02fdb6c0 374252 - SslConnection.onClose() does not forward to nested connection. 2012-03-14 16:12:46 +01:00
Jan Bartel 15b620c2d5 374152 jetty-all-server MANIFEST contains wrong import: javax.servlet.annotation;version="[2.6,3)" 2012-03-14 12:07:25 +11:00
Greg Wilkins 708f8ccaeb 374158: do not asyncDispatch from SSL if suspended 2012-03-14 11:48:06 +11:00
Greg Wilkins 56e726c201 374018 correctly handle requestperminuted underflow 2012-03-13 10:33:04 +11:00
Simone Bordet 2f7f232d12 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-12 15:31:54 +01:00
Simone Bordet 9158115a82 Improved SPDY connector to take into account confidential and integral settings. 2012-03-12 15:31:23 +01:00
Simone Bordet 41874b5fbe Made the test portable between Jetty7 and Jetty8. 2012-03-12 15:30:26 +01:00
Greg Wilkins 9155ee46d0 373951: regexrewrite will apply URI for all non null rule returns, even if target has not changed 2012-03-12 23:59:23 +11:00
Greg Wilkins 67ce45928c added $Q handling to RewriteReqexRule 2012-03-12 12:25:24 +11:00