Commit Graph

13827 Commits

Author SHA1 Message Date
Jan Bartel a1d85a2e1b Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-28 14:55:19 +11:00
Jan Bartel 96804627ee 480764 Suppress stacks in multipart filter tests 2016-10-28 14:54:40 +11:00
Jan Bartel 448a79cc6c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-28 14:42:05 +11:00
Jan Bartel da853574f6 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-28 14:41:37 +11:00
Jan Bartel 6f6ccdf061 480764 Add extra tests for empty multipart. 2016-10-28 14:41:05 +11:00
Greg Wilkins c2b075d13d Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-28 10:55:30 +11:00
Greg Wilkins eda0cff90a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-28 10:55:03 +11:00
Greg Wilkins 9f430ae7f7 Issue #1038 i
Handle resources as URIs
Avoid unneccessary trailing /
2016-10-28 10:50:39 +11:00
Joakim Erdfelt cdf447e34e Issue #1038 - making testcase more OS independent 2016-10-27 16:43:23 -07:00
Greg Wilkins 6e1994641b Issue #1038
Readded sorting of attributes by length
added .uri attributes
support WAR.path and WAR.uri in preference to WAR
updated for latest unit test
2016-10-28 10:31:22 +11:00
Joakim Erdfelt 2c6c7d86ba Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-10-27 16:17:34 -07:00
Joakim Erdfelt a00494fafb Issue #1038 - updating test case for AttributeNormalizer 2016-10-27 16:15:46 -07:00
Simone Bordet d00a0e9b44 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-27 17:11:58 +02:00
Simone Bordet 5eef2caa7f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-27 17:11:13 +02:00
Simone Bordet bda08ad9e3 Tests can throw any exception. 2016-10-27 17:10:34 +02:00
Simone Bordet 3bb240c584 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-27 16:55:47 +02:00
Simone Bordet c6ad87c3f9 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-27 16:55:12 +02:00
Simone Bordet 5ad8f2a777 Guarded against NPE if the channel is not associated with the stream. 2016-10-27 16:45:12 +02:00
Simone Bordet 8fef113372 Fixes #1046 - Improve HTTP2Flusher error report.
Now remembering the cause of the termination, and propagating it to
other components.
2016-10-27 15:43:41 +02:00
Simone Bordet 8cefaba2a4 Allow process() to throw Throwable, which we catch anyway. 2016-10-27 15:43:12 +02:00
Greg Wilkins 4d5ec6f186 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-27 16:36:23 +11:00
Greg Wilkins b17dafc2ad Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-27 16:34:44 +11:00
Greg Wilkins 0f7028e9fa Quickstart attribute normilazation #1038
Removed a lot of bad tests that incorrection assumed it was OK to mix Paths and URIs like:
jar:file:${jetty.base}/webapps/some.war!/some/path

refactored to keep PathAttributes and URIAttributes separate
2016-10-27 16:29:52 +11:00
Jan Bartel f6f649c8da Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-27 16:16:44 +11:00
Jan Bartel 90e4d162c8 Issue #907 2016-10-27 16:15:44 +11:00
Jan Bartel 1939a16fe8 Issue #1032
Fix nolog classifier
2016-10-27 11:10:03 +11:00
Joakim Erdfelt a250719979 Merge branch 'jetty-9.4.x' 2016-10-26 16:57:50 -07:00
Joakim Erdfelt 1075fc2df1 Fixing bad merge in apache-jsp/pom.xml 2016-10-26 16:57:24 -07:00
Joakim Erdfelt 9f66b552cd Merge branch 'jetty-9.4.x' 2016-10-26 16:42:59 -07:00
Joakim Erdfelt 55c6514a2e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-26 16:42:42 -07:00
Jan Bartel dadb86c831 Issue #1032
Make apache-jsp jar artifact without META-INF/services juli log
2016-10-27 10:37:35 +11:00
Joakim Erdfelt 7256d75e9c Issue #1038 - fixes for MS Windows 2016-10-26 16:09:12 -07:00
Joakim Erdfelt ca5e075ba0 Issue #1038 - treating ${WAR} as a URI always, not a Path
+ Still needs testing on MS Windows
2016-10-26 15:30:34 -07:00
Joakim Erdfelt ebc8983721 Issue #1038 - correcting "file:" and double "//" behavior 2016-10-26 14:25:20 -07:00
Joakim Erdfelt 1864b8f00b Merge pull request #1040 from WalkerWatch/issues/upgrading
Updates for upgrading guide.
2016-10-26 12:28:40 -07:00
WalkerWatch 2552f2300b Updates for upgrading guide.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-10-26 15:16:17 -04:00
Joakim Erdfelt 92aeea2d35 Merge branch 'jetty-9.4.x' 2016-10-26 12:08:02 -07:00
Joakim Erdfelt de1a973321 Test case throws declaration fix for Jetty 9.4+ 2016-10-26 12:07:49 -07:00
Joakim Erdfelt 5681abac5f Merge branch 'jetty-9.4.x' 2016-10-26 11:43:14 -07:00
Joakim Erdfelt a7ac269027 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-26 11:42:49 -07:00
Joakim Erdfelt 41cd3bd090 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-10-26 10:31:45 -07:00
Joakim Erdfelt c4a8e684c8 Fixes #1039 - AttributeNormalizer should not track null paths 2016-10-26 10:31:12 -07:00
Joakim Erdfelt 7328742ae5 Fixes #1038 - ${WAR} should be favored over other attributes, like ${jetty.base} 2016-10-26 10:23:58 -07:00
Greg Wilkins e6bca1f41a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-26 20:41:02 +11:00
Greg Wilkins 714d29db76 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 20:39:29 +11:00
Greg Wilkins 7f7021315d fixed bad revert 2016-10-26 20:39:04 +11:00
Greg Wilkins ad7c3e0a7c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-26 20:34:20 +11:00
Greg Wilkins f4e6162b98 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 20:32:18 +11:00
Greg Wilkins 812272c658 Revert "Adding jdk9 profile"
This reverts commit 1151964d74.
2016-10-26 20:31:42 +11:00
Simone Bordet cc4d046b85 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-26 11:13:30 +02:00