Commit Graph

20641 Commits

Author SHA1 Message Date
olivier lamy 7e03bb250e Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-04-10 18:46:25 +10:00
Jesse McConnell 8db111f833
Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-04-09 10:33:26 -05:00
Jesse McConnell c512f41488
set render styles 2020-04-09 10:32:25 -05:00
Jesse McConnell 0db9210f17
update to released web resources artifact 2020-04-09 10:31:38 -05:00
Joakim Erdfelt 4d9d98c2b5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-04-08 16:15:57 -05:00
Jan Bartel bfc9738f86
Issue #4760 Response.setLocale should override previous (#4761)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-08 17:28:14 +02:00
Joakim Erdfelt 10ddb6e673
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2020-04-08 10:14:21 -05:00
Joakim Erdfelt b9a9511914
Merge pull request #4748 from eclipse/jetty-9.4.x-4745-centralized-webapp-logging-doc
Issue #4745 - update documentation for centralized-webapp-logging
2020-04-08 10:14:12 -05:00
Michael Mayer 9079fa63b3
Improve keystore exception message when keystore is not valid (#4759)
Signed-off-by: Michael Mayer <michael@schnittstabil.de>
2020-04-08 10:13:10 -05:00
Michael Mayer a640701d78
Improve keystore exception message when keystore is not valid (#4759)
Signed-off-by: Michael Mayer <michael@schnittstabil.de>
2020-04-08 15:36:52 +02:00
Jan Bartel 3981ec1342 Issue #4758 Fix doc for DefaultServlet.welcomeServlets
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-08 12:27:43 +02:00
Jan Bartel efe2dc1e90
Issue #4752 Call HttpSessionListener.sessionCreated in add order. (#4753)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-08 11:16:20 +02:00
olivier lamy 147770b5f0 fix test due to package change
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-08 10:37:30 +10:00
Joakim Erdfelt 5f6053e4d6
Merge pull request #4706 from eclipse/jetty-10.0.x-restore-owb-hack
Fixing OpenWebBeans test on Jetty 10.0.x
2020-04-07 10:28:18 -05:00
Joakim Erdfelt 08df1d9f73
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-restore-owb-hack 2020-04-07 09:44:07 -05:00
Simone Bordet e1be62c978 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-04-07 14:54:09 +02:00
Simone Bordet 103c22dc43
Merge pull request #4754 from eclipse/jetty-9.4.x-4751-refresh_networktraffic_classes
Fixes #4751 - Refresh NetworkTraffic* classes.
2020-04-07 14:29:17 +02:00
olivier lamy 3fb15f8b2a fix servlet api dependency
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-07 20:23:12 +10:00
Simone Bordet 7ef05860ee Fixes #4751 - Refresh NetworkTraffic* classes.
Added missing license header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-07 12:19:49 +02:00
Simone Bordet 4e3c0c8cd7 Fixes #4751 - Refresh NetworkTraffic* classes.
Introduced NetworkTrafficSocketChannelEndPoint to replace
NetworkTrafficSelectChannelEndPoint, now deprecated.

Code and javadocs cleanup.

Moved the tests to jetty-client so that also the client is tested.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-07 12:04:24 +02:00
olivier lamy 28335133a1 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-07 14:43:52 +10:00
olivier lamy e0606ac0c7 fix artifact
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-07 12:26:33 +10:00
olivier lamy 3483e0c2f7 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-04-07 11:39:31 +10:00
olivier lamy a189d13fd5 cleanup
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-07 10:59:50 +10:00
olivier lamy be50caf591 Issue #4690 Allow DistributionTester to work with log files
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-07 10:59:50 +10:00
Jan Bartel 72ad3709c6 Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-04-06 14:32:15 +02:00
Jan Bartel f57a170e99 Fix merge from 9.4 for #4737 2020-04-06 14:30:38 +02:00
Simone Bordet ba2fe58111 Improvements to the Jetty client documentation, fixed section ids and xrefs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-06 13:31:34 +02:00
Simone Bordet e0cf316f72 Improvements to the Jetty client documentation, HTTP/2 section.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-06 12:37:27 +02:00
Jan Bartel d94a1bfdac Fix test after merge for #4739 2020-04-06 12:30:34 +02:00
Jan Bartel 4265b1f467 Update test-jetty-osgi README.txt 2020-04-06 11:43:54 +02:00
Jan Bartel 3e2f27c197
Issue #4683 Fix jetty-slf4j-impl for osgi (#4684)
* Issue #4683 Fix jetty-slf4j-impl for osgi

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-06 11:35:57 +02:00
Jan Bartel e00560c36d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-04-06 11:33:45 +02:00
Jan Bartel 8eb4bb98a4
@RunAs not honoured (#4743)
* Issue #4739 Fix @RunAs

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-06 11:33:09 +02:00
Jan Bartel d0389ed328 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-04-06 11:31:10 +02:00
Jan Bartel 4b2842265a
Issue #4737 Ensure lifecycle callbacks happen for run-as and non async servlets (#4744)
* Issue #4737 Ensure lifecycle callbacks happen for run-as and non async servlets

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-06 11:30:33 +02:00
Jan Bartel 9726bb88ff Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-04-06 10:58:44 +02:00
Jan Bartel cf0e3c530f
Issue #4662 Ensure contextDestroyed called after filters and servlets destroyed (#4667)
* Issue #4662 Ensure contextDestroyed called after filters and servlets destroyed

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-06 10:12:19 +02:00
Simone Bordet 172063d5ae Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-04-04 11:54:17 +02:00
Simone Bordet 6e0b5f387b Improvements to the Jetty client documentation, connection pool section.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-04 11:50:48 +02:00
Simone Bordet f79b5aa507
Merge pull request #4738 from eclipse/jetty-9.4.x-4735-env_variables_fcgi
Fixes #4735 - Get env variables in PHP scripts served through FastCGI…
2020-04-04 11:08:02 +02:00
Joakim Erdfelt 8f4de31d37
Issue #4745 - update documentation for centralized-webapp-logging
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-04-03 16:54:24 -05:00
Simone Bordet 51c42f2849 Improvements to the Jetty client documentation, protocols section.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-03 15:48:54 +02:00
Simone Bordet eaf9d43a0b Improvements to the Jetty client documentation, proxy section.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-03 15:48:54 +02:00
Simone Bordet 9f38e433d4 Improvements to the Jetty client documentation, authentication section.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-03 15:48:54 +02:00
Simone Bordet 512f31b3af Improvements to the Jetty client documentation, cookies section.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-03 15:48:54 +02:00
Joakim Erdfelt 9b57fcd8ee
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc
2020-04-02 07:13:32 -05:00
Joakim Erdfelt 1cbb8d0232
Merge pull request #4740 from eclipse/jetty-9.4.x-4638-formcontentsize-doc
Issue #4638 - updating documentation about form limits
2020-04-02 07:03:54 -05:00
Joakim Erdfelt b070c08ad7
Merge pull request #4734 from eclipse/jetty-9.4.x-4529-servlet-in-errorpage
Issue #4529 - Fixing HTML error page from showing servlet info if configured not to do so
2020-04-02 07:03:37 -05:00
olivier lamy a22f2475e3 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-04-02 12:40:18 +10:00