Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,318 Commits 73 Branches 465 Tags 359 MiB
Commit Graph

19318 Commits

Author SHA1 Message Date
Lachlan Roberts ccf4166ead Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-09-06 14:24:00 +10:00
Lachlan 74e560fb7a
Issue #4031 - stop unopened WebSocketSessions gracefully (#4046) 
* Issue #4031 - stop unopened WebSocketSessions gracefully

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

* Issue #4031 - notify onError if shutdown before open

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-09-06 13:50:33 +10:00
olivier lamy 2ebec27da4 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-06 13:29:21 +10:00
Olivier Lamy 39a3cd6b3c
force mergeUserSettings to true (#4051) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-09-06 13:28:32 +10:00
Joakim Erdfelt 648b97b70b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-05 13:08:14 -05:00
Joakim Erdfelt 4717a8e049
Merge pull request #4059 from eclipse/jetty-9.4.x-4057-response.containsHeader-npe 
Issue #4057 - NPE in HttpFields.containsKey
 2019-09-05 13:08:01 -05:00
Chris Walker f7a0156961
Merge 9.4.x 2019-09-05 13:20:19 -04:00
康智冬 3a6b26d292 fix typo (#4055) 
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
 2019-09-05 13:17:30 -04:00
Simone Bordet c288430f08 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-09-05 19:11:12 +02:00
Simone Bordet 638327d7e3 Updated JaCoCo to 0.8.4 to support (at least) Java 12. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-09-05 19:10:20 +02:00
Joakim Erdfelt 2b1fe8c38d Issue #4057 - Clean up identified by PR review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-05 12:04:23 -05:00
Joakim Erdfelt 91d3ddced6 Issue #4057 - NPE in HttpFields.containsKey 
+ Preventing HttpField from having a null name.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-05 10:04:25 -05:00
Chris Walker 189ba7a671
Merge from 9.4.x 2019-09-02 14:49:33 -04:00
康智冬 49ba6d1acb fix typo and grammar (#4045) 
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
 2019-09-02 14:29:50 -04:00
Joakim Erdfelt bb7eb4bc86 Adding some comments to URIUtilTest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-30 09:23:34 -05:00
Joakim Erdfelt ebc6a8e143 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java
 2019-08-29 07:24:16 -05:00
Joakim Erdfelt 25071c3e99
Merge pull request #4034 from eclipse/jetty-9.4.x-4033-uriutil-equalsignoreencodings 
Issue #4033 - Add Lenient percent decode in URIUtil
 2019-08-29 07:21:34 -05:00
Joakim Erdfelt 2fcb311c56 Issue #4033 - Addressing Lenient URIUtil decode behavior change in test 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 16:32:19 -05:00
Joakim Erdfelt 4e80748b3b Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
 2019-08-28 15:01:41 -05:00
Joakim Erdfelt 2b72f08f1b
Merge pull request #4019 from eclipse/jetty-9.4.x-155-jsr-websocket-client-ssl-init 
Issue #155 - Adding public ClientContainer(HttpClient) constructor
 2019-08-28 14:31:51 -05:00
Joakim Erdfelt 4829498eab Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java
#	jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java
#	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
#	jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletFactory.java
 2019-08-28 12:43:11 -05:00
Joakim Erdfelt bf3638daa4
Merge pull request #4026 from eclipse/jetty-9.4.x-4020-websocket-incompatibleclasschange 
Fixes #4020 - Revert ExtensionFactory change to interface.
 2019-08-28 12:37:44 -05:00
Joakim Erdfelt 37e7884382 Issue #4020 - Applying change requested from PR review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 12:36:07 -05:00
Joakim Erdfelt e56d91196d Issue #4020 - Adding JMX to BrowserDebugTool to test dump 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 12:31:33 -05:00
Joakim Erdfelt f47115c585 Issue #4033 - More tests for Lenient URIUtil behavior 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 12:20:52 -05:00
Joakim Erdfelt 7da57151ed Issue #4033 - lenient percent decode in URIUtil 
+ Allows for preserving decoded Strings like "X%YZ"

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 12:08:18 -05:00
Joakim Erdfelt 352dc10f1d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-28 10:43:33 -05:00
Joakim Erdfelt b2ea6a0861 Fixing Test Parameterization 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 10:43:15 -05:00
Jan Bartel 8e86eb480b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 12:32:06 +10:00
Jan Bartel 4251a3e092
Issue #4022 Prevent Servlet adding another Servlet (#4024) 
* Issue #4022  Prevent Servlet adding Servlet and added unit tests.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 12:29:14 +10:00
Joakim Erdfelt 2979ed5046 Fixes #4020 - Satisfy Container LifeCycle dumpable behaviors 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-27 20:25:10 -05:00
Jan Bartel 728c96f547 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 11:22:59 +10:00
Jan Bartel f4d95e0f2f Remove blank lines for NullSessionCacheTest 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 11:22:14 +10:00
Jan Bartel 758d5be6fa Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 11:12:20 +10:00
Jan Bartel 37712d75a2
Issue #4027 Ensure AbstractSessionDataStore started or throws exception. (#4028) 
* Issue #4027 Ensure AbstractSessionDataStore started or throws exception.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 11:08:42 +10:00
Jan Bartel 23c0bcaf89 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-28 11:05:53 +10:00
Jan Bartel a2fc9b113b Fix and enhance session invalidation tests. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 11:04:31 +10:00
Greg Wilkins 8f383faf78
Issue #3872 Javax Websocket Packaging (#3873) 
* Issue #3872 Javax Websocket Packaging

Moved JaxaxWebSocketConfiguration and SCI to config package.
Limited classpath exposure in JavaxConfiguration (more needed)
Updated tests with work around for those that needs more classes exposed

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3872 Javax Websocket Packaging

Moved all remaining classes from org.eclipse.jetty.websocket.javax.server
to org.eclipse.jetty.websocket.javax.server.internal.

This works when running on the classpath, but the tests fail when running
on the modulepath (eg in commandline mvn run).   The issue appears to be
that the tests don't load test classes from WEB-INF/lib or WEB-INF/classes.
Instead the test classes were themselves in  org.eclipse.jetty.websocket.javax.server,
which is no longer exported from module-info.java.

The hacked "fix" for this has been to create a org.eclipse.jetty.websocket.javax.server.tests
package which is exported and to move all the tests to that.  A better fix is needed.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3872 Javax Websocket Packaging

improve comments
tighten exposed classes more

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #3872 - fixing tests

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

* Issue #3872 - move ContainerDefaultConfigurator to config package

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

* Issue #3873 - fix javax websocket test classloader issues

move websocket endpoints for test webapps to com.acme.websocket package

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-28 10:03:46 +10:00
Joakim Erdfelt a6ab777150 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-http/src/test/java/org/eclipse/jetty/http/CookieCutterTest.java
#	jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
 2019-08-27 14:23:00 -05:00
Joakim Erdfelt eef2481b59 Adding cookie parsing test for excessive semicolon (reported as CVE in other projects) 2019-08-27 14:09:06 -05:00
Joakim Erdfelt 6bcfa2dc6e Fixes #4020 - Deprecate ExtensionFactory 
+ This class is removed in Jetty 10 anyway.
+ If all you want is to access available extension names
  then use the Factory.getAvailableExtensionNames() method
  (which exists in Jetty 10.0.0 as well)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-27 13:25:08 -05:00
Joakim Erdfelt 4d8e8050bd Fixes #4007 - using `user.home` system property instead of $HOME 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-27 08:48:02 -05:00
Greg Wilkins d1c462c966 fix checkstyle 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-27 19:06:32 +10:00
Greg Wilkins a09a8f94c6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-27 19:04:05 +10:00
Greg Wilkins 2564a08150 fix checkstyle 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-27 18:43:33 +10:00
Greg Wilkins 6038d75153 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-27 17:47:41 +10:00
Greg Wilkins 83463c2a23
Issue #3964 - Listener behavior cleanup (Jetty 9.4.x) (#3965) 
Issue #3964
* Avoid creating listener list for rarely used requestAttributeListener
* AbstractConnector keeps a specific list of HttpChannel.Listeners
to avoid Connection.Listeners and MBean listeners being added to
the HttpChannel listener list.
* Simplified listener handling by avoiding null connector, previously
only needed for testing.
* Fixed test that assumed HttpChannel listeners were not cleared by a recycle
* Separated out durable vs cyclic HttpChannel.Listeners, so as to
simplify handling.
* Deprecated cyclic HttpChannel.Listeners, as I'm not sure the channel is
the right place for them.
* Added improved method to combine multiple HttpChannel Listeners
into a single Listener.
* Fixed MockConnector
* Added benchmark
* Improved benchmark
* Updates from review
* Removed benchmark and alternate implementations.
* Updated javadoc
* Updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-27 17:38:20 +10:00
Greg Wilkins d890748f3a More merge fixes 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-27 16:19:07 +10:00
Greg Wilkins e05a14de24 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-27 14:30:29 +10:00
Greg Wilkins 1f189d4618 fixed test visibility for JPMS 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-27 14:30:03 +10:00