Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-19 21:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,251 Commits 79 Branches 466 Tags
Commit Graph

19251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan Bartel
9534940578 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-26 15:55:08 +10:00
Jan Bartel
0f8230c05b
Issue #3936 Provide write-through modes for the NullSessionCache (#3984) 
* Issue #3936 Provide write-through modes for the NullSessionCache

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-26 15:22:20 +10:00
Joakim Erdfelt
36ef975353 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-http/src/main/java/org/eclipse/jetty/http/CookieCutter.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/CookieCutterTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
 2019-08-23 08:52:52 -05:00
Joakim Erdfelt
89d7469806 Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2019-08-23 07:41:48 -05:00
Joakim Erdfelt
1867d24ef7
Merge pull request #4001 from eclipse/jetty-9.4.x-4000-swedish-unicode-file-serving 
Issue #4000 - new SameFileAliasChecker to help with NFC/NFD UTF-8 differences
 2019-08-23 07:27:32 -05:00
Joakim Erdfelt
f15ca7765e
Merge pull request #3994 from eclipse/jetty-9.4.x-3985-cookie-parsing 
Fixes #3985 - Updates to CookieCutter to reject no-equal cookies
 2019-08-23 07:27:23 -05:00
olivier lamy
cf592469aa checkstyle fixes. 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-23 13:09:15 +10:00
olivier lamy
80d513e979 junit failure after bad merge 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-23 10:56:24 +10:00
Joakim Erdfelt
9e6b24e916 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-22 17:04:22 -05:00
Joakim Erdfelt
12e1473fd0 Adding reference to javax.websocket issue 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-22 17:04:01 -05:00
Joakim Erdfelt
6aaf22ec6c Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-22 17:02:19 -05:00
Joakim Erdfelt
45dfd14cd5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-22 16:45:25 -05:00
Joakim Erdfelt
5bcbe0f9d9 Adding javax.websocket secure client example 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-22 16:45:04 -05:00
olivier lamy
e1656aecc7 fix compilation 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-23 06:58:54 +10:00
Joakim Erdfelt
ceff82ac57 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-22 15:09:44 -05:00
Joakim Erdfelt
d0ec6e7d07
Merge pull request #3995 from eclipse/jetty-9.4.x-3983-jarfileresource-list 
Fixes #3983 - JarFileResource directory listing is invalid
 2019-08-22 15:09:16 -05:00
Joakim Erdfelt
318045cd87 Issue #3985 - Applying PR Review to CookieCutter 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-22 12:46:23 -05:00
Joakim Erdfelt
e7765ab576
Merge pull request #4015 from akurtakov/jetty-9.4.x 
Update Tycho and Eclipse CBI plugins.
 2019-08-22 08:52:19 -05:00
Alexander Kurtakov
7f5aa89042 Update Tycho and Eclipse CBI plugins. 
* Tycho to 1.4.0
* CBI to 1.1.7

These updates are important for both speed and m2e compatibility so
warnings are not shown in the eclipse ide.

Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
 2019-08-22 16:06:06 +03:00
