Commit Graph

13142 Commits

Author SHA1 Message Date
Greg Wilkins 94eeb726b2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-04 13:31:03 +10:00
Greg Wilkins 42b85308a7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-04 11:03:33 +10:00
Greg Wilkins 12804a16f5 Fixed git issue references 2016-08-04 11:02:39 +10:00
Jesse McConnell 7fb303a191 Merge branch 'jetty-9.4.x' 2016-08-03 17:01:26 -05:00
Jesse McConnell 847d377d32 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-03 17:00:46 -05:00
Jesse McConnell 4bf885cedd Issue #56 - address users issues with ldap login 2016-08-03 16:59:17 -05:00
Jan Bartel 9c5331fe3f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-03 19:28:42 +10:00
Jan Bartel 8f058d2b09 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-03 18:56:36 +10:00
Greg Wilkins e33b549c7f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-03 18:49:48 +10:00
Jan Bartel 4b920622d5 Issue #797 2016-08-03 18:33:53 +10:00
Greg Wilkins d0101dc81a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-03 18:01:42 +10:00
Greg Wilkins d57a11668d Issue #798 Sporadic async IO failure 2016-08-03 17:22:31 +10:00
Greg Wilkins a1885afff8 fix #804 by removing old javadoc reference to org.eclipse.jetty.util.URI.charset 2016-08-03 09:17:15 +10:00
Jesse McConnell a5a5098d90 Merge branch 'jetty-9.4.x' 2016-08-02 14:48:37 -05:00
Jesse McConnell 6108b9a234 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-02 14:48:14 -05:00
Jesse McConnell cdb00e81cb Merge pull request #803 from WalkerWatch/issues/802
Resolves #802
2016-08-02 14:47:52 -05:00
Jesse McConnell 131be3894b Merge pull request #800 from WalkerWatch/docupdate/JettyandMaven
Jetty and Maven updates.
2016-08-02 14:47:33 -05:00
WalkerWatch be54198b72 Resolves #802
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-02 12:48:50 -04:00
Greg Wilkins c07d383e5f Fixed comment in issue #782 2016-08-02 16:16:41 +10:00
Greg Wilkins 764307b9a7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-02 13:59:01 +10:00
Greg Wilkins a7a52e04c9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-02 13:58:15 +10:00
Greg Wilkins 83483e1f69 Response.reset does not clear session cookie #789
Added unit test
2016-08-02 13:49:05 +10:00
Greg Wilkins 53a1b8f995 OSGI MimeTypes resource #797
Pass MimeTypes.class as the classloader source.  
No unit test to confirm the fix.
2016-08-02 12:48:50 +10:00
WalkerWatch 271728ef7d Jetty and Maven updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-01 17:55:54 -04:00
Joakim Erdfelt 3ea5c29ea6 Fixes #749 - Invalid WebSocket Upgrade should result in error 400, not 405 2016-08-01 10:06:22 -07:00
Jesse McConnell c16ff0f49f Merge branch 'jetty-9.4.x' 2016-07-29 16:13:56 -05:00
Jesse McConnell 0ecc8caff6 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-29 16:13:38 -05:00
Jesse McConnell 6516ee1266 Merge pull request #791 from WalkerWatch/docupdates/Chapter22
Chapter 22 revisions and misc adoc updates.
2016-07-29 16:12:56 -05:00
WalkerWatch 5edc2a0bb3 Chapter 22 revisions and misc adoc updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-29 16:40:25 -04:00
Simone Bordet a2f4e98ec4 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-29 12:10:35 +02:00
Simone Bordet a38feda9a0 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-29 12:09:27 +02:00
Simone Bordet 2cdea3601b Fixes #790 - AsyncContentListener semantic broken with HTTP/2 transport.
Now using an IteratingCallback to buffer DATA frames and delivering
their content respecting AsyncContentListener semantic.
2016-07-29 12:08:55 +02:00
Greg Wilkins 4bbbde04ec Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-29 18:06:29 +10:00
Greg Wilkins 06a40e919a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-29 18:03:27 +10:00
Greg Wilkins e0a1a1988f Response.reset does not clear session cookie #789 2016-07-29 16:45:09 +10:00
Greg Wilkins ad93923e1d Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-07-29 16:43:04 +10:00
Greg Wilkins 23cb28e856 improved debug logging of request/response 2016-07-29 12:34:12 +10:00
Joakim Erdfelt 06fd770e27 Merge branch 'jetty-9.4.x' 2016-07-28 12:44:09 -07:00
Joakim Erdfelt 854c8a82bc Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-28 12:43:52 -07:00
Joakim Erdfelt a4601143ee Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-07-28 12:40:18 -07:00
Joakim Erdfelt 27a35ecd03 updating compact3 2016-07-28 12:21:20 -07:00
Joakim Erdfelt 2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Joakim Erdfelt 6fb03201f8 Adding permgen setting to java env 2016-07-28 12:11:43 -07:00
Joakim Erdfelt 428be69dc0 Adding Jenkinsfile for 9.2.x 2016-07-28 12:00:24 -07:00
Jesse McConnell 5b85eccee4 Merge branch 'jetty-9.4.x' 2016-07-28 12:20:23 -05:00
Jesse McConnell a2d37ad98d Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-28 12:20:08 -05:00
Jesse McConnell b45fbbfd04 Merge pull request #781 from WalkerWatch/docupdates/Chapter20
Chapter 20 cleanup.
2016-07-28 12:19:21 -05:00
Jesse McConnell 6655e7ab64 Merge pull request #779 from WalkerWatch/issues/761
Resolves #761
2016-07-28 12:18:53 -05:00
Greg Wilkins 7d4a509462 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-28 18:45:47 +10:00
Greg Wilkins a415e72e2d Fixed Debug NPE #754
Fixed the fix
2016-07-28 18:29:21 +10:00