Simone Bordet
51123c7cd1
Fixes #7369 - Document CustomRequestLog
...
Added documentation to the programming guide.
Removed related old documentation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-01-12 17:12:01 +01:00
Simone Bordet
251649f0a9
Generate plantuml images in the images/ directory.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-01-12 15:52:00 +01:00
Simone Bordet
d055c1c524
Changed URLs from adoptopenjdk.net to adoptium.net.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-01-12 15:14:31 +01:00
Simone Bordet
b51465f91a
Fixes #7369 - Document CustomRequestLog ( #7370 )
...
* Fixes #7369 - Document CustomRequestLog
Introduced `JavadocIncludeExtension` to include javadoc snippets in the documentation.
Added documentation about request logging.
Updated `CustomRequestLog` javadocs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-01-12 10:27:53 +01:00
Simone Bordet
95f5773cb8
Fixed typo.
2022-01-11 16:41:34 +01:00
lujiefsi
ff10c26332
fix resource leak ( #7361 )
...
Fix resource leaks
2022-01-10 10:56:22 +01:00
dependabot[bot]
29ede20341
Bump jnr-ffi from 2.2.10 to 2.2.11
...
Bumps [jnr-ffi](https://github.com/jnr/jnr-ffi ) from 2.2.10 to 2.2.11.
- [Release notes](https://github.com/jnr/jnr-ffi/releases )
- [Commits](https://github.com/jnr/jnr-ffi/compare/jnr-ffi-2.2.10...jnr-ffi-2.2.11 )
---
updated-dependencies:
- dependency-name: com.github.jnr:jnr-ffi
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-07 09:22:48 +00:00
Joakim Erdfelt
1984d2de11
Issue #7277 - Allow `Request.getLocalName()` and `.getLocalPort()` to be overridden ( #7357 )
...
* Issue #7277 - Allow `Request.getLocalName()` and `.getLocalPort()` to be overridden (#7316 )
* Introduce `HttpConfiguration.setServerAuthority(HostPort)`
to influence `ServletRequest.getServerName()` and `ServletRequest.getServerPort()`
* Introduce `HttpConfiguration.setLocalAddress(SocketAddress)`
to influence `ServletRequest.getLocalName()`, `ServletRequest.getLocalPort()`, and `ServletRequest.getLocalAddr()`
* Correcting Request URI logic on abs-uri without authority
* Adding test cases
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-06 08:01:08 -06:00
Simone Bordet
3042f2b2bf
Fixes #7348 - Slow CONNECT request causes NPE ( #7349 ) ( #7352 )
...
* Fixes #7348 - Slow CONNECT request causes NPE (#7349 )
Added NPE guard in `HttpReceiverOverHTTP.onUpgradeFrom()`.
Expanded logic in `HttpReceiverOverHTTP.parse()` to return true in case of CONNECT + 200.
Fixed `ProxyConnection.toConnectionString()` to avoid NPEs.
Fixed `HttpClientTest.testCONNECTWithHTTP10()` logic
after changes to fix this issue.
Now a tunneled connection is not put back into the connection pool,
and if applications explicitly want to use it, they must re-enable
fill interest, similarly to what should be done after upgrade+101.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 5eb7b70df7
)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-01-06 11:08:12 +01:00
dependabot[bot]
3e7a3bac89
Bump spotbugs-maven-plugin from 4.5.2.0 to 4.5.3.0
...
Bumps [spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin ) from 4.5.2.0 to 4.5.3.0.
- [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases )
- [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.5.2.0...spotbugs-maven-plugin-4.5.3.0 )
---
updated-dependencies:
- dependency-name: com.github.spotbugs:spotbugs-maven-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-01-06 09:22:54 +00:00
Joakim Erdfelt
13956b27e2
Issue #7297 - Removing log4j 1.x ( #7353 )
...
* Issue #7297 - Removing log4j 1.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #7297 - Deprecating log4j 1.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-05 12:26:05 -06:00
Joakim Erdfelt
45fc93aec1
Issue #7354 - Do not add demo jars to jetty-home ( #7355 )
...
* Issue #7354 - Do not add demo jars to jetty-home
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #7254 - Do not add lib/ext directory to jetty-home
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-05 10:33:26 -06:00
Jan Bartel
5aa598efd5
Issue #7313 Add AttributeContainerMap as bean to server for all constructors. ( #7317 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2022-01-04 14:10:58 +11:00
dependabot[bot]
6de526e808
Bump maven-scm-provider-jgit from 1.10.0 to 1.12.2 ( #7347 )
...
Bumps maven-scm-provider-jgit from 1.10.0 to 1.12.2.
---
updated-dependencies:
- dependency-name: org.apache.maven.scm:maven-scm-provider-jgit
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-03 10:11:34 -06:00
Simone Bordet
528ac643ac
Issue #7299 - Enabling the logging-logback module prevents eclipse re… ( #7335 )
...
* Issue #7299 - Enabling the logging-logback module prevents eclipse remote debugging.
Added documentation as discussed in the issue.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-01-03 10:47:43 +01:00
dependabot[bot]
ce6e495c34
Merge pull request #7345 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-deploy-plugin-3.0.0-M2
2021-12-31 18:31:19 +00:00
dependabot[bot]
074b6d136b
Bump maven-deploy-plugin from 3.0.0-M1 to 3.0.0-M2
...
Bumps [maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin ) from 3.0.0-M1 to 3.0.0-M2.
- [Release notes](https://github.com/apache/maven-deploy-plugin/releases )
- [Commits](https://github.com/apache/maven-deploy-plugin/compare/maven-deploy-plugin-3.0.0-M1...maven-deploy-plugin-3.0.0-M2 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-deploy-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-31 09:19:31 +00:00
dependabot[bot]
f69c479d19
Merge pull request #7339 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.maven.plugins-maven-site-plugin-3.10.0
2021-12-29 21:45:21 +00:00
dependabot[bot]
c4785743af
Bump maven-site-plugin from 3.9.1 to 3.10.0
...
Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin ) from 3.9.1 to 3.10.0.
- [Release notes](https://github.com/apache/maven-site-plugin/releases )
- [Commits](https://github.com/apache/maven-site-plugin/compare/maven-site-plugin-3.9.1...maven-site-plugin-3.10.0 )
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-site-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-29 20:12:43 +00:00
dependabot[bot]
dd642415c7
Bump log4j-api from 2.17.0 to 2.17.1 ( #7343 )
...
Bumps log4j-api from 2.17.0 to 2.17.1.
---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-29 06:54:34 -06:00
dependabot[bot]
7d04f2964b
Bump checkstyle from 9.2 to 9.2.1 ( #7340 )
...
Bumps [checkstyle](https://github.com/checkstyle/checkstyle ) from 9.2 to 9.2.1.
- [Release notes](https://github.com/checkstyle/checkstyle/releases )
- [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-9.2...checkstyle-9.2.1 )
---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-29 06:53:40 -06:00
Joakim Erdfelt
3c02a03a38
Issue #6973 - Setup Request/Response objects for success with RequestLog ( #7183 )
...
* Issue #6973 - Setup Request/Response objects for success with RequestLog
+ Prevents reading of Request body parameters
+ Still allows raw Request.getInputStream() and
Request.getReader() usage
+ Restores committed response status code.
+ Does not rest committed response headers.
+ Adding testcase for post-commit response header
issue. (currently disabled)
+ Remove Request.onRequestLog()
+ Move requestlog calling from HttpChannel to Request.onCompleted
+ address scenario where HttpChannel is null
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-12-28 20:11:52 -06:00
dependabot[bot]
95804b80c8
Bump jmh.version from 1.33 to 1.34 ( #7337 )
...
Bumps `jmh.version` from 1.33 to 1.34.
Updates `jmh-core` from 1.33 to 1.34
Updates `jmh-generator-annprocess` from 1.33 to 1.34
---
updated-dependencies:
- dependency-name: org.openjdk.jmh:jmh-core
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.openjdk.jmh:jmh-generator-annprocess
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-26 08:35:21 -06:00
dependabot[bot]
5ba8947f57
Merge pull request #7334 from eclipse/dependabot/maven/jetty-10.0.x/ch.qos.logback-logback-core-1.3.0-alpha12
2021-12-23 22:07:08 +00:00
dependabot[bot]
40fe015546
Merge pull request #7330 from eclipse/dependabot/maven/jetty-10.0.x/maven.resolver.version-1.7.3
2021-12-23 22:04:27 +00:00
dependabot[bot]
a98b3e8efa
Bump logback-core from 1.3.0-alpha11 to 1.3.0-alpha12
...
Bumps [logback-core](https://github.com/qos-ch/logback ) from 1.3.0-alpha11 to 1.3.0-alpha12.
- [Release notes](https://github.com/qos-ch/logback/releases )
- [Commits](https://github.com/qos-ch/logback/compare/v_1.3.0-alpha11...v_1.3.0-alpha12 )
---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-23 20:33:52 +00:00
dependabot[bot]
11e85b2993
Bump maven.resolver.version from 1.7.2 to 1.7.3
...
Bumps `maven.resolver.version` from 1.7.2 to 1.7.3.
Updates `maven-resolver-util` from 1.7.2 to 1.7.3
- [Release notes](https://github.com/apache/maven-resolver/releases )
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.7.2...maven-resolver-1.7.3 )
Updates `maven-resolver-api` from 1.7.2 to 1.7.3
- [Release notes](https://github.com/apache/maven-resolver/releases )
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.7.2...maven-resolver-1.7.3 )
Updates `maven-resolver-spi` from 1.7.2 to 1.7.3
- [Release notes](https://github.com/apache/maven-resolver/releases )
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.7.2...maven-resolver-1.7.3 )
Updates `maven-resolver-connector-basic` from 1.7.2 to 1.7.3
- [Release notes](https://github.com/apache/maven-resolver/releases )
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.7.2...maven-resolver-1.7.3 )
Updates `maven-resolver-transport-file` from 1.7.2 to 1.7.3
- [Release notes](https://github.com/apache/maven-resolver/releases )
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.7.2...maven-resolver-1.7.3 )
Updates `maven-resolver-transport-http` from 1.7.2 to 1.7.3
- [Release notes](https://github.com/apache/maven-resolver/releases )
- [Commits](https://github.com/apache/maven-resolver/compare/maven-resolver-1.7.2...maven-resolver-1.7.3 )
---
updated-dependencies:
- dependency-name: org.apache.maven.resolver:maven-resolver-util
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-api
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-spi
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-connector-basic
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-transport-file
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.apache.maven.resolver:maven-resolver-transport-http
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-23 20:31:30 +00:00
dependabot[bot]
acd9189cba
Merge pull request #7333 from eclipse/dependabot/maven/jetty-10.0.x/org.codehaus.plexus-plexus-component-annotations-2.1.1
2021-12-23 20:28:05 +00:00
dependabot[bot]
02b8a5be9e
Bump plexus-component-annotations from 2.1.0 to 2.1.1
...
Bumps [plexus-component-annotations](https://github.com/codehaus-plexus/plexus-containers ) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/codehaus-plexus/plexus-containers/releases )
- [Changelog](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md )
- [Commits](https://github.com/codehaus-plexus/plexus-containers/compare/plexus-containers-2.1.0...plexus-containers-2.1.1 )
---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-component-annotations
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-23 09:24:57 +00:00
Joakim Erdfelt
532e63b523
Issue #7327 - Add missing entries to jetty-bom ( #7328 )
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-12-22 15:15:00 -06:00
dependabot[bot]
d4cb7220a3
Merge pull request #7325 from eclipse/dependabot/maven/jetty-10.0.x/com.github.spotbugs-spotbugs-maven-plugin-4.5.2.0
2021-12-22 21:09:14 +00:00
dependabot[bot]
6a4fcc5d52
Bump hawtio-default from 2.14.2 to 2.14.3 ( #7309 )
...
Bumps [hawtio-default](https://github.com/hawtio/hawtio ) from 2.14.2 to 2.14.3.
- [Release notes](https://github.com/hawtio/hawtio/releases )
- [Changelog](https://github.com/hawtio/hawtio/blob/master/CHANGES.md )
- [Commits](https://github.com/hawtio/hawtio/compare/hawtio-2.14.2...hawtio-2.14.3 )
---
updated-dependencies:
- dependency-name: io.hawt:hawtio-default
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-22 07:59:10 -06:00
dependabot[bot]
d5f0eea227
Bump spotbugs-maven-plugin from 4.5.0.0 to 4.5.2.0
...
Bumps [spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin ) from 4.5.0.0 to 4.5.2.0.
- [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases )
- [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.5.0.0...spotbugs-maven-plugin-4.5.2.0 )
---
updated-dependencies:
- dependency-name: com.github.spotbugs:spotbugs-maven-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-22 11:47:26 +00:00
dependabot[bot]
282ed26221
Merge pull request #7322 from eclipse/dependabot/maven/jetty-10.0.x/hazelcast.version-4.2.4
2021-12-22 11:46:23 +00:00
dependabot[bot]
4887e6f0db
Merge pull request #7323 from eclipse/dependabot/maven/jetty-10.0.x/io.grpc-grpc-core-1.43.1
2021-12-22 11:46:04 +00:00
dependabot[bot]
f44ba02a5a
Bump grpc-core from 1.43.0 to 1.43.1
...
Bumps [grpc-core](https://github.com/grpc/grpc-java ) from 1.43.0 to 1.43.1.
- [Release notes](https://github.com/grpc/grpc-java/releases )
- [Commits](https://github.com/grpc/grpc-java/compare/v1.43.0...v1.43.1 )
---
updated-dependencies:
- dependency-name: io.grpc:grpc-core
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-21 20:26:35 +00:00
dependabot[bot]
5dfd2b9109
Merge pull request #7310 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.logging.log4j-log4j-api-2.17.0
2021-12-21 20:24:22 +00:00
dependabot[bot]
048da0d010
Merge pull request #7306 from eclipse/dependabot/maven/jetty-10.0.x/openwebbeans.version-2.0.25
2021-12-21 20:24:03 +00:00
dependabot[bot]
91dba8b4c2
Merge pull request #7303 from eclipse/dependabot/maven/org.apache.logging.log4j-log4j-api-2.17.0
2021-12-21 20:23:32 +00:00
dependabot[bot]
bafa83aa5c
Bump hazelcast.version from 4.2.3 to 4.2.4
...
Bumps `hazelcast.version` from 4.2.3 to 4.2.4.
Updates `hazelcast` from 4.2.3 to 4.2.4
- [Release notes](https://github.com/hazelcast/hazelcast/releases )
- [Commits](https://github.com/hazelcast/hazelcast/compare/v4.2.3...v4.2.4 )
Updates `hazelcast-all` from 4.2.3 to 4.2.4
---
updated-dependencies:
- dependency-name: com.hazelcast:hazelcast
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: com.hazelcast:hazelcast-all
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-21 12:52:13 +00:00
dependabot[bot]
dd76880489
Bump log4j-api from 2.16.0 to 2.17.0
...
Bumps log4j-api from 2.16.0 to 2.17.0.
---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-20 09:22:19 +00:00
dependabot[bot]
90bb17d86d
Bump openwebbeans.version from 2.0.24 to 2.0.25
...
Bumps `openwebbeans.version` from 2.0.24 to 2.0.25.
Updates `openwebbeans-web` from 2.0.24 to 2.0.25
- [Release notes](https://github.com/apache/openwebbeans/releases )
- [Commits](https://github.com/apache/openwebbeans/commits )
Updates `openwebbeans-jetty9` from 2.0.24 to 2.0.25
- [Release notes](https://github.com/apache/openwebbeans/releases )
- [Commits](https://github.com/apache/openwebbeans/commits )
---
updated-dependencies:
- dependency-name: org.apache.openwebbeans:openwebbeans-web
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.apache.openwebbeans:openwebbeans-jetty9
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-12-20 09:19:55 +00:00
Simone Bordet
b385cf930e
Issue #6728 - QUIC and HTTP/3
...
Fixed HTTP/3 POM files.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 10:10:05 +01:00
Simone Bordet
10c2ffb996
Issue #6728 - QUIC and HTTP/3
...
Documentation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 09:33:38 +01:00
Simone Bordet
0236b7ebd8
Issue #6728 - QUIC and HTTP/3
...
Fixed test by approving licenses in DistributionTests.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 09:33:38 +01:00
Simone Bordet
7811f40c67
Issue #6728 - QUIC and HTTP/3
...
Split the http3 module, introducing the jna and quiche modules with their versions and licenses.
Updated project to reference the new groupId of the quiche binaries.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 09:33:38 +01:00
Simone Bordet
e8c6fcf975
Issue #6728 - QUIC and HTTP/3
...
Fixed javadocs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 09:33:38 +01:00
Simone Bordet
9231d43308
Issue #6728 - QUIC and HTTP/3
...
Added more logging about HTTP/3 being experimental.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 09:33:38 +01:00
Simone Bordet
ea3f2703f0
Issue #6728 - QUIC and HTTP/3
...
Made ServerProtocolSession's producer task of type EITHER.
This is necessary to allow for example DATA frames to be
processed to unblock blocked reads.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 09:33:38 +01:00
Simone Bordet
e81c3ead7a
Issue #6728 - QUIC and HTTP/3
...
Made QuicConnection's fillable callback of type EITHER.
This is necessary when there are no threads available,
because we still want to read from the network and feed
Quiche so that it can progress with respect to packet
acknowledgments and flow control updates.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-12-20 09:33:38 +01:00