olivier lamy
595e058fa3 touch to test github/jenkins 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-22 20:53:46 +10:00
olivier lamy
2cbdb27e5b touch to test github/jenkins 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-22 20:51:34 +10:00
olivier lamy
a36af67abf Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-22 20:45:57 +10:00
Olivier Lamy
fe3d3f7158
fix checkstyle in test sources (#4013) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-22 19:56:41 +10:00
Joakim Erdfelt
88e37b177c Issue #4000 - Name change to isSameName 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-21 17:11:44 -05:00
Simone Bordet
1a0f08b84d Improve test performance. 
Running with the LEGACY compliance will take ~10 minutes for this test.
Running with the RFC7578 compliance will take ~1 min 45 secs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-21 21:13:13 +02:00
Joakim Erdfelt
c1c241349e Issue #3985 - Applying PR Review to CookieCutter 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-21 12:54:26 -05:00
Joakim Erdfelt
4ab0be9b1b Issue #3983 - Applying PR review to JarFileResource 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-21 12:43:25 -05:00
Joakim Erdfelt
30bd3914cf Issue #4000 - SameFileAliasChecker to help with NFD/NFC 
+ Adding SameFileAliasChecker to help with environments
  where the Alias and the Path point to the same file,
  by relying on the FileSystem and Path implementation
  to make the determination if the two Path references
  truly point to the same file.
+ Minor cleanup of FileSystemResourceTest
+ Additional DefaultServletTest for this UTF-8 differences

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-21 12:21:04 -05:00
Greg Wilkins
d04c5f1e2a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-20 16:23:09 +10:00
Bruce
a1bb3b4491 fix formatting and change comment flags to attributes 
Signed-off-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2019-08-20 15:12:03 +10:00
Bruce
6ad148c8f9 parse samesite from cookie comment flag utility functions 
Signed-off-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2019-08-20 15:12:03 +10:00
Bruce
2e5f6fca4b parse SameSite specifier from cookie comment and move HttpOnly comment parsing to org.eclipse.jetty.http.HttpCookie 
Signed-off-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2019-08-20 15:12:03 +10:00
Bruce
7c691acbbe use null instead of EXCLUDED to indicate no SameSite attribute should be sent 
Signed-off-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2019-08-20 15:12:03 +10:00
Bruce
216f71469b Issue #3040 - Allow RFC6265 Cookies to include optional SameSite attribute 
Signed-off-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2019-08-20 15:12:03 +10:00
Lachlan Roberts
eabae232e5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-20 12:59:31 +10:00
Lachlan
44986be6c0
fix flaky test ClientCloseTest.testStopLifecycle() in jetty 9.4.x (#3990) 
* fix flaky test ClientCloseTest.testStopLifecycle() in 9.4.x

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* test code cleanups in ClientCloseTest

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-20 12:49:52 +10:00
Joakim Erdfelt
ef3f696a11 Issue #4000 - PathResource alias detection work around alt UTF-8 style 
+ OSX File is `swedish-å.txt`
+ OSX has NFD form UTF-8 characters. `swedish-a%CC%8A.txt`
+ HTTP uses normal form UTF-8. `swedish-%C3%A5.txt`
+ A HTTP GET request should work against the resource
  being requested, regardless of UTF-8 style used.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-19 13:52:22 -05:00
Joakim Erdfelt
407b564320 Issue #4000 - adding unit test for raw Resource access for unicode file. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-19 12:52:43 -05:00
olivier lamy
6f2a93d614 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-19 13:12:10 +10:00
Olivier Lamy
95f7fddc59
ServletContext#setSessionTrackingModes must throw IAE if SSL and another mode (#3976) 
* according to Javadoc and failing tck tests
ServletContext#setSessionTrackingModes
IllegalArgumentException - if sessionTrackingModes specifies a combination of SessionTrackingMode.SSL with a session tracking mode other than SessionTrackingMode.SSL

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* test adding only SSL

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fixes from Jan review

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix package order

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-19 12:54:05 +10:00
olivier lamy
4db5b38956 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-19 10:09:32 +10:00
Olivier Lamy
7c0266af4c
this is not supposed to return null (#3998) 
see https://javaee.github.io/javaee-spec/javadocs/javax/servlet/http/Part.html#getHeaders-java.lang.String-
this fix related tck test

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-19 10:08:21 +10:00
Greg Wilkins
9fce1e8512
Merge pull request #3993 from barabadzhi/patch-1 
Add WebAssembly MIME type support
 2019-08-19 08:09:48 +10:00
Bogdan Arabadzhi
f14abdd600 Add WebAssembly MIME type support 
Signed-off-by: Bogdan Arabadzhi <bogdan.today@gmail.com>
 2019-08-17 12:02:03 +02:00
Joakim Erdfelt
1254f6eb67 Issue #3985 - Fixing RequestTest 
+ Moving overly bad cookie to CookieCutter_LenientTest
+ Changing expectation in RequestTest.testCookie()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-16 15:57:26 -05:00
Joakim Erdfelt
472ede48cd Issue #3983 - JarFileResource directory listing is invalid 
+ Correcting encoded path searching
+ Adding more unit tests to ensure no regression

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-16 15:48:42 -05:00
Joakim Erdfelt
f65e59cadf Issue #3983 - Modernizing JarResourceTest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-16 15:13:53 -05:00
Joakim Erdfelt
fba010d33d Issue #3985 - Updates to CookieCutter to reject no-equal cookies 
* If a cookie has no value it is rejected and not stored.
  - `name` is rejected
  - `name=` is accepted, with empty value

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-16 13:11:40 -05:00
Joakim Erdfelt
eaf2263053 Issue #3985 - Testcase for CookieCutter parsing issue of bad cookie 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-15 17:58:53 -05:00
Chris Walker
5c5cefcd62 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-15 10:56:15 -04:00