Commit Graph

3873 Commits

Author SHA1 Message Date
Jesse McConnell 3561bcbf40 set for dev 2012-03-08 21:53:24 -06:00
Jesse McConnell 246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Jesse McConnell fed765cf27 Updating VERSION.txt top section 2012-03-08 20:55:56 -06:00
Jesse McConnell ba5089cac1 Merge branch 'jetty-8' into release-8 2012-03-08 20:54:57 -06:00
Jesse McConnell 67f3f05d70 Updating VERSION.txt top section 2012-03-08 20:44:47 -06:00
Jesse McConnell ec7fc0313c Merge branch 'master' into release 2012-03-08 20:43:37 -06:00
Jesse McConnell 2e61650264 merge from master and adjust osgi bits 2012-03-08 20:32:20 -06:00
Jesse McConnell d3b6384c37 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-08 20:21:07 -06:00
Jesse McConnell aff3e3f285 removing some tests due to expired keystores 2012-03-08 20:20:43 -06:00
Jan Bartel b77ad34ef0 Fix versions in manifests, fix typo in jetty-osgi-default.xml, ensure Required-TldBundles are on the classpath.
Still doesn't work with version of jsp in jetty-7.6, as the jsp compiler cannot load the class org.glassfish.jsp.api.ResourceInjector, still trying to figure that out.
2012-03-09 11:40:52 +11:00
Jan Bartel c596add40c Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-09 11:28:41 +11:00
Jesse McConnell 6c81941142 [Bug 373567] cert validation issue with ocsp and crldp always being enabled when validating turned on fixed 2012-03-08 13:56:00 -06:00
Jesse McConnell e263d8d49e Merge branch 'master' into jetty-8 2012-03-08 12:52:21 -06:00
Jesse McConnell 8db57b56ba clean lingering bindings after each test to ensure that there is no cross test pollution 2012-03-08 12:49:46 -06:00
Simone Bordet 5716972c57 Merge branch 'master' into jetty-8 2012-03-08 16:17:12 +01:00
Simone Bordet 6d34d6fdc6 Fixed recursive flush(): a stack overflow was still possible because the invocation count was not correctly decreased. 2012-03-08 15:36:54 +01:00
Jesse McConnell 2086937a09 Merge branch 'master' into jetty-8 2012-03-08 05:35:14 -06:00
Simone Bordet c559383bb2 Fixed test refactoring common parts and always destroying the "env" subcontext at end of tests. 2012-03-08 12:16:51 +01:00
Simone Bordet 0ab47e41bc Fixed NPE in case user agent pattern does not match. 2012-03-08 11:42:14 +01:00
Simone Bordet c66f3d2a9d Removed @Override in interface methods to compile with JDK5. 2012-03-08 10:16:47 +01:00
Simone Bordet 182efa38fa Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-08 09:50:31 +01:00
Jan Bartel 5111a2c640 373603 NullPointer in WebServletAnnotation 2012-03-08 10:26:34 +11:00
Jesse McConnell 3442e79b38 updated gzipfilter and user agent filter to take excluded paths, excluded path patterns, and excluded agent patterns. The latter two take regular expressions in order to match paths and user agents, thanks travis 2012-03-07 17:21:38 -06:00
Jesse McConnell 381615f52d merge from master 2012-03-07 16:44:31 -06:00
Jesse McConnell 3134984bb2 disabling spdy tests on release and commenting out jetty maven plugin usage 2012-03-07 15:08:05 -06:00
Jesse McConnell 0284e5e9d5 make sure tests run with profile 2012-03-07 14:16:36 -06:00
Jesse McConnell 313475576b lock up spdy tests that rely on npn-boot codehaus artifact behind a profile for activation 2012-03-07 14:11:28 -06:00
Jesse McConnell 1e941cac32 Merge "373572: fix jdk7/macos ssl issue leading to ConnectHandlerSSLTest failures" 2012-03-07 13:12:57 -05:00
Thomas Becker 511f4ea957 373572: fix jdk7/macos ssl issue leading to ConnectHandlerSSLTest failures
Change-Id: I4056d686edffe073443bb40d6f0078d9aa7a7fa6
2012-03-07 19:09:29 +01:00
Thomas Becker 3c0c010690 373569: fix jdk7/macos ssl issue leading to SSLClostTest failures
Change-Id: I7af7e71581e1e56f308a5e1ca1f8e84fcbad7413
2012-03-07 18:58:12 +01:00
Simone Bordet c5c4425a0b Ignoring data frames after RST_STREAM. 2012-03-07 14:04:27 +01:00
Simone Bordet 8f37221b56 Updated v3 stream status codes. 2012-03-07 13:40:58 +01:00
Simone Bordet c67357f005 Fixed handling of unknown control frames. 2012-03-07 11:55:20 +01:00
Simone Bordet 156f138780 Introduced onException() callback in SessionFrameListener in case of processing exceptions.
Added test for unsupported SYN_STREAM versions.
2012-03-07 11:24:39 +01:00
Jan Bartel 9f3834038c Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-07 12:15:33 +11:00
Jan Bartel 3e13a26ccd Removing unnecessary stuff from poms and adding jetty-plus dep 2012-03-07 12:14:55 +11:00
Jesse McConnell 50d92ec8ef reset versions 2012-03-06 17:07:53 -06:00
Jesse McConnell 5416b93c7e Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-06 17:06:21 -06:00
Jesse McConnell f12e3c390c reset versions 2012-03-06 17:06:10 -06:00
Greg Wilkins 60a77e425a Merge "370842: X-Forwarded-Host header is now set by request.getHeader(Host) which doesn't ommit the port information" 2012-03-06 18:06:09 -05:00
Greg Wilkins c80dd726b9 Merge "Add additional AsyncContextTest.java test case with encoded path and queryString" 2012-03-06 15:54:49 -05:00
Thomas Becker ff75d9e38a 373394: fix for IllegalArgumentException in SelectChannelEndpoint.blockWritable() when wait is called with a negative value. 2012-03-06 21:26:46 +01:00
Simone Bordet ffdcfa5dde Avoid reading field twice (may lead to spurious NPEs). 2012-03-06 18:09:58 +01:00
Thomas Becker 99d2666b74 Add additional AsyncContextTest.java test case with encoded path and queryString
Change-Id: I8b592030fa6548ece7ebe56da1dc6f27d8b6f1e9
2012-03-06 11:36:29 +01:00
Jan Bartel 386249f504 373306 Set default user agent extraction pattern for UserAgentFilter 2012-03-06 13:17:25 +11:00
Greg Wilkins de8a1b3fe4 373272: maintain the start order of aggregate beans when adding a thread pool 2012-03-06 11:47:18 +11:00
Greg Wilkins 01ffa7cc48 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-06 10:58:30 +11:00
Greg Wilkins 62f36a7093 jdk-7 skip available tests for SSL 2012-03-06 10:58:13 +11:00
Jesse McConnell 3f88a6af41 this should force java 7 when trying to release 2012-03-05 16:08:25 -06:00