9787dbd594
Cleanup dump for jdk11 classloaders
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-10-17 14:51:12 +11:00
41663d8e5c
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-10-11 00:36:10 +02:00
bd3eeeaa3f
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'.
2018-10-04 12:27:31 +02:00
147f96ff4e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-10-03 10:21:14 +10:00
9d37feba3c
Cleanup after #2903 ( #2933 )
...
Improved dump output of ServletHandler and ContextHandler
Fixed duplicate listeners
Removed unused fields
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-10-03 10:00:14 +10:00
90ca8063eb
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-03 09:55:58 +10:00
8213a95a7b
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-10-02 22:51:46 +02:00
57ef060325
Issue #2936 - Allow Dispatcher.error() to work for BadMessageException
...
+ Applying fixes from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-02 08:39:05 -05:00
fe66e3d0cb
Issue #2936 - Allow Dispatcher.error() to work for BadMessageException
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-01 10:43:57 -05:00
27e7b3287a
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'.
2018-09-26 13:51:21 +02:00
7e68ef1e17
Issue #2191 - JPMS Support.
...
Now server.mod patches the servlet.api JPMS module with jetty-schemas.jar.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-26 13:22:29 +02:00
701a21fb1a
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2727-mbeanInfoCaching2'.
2018-09-26 10:07:25 +02:00
92e70f2c84
Issue #2727 - Revisit JMX MBean lookup behavior.
...
Fixed invoke() lookup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-24 10:49:29 +02:00
304eac7460
improved debug (more to do)
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-24 16:41:03 +10:00
49c12ae0f0
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-22 21:19:31 +10:00
5e8a7403d1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-22 20:11:03 +10:00
71a1801433
Issue #2918 restore a TestTracker with junit5 ( #2927 )
...
* add TestTracker junit5 extension #2918
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-21 14:03:05 +10:00
a9566d429c
Issue #2912 Remove Content-Length from inflated requests ( #2915 )
...
Issue #2912 Remove Content-Length from inflated requests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-21 07:44:53 +10:00
3a8a20557d
Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
...
Another update after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 17:07:49 +02:00
bae502681c
Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
...
Another update after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 13:50:33 +02:00
9a9a52b960
Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
...
Updated after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 13:44:12 +02:00
3384ff90ea
Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
...
Replaced usage of sun.reflect.Reflection with a
SecurityManager subclass, so that it works in all JDKs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 12:46:39 +02:00
a07f6cf7b9
Using declared default for Jetty 10.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-10 02:03:43 -05:00
4978321a93
More post-merge IPv6 test corrections (missed merges)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-07 13:55:21 -05:00
32912b922d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-06 17:39:57 +10:00
1504b7da93
Revert "Issue #2431 - Upgrade to Junit 5 ( #2436 )"
...
This reverts commit e24fc48539
2018-09-06 09:27:11 +10:00
8a05c651c0
Revert "fix merging"
...
This reverts commit a3e4a08903
2018-09-06 09:26:57 +10:00
a3e4a08903
fix merging
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 22:05:18 +10:00
e24fc48539
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 21:27:18 +10:00
a3f1592c50
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10:00
8dd05ac3f7
merge from 9.4.x
2018-09-04 13:48:43 -05:00
dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT
2018-08-30 10:48:22 -05:00
2720868475
Updating to version 9.4.12.v20180830
2018-08-30 08:56:44 -05:00
eb87415ed6
Issue #2871 - Server reads -1 after client resets HTTP/2 stream.
...
HttpInput.consume() now checks if the state is already failed,
and if so it does not change it when consuming the input.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-30 11:47:50 +02:00
d95b39f5f7
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-08-29 12:16:26 -04:00
7cf027b98f
Jetty 9.4.x 2711 tls 13 compliance ( #2857 )
...
Issue #2711 - TLS 1.3 compliance.
Disabled few tests that are TLS 1.2 specific.
Renegotiation in SslConnection is now skipped for TLS 1.3.
Replaced SNI keystore DSA certificate with RSA certificate.
First full build achieved with JDK 11+28.
Small changes after review.
Modified the test case to pass in JDK 8, where the implementation
throws SSLException, while in later JDKs throws SSLHandshakeException.
Minor cleanup
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-28 21:43:45 +10:00
90f15f278b
9.4.x->10.0.x
2018-08-27 22:58:01 -04:00
5b5f2fcf5f
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-08-27 10:29:12 +02:00
44e57f2170
Issue #2775 LowResourceMonitor extendable ( #2812 )
...
* make LowResourceMonitor extendable #2775
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-23 21:42:37 +10:00
5afe2e215f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-23 17:17:46 +10:00
460f3fcb9b
Close on graceful #2749 ( #2772 )
...
Cleanup of Graceful shutdown, plus ensure Connection:close if connector is shutdown for #2749
* WIP close connection when shutting down
* WIP use HttpChannel.Listener
* cleanups
* support graceful stop of a context
* only close connections if the connector is shutdown
* minor cleanups
* fixed toString and test
* fixed imports
* Move close logic to HttpConnection
* fixed generator to not override persistent
* Issue #2749 - Close connections on graceful shutdown.
* Small fix after review.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-23 08:08:17 +10:00
bd143a674b
Issue #2787 BadMessage if bad query detected in dispatcher ( #2827 )
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-22 08:29:12 +10:00
fc5dd874f3
Issue #2824 - Request.getParameters() should not reparse or recreate _parameters Map
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-21 11:09:15 -05:00
f15bd225b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-21 14:47:19 +10:00
dbe340a20e
Issue #300 - Implement Deflater Pool ( #2784 )
...
Issue #300 - Implement Deflater Pool
Removed the ThreadLocal pooling of deflaters in GzipHandler in favour of a new DeflaterPool class
GzipHttpOutputInterceptor.GzipBufferCB now recycles the Deflater in onCompleteFailure()
added benchmark for the DeflaterPool
allow negative capacity to mean no limit on the pool size
added mod file and xml changes
replace setDeflaterPool with newDeflaterPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-08-21 10:32:34 +10:00
a3fe88cf1f
Removing invalid (and ignored) test from Issue #1175
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-20 14:23:17 -05:00
9fcb5ef9fb
Jetty 9.4.x 2745 jdbcsessiondatastore nvarchar ( #2783 )
...
* Issue #2745 Allow string type to be explicitly set for JDBCSessionDataStore
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-08-16 08:28:32 +10:00
a315d5464f
Unwrap ServletException #2787 ( #2790 )
...
* Issue #2787 Unwrap ServletException
* Do not unwrap UnavailableException
* unwrap to specific targets
* fixes from review
* fixes after merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 12:51:27 +10:00
e5f0531db0
fixes after merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 11:59:15 +10:00
9ff37122db
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-08-15 11:58:52 +10:00
52de1965b6
Unwrap ServletException 9.3 #2787 ( #2789 )
...
* Issus #2787 unwrap ServletException
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Do not unwrap unavailable exception
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* unwrap to specific targets
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixes from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 11:43:52 +10:00
96218e8bc4
Fix typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
2018-08-10 23:52:16 +09:00
9390c2df3f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-06 09:04:58 -05:00
2cc90c2be5
Less verbose testing
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-02 16:41:06 +10:00
cd0cf3d11f
Issue #2706 - minor cleanup
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-20 16:03:27 +02:00
d6b7f8d71f
Merge pull request #2729 from lachlan-roberts/jetty-9.4.x-2706-ResourceService
...
Issue #2706 - Resource Service Incorrectly Returning 404
2018-07-20 15:29:09 +02:00
8444681880
Issue #2706 - Resource Service Incorrectly Returning 404
...
changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-20 21:30:00 +10:00
cf3681ef56
Issue #1688 Encoded form content ( #2733 )
...
* Issue #1688 Encoded form content
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixes from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-20 09:30:36 +02:00
0f3f77761f
Issue #2706 - Resource Service Incorrectly Returning 404
...
Replaced the response.isCommitted() check with a boolean returned from _resourceService.doGet().
This means the response does not need to be committed for the check to work correctly.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-20 11:01:56 +10:00
648554ad5c
Issue #2706 - Resource Service Incorrectly Returning 404
...
Removed response.flushBuffer() after writing to fix DefaultServletTest.testFiltered()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-19 12:46:18 +10:00
0892ed8983
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-07-18 16:25:39 +02:00
eceaff7bed
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-07-18 16:21:00 +02:00
37e4da24cb
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-07-18 16:15:27 +02:00
17b6eee5ac
Jetty 9.4.x 2233 ssl flush try again 2 ( #2726 )
...
Major refactor of SslConnection to address #2233 and to simplify in preparation for java-11 support.
Made the `needFillInterest` and `onIncompleteFlush` methods the primary stateful methods with state for fill and flush side that does not reproduce state already held by the SslEngine itself.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 10:11:35 +02:00
6de77d26e2
Issue #2706 - Resource Service Incorrectly Returning 404
...
Flush response buffer in places where the response needs to be committed.
Removed if statement preventing HEAD requests processing conditional headers.
Added two new test cases which failed before the changes and should now pass.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-18 11:27:19 +10:00
cc1071fa05
Fixes #2717 - Async requests are not considered when shutting down gracefully.
...
Now using _requestStats instead of _dispatchedStats to check for
requests completed when shutting down StatisticsHandler.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-16 10:54:43 +02:00
0b69f00665
Updating to version 9.4.12-SNAPSHOT
2018-07-11 17:32:16 -05:00
260596dd10
Updating to version 9.4.12.RC0
2018-07-11 16:30:55 -05:00
e05c11ae30
Changing default Http headerCacheSize from 512 to 4096
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-10 10:39:45 +10:00
9d9189d476
check for session id in path if url tracking mode is enabled ( #2668 )
...
Signed-off-by: Venkata Jaswanth U <aj.jaswanth@gmail.com>
2018-07-04 10:37:08 +02:00
30f6132117
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-07-03 10:55:22 -05:00
93a8afcc6b
Fixed #2677 use decoded path for favicon.ico
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-21 11:55:16 +02:00
4f54447585
Jetty 9.4.x 2501 accept listener ( #2511 )
...
* Issue #2501 - Accept Listener
* Issue #2501 - Include accepting connections in connection limit.
* AcceptRateLimit minimal delay
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-19 09:03:54 +02:00
09f614b48e
Eliminated redundant invocations of HandlerCollection.getHandlers()
...
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-18 19:19:07 +02:00
253c637742
Fixes #2663 - Guard Throwable.addSuppressed() calls. ( #2665 )
...
* Fixes #2663 - Guard Throwable.addSuppressed() calls.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-14 15:21:44 +02:00
1adbceae97
Merge pull request #2652 from lachlan-roberts/jetty-9.4.x-2398-MultiPartFormInputStream-Charset-Documentation
...
Issue #2398 - MultiPart Charset Encoding
2018-06-13 16:57:28 -05:00
346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x
...
Issue #2662 Unnecessary boxing conversions
2018-06-13 22:52:27 +02:00
f901efc413
Issue #2662 - Unnecessary boxing conversions
...
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-13 16:20:12 +02:00
0cd4dacbac
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-server/src/main/config/etc/jetty-http.xml
# jetty-server/src/main/config/etc/jetty-ssl.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
# jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-http2-webapp/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2018-06-12 11:11:38 -05:00
34351c7854
Issue #2398 - MultiPart Charset Encoding
...
Improved comment describing charset behaviour for MultiPart
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-12 17:31:04 +10:00
4f1dd352d6
Issue #2468 - Remove SoLinger. ( #2644 )
...
* Issue #2468 - Remove SoLinger.
For non-blocking sockets, StandardSocketOptions#SO_LINGER javadocs
report that the behavior is undefined. In JDK 11 setting SoLinger
for non-blocking sockets will be ignored.
As such, there is no point in allowing SoLinger to be configured
in Jetty that only uses non-blocking sockets.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-09 13:21:24 +02:00
3932b11e64
Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x
2018-06-07 14:31:24 -05:00
f54629a3c4
Merge pull request #2629 from eclipse/jetty-9.2.x-issue-2135-android-direct-buffers
...
Issue #2135 - proposal for Android 8.1 with SSL and direct buffers
2018-06-06 16:27:43 -05:00
2d5ef67d3f
Issue #2135 - TLS on Android 8.1 workaround configuration for Direct ByteBuffer use
...
+ Changes from review with @sbordet
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-06 10:55:28 -05:00
ea116028d4
Issue #2135 - TLS on Android 8.1 workaround configuration for Direct ByteBuffer use
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-06 10:44:53 -05:00
fddfa40e3d
Issue #2626 - Test failure: ShutdownMonitorTest.testStartStopSamePortDifferentKey.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-06 09:53:46 +02:00
1f1a5cb064
Merge pull request #2610 from lachlan-roberts/jetty-9.4.x-issue-2592-ServerTimeoutTest-testAsyncWriteIdleTimeoutFires
...
Issue #2592 - fix for ServerTimeoutTest.testAsyncWriteIdleTimeoutFires [HTTP] on windows
2018-06-06 08:24:07 +02:00
29c9afe135
Issue #2592 - Failing test on Windows: ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP]
...
removed HttpOutput.close(Closeable) method as IO.close(Closeable) should be used instead
added isFailed() method to WriteFlusher and used it to fix WriteFlusherTest.testFailWhileBlocking()
surrounded usage of onError() in HttpOutput.run() with try-finally so that IO.close(this) is executed if onError throws
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-06 15:35:54 +10:00
e4bfe00dce
Updating to version 9.4.12-SNAPSHOT
2018-06-05 14:18:37 -05:00
d5fc0523cf
Updating to version 9.4.11.v20180605
2018-06-05 13:23:02 -05:00
5eefa90e05
Updating to version 9.3.25-SNAPSHOT
2018-06-05 13:13:07 -05:00
84205aa28f
Updating to version 9.3.24.v20180605
2018-06-05 12:11:03 -05:00
f0ff571c98
Reverting version to 9.3.24-SNAPSHOT
2018-06-05 12:06:58 -05:00
13640c297c
Bumping version to 9.3.25-SNAPSHOT
2018-06-05 11:58:37 -05:00
72dcfc15e5
Issue #2592 - Failing test on Windows: ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP]
...
changed write flusher to go from pending state to failed state
reverted previous HttpOutput changes
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-05 19:21:30 +10:00
9524156d8a
Issue #2602 - Failing test: ServerConnectorTimeoutTest.
...
Removed duplicate test.
Removed lines that were testing unreliable TCP behavior.
Fixed retrieval of EndPoint in case of SSL.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-01 18:13:25 +02:00
946e6682b7
Merged 'origin/jetty-9.4.x' into 'jetty-9.4.x'.
2018-06-01 16:43:24 +02:00
5baabd0ba8
Fixes #2237 - Test failure: SelectChannelServerSslTest.testFullURI.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-01 16:35:23 +02:00
af739ce85e
Issue #2237 - Test failure: SelectChannelServerSslTest.testFullURI.
...
Cleanup of test classes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-01 16:34:29 +02:00
c3670d5870
Issue #2237 reduce large URI to avoid split write
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-01 16:30:07 +02:00
53e8bc2a63
Backport of issue #2560 fixes to jetty-9.3.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 12:43:17 -05:00
ad4dceb1c0
Issue #2560 - Moving InvalidPath logic from PathResource to ResourceContentFactory
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 11:31:36 -05:00
1bf5128e6d
Fixes #2592 - changes to fix ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP] on windows
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-31 19:44:51 +10:00
2bcc528920
expand spruious tabs in java sources
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-29 10:40:09 +02:00
d13e79a284
Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-server-stackTraceRemoval
2018-05-26 00:35:02 +10:00
e6e49bdc85
Updated javadoc for callbacks
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-25 08:01:31 +02:00
c829ee3210
Issue #2424 - ReadPendingException in testHttpWriteIdleTimeout()
...
Replacing setBlockingTimeout with setIdleTimeout to fix the ReadPendingException on ServerConnectorTimeoutTest.testHttpWriteIdleTimeout().
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-23 07:41:20 +10:00
0664893022
Issue #2542 - Log exception stackTraces instead of printing
...
replaces some usages of printStackTrace with logging in ConnectorTimeoutTest to avoid printing out the stack trace on passing tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-23 07:39:23 +10:00
462679910f
Fixes #2544 - Test Failure: LowResourcesMonitorTest.testMaxLowResourceTime().
...
Rewrote the test to not write to the server,
thus avoiding connection resets.
The rewrite also clarified what the test was testing.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-22 12:55:03 +02:00
6b7f4c91db
Merge pull request #2552 from eclipse/jetty-9.4.x-2549-ConsumeAll
...
Issue #2549 ConsumeAll forced EOF or EarlyEOF
2018-05-18 09:18:57 +02:00
c69ab6bd56
Issue #2549 ConsumeAll forced EOF or EarlyEOF
...
Cleanup after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-18 16:39:44 +10:00
252ab9facf
Jetty 9.4.x 2550 coalesce ranges ( #2551 )
...
Issue #2550 coalesce ranges
Author: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-18 08:45:54 +10:00
b93cc5abb6
Issue #2549 ConsumeAll forced EOF or EarlyEOF
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-17 13:05:13 +10:00
aa97518d0b
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-05-17 08:27:45 +10:00
be8ff431a4
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-17 08:16:39 +10:00
a285deea42
Issue #2529 RFC2616 vs RFC7230 cleanup
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-17 08:00:53 +10:00
01f7aecc4e
Fixes #2546 - Incorrect parsing of PROXY protocol v2.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-16 21:33:22 +02:00
4cc8f4dcf6
Issue #2346 Revert stack logging
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-16 17:21:06 +10:00
820b5752d7
Issue #2525 fixed jetty.xml
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-16 14:32:41 +10:00
10eaa6e261
javadoc
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-14 21:33:41 +10:00
317a8a5c66
Issue #2525 - Clean up SharedBlockingCallback.
...
Small cleanups and added test for thread interruption.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-14 10:27:34 +02:00
625d1f7726
Issue #2525 Clean up SharedBlockingCallback
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-13 23:11:38 +10:00
7e0afae70b
Issue #1785 Fix Javadoc and vhost warn logic
...
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-05-04 02:01:04 -04:00
03d96ae538
Issue #1785 minor cleanups
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-04 10:20:15 +10:00
ad21d35d51
Issue #1785 Pre-process vhost entries and provide warning
...
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-05-03 16:48:18 -04:00
c73352b1f0
Merge branch 'jetty-9.4.x' of https://github.com/eclipse/jetty.project into jetty-9.4.x
2018-05-03 12:52:50 -04:00
1732ffca51
Updating to version 9.4.11-SNAPSHOT
2018-05-03 11:48:05 -05:00
daa59876e6
Updating to version 9.4.10.v20180503
2018-05-03 10:55:19 -05:00
5515e13649
Issue #2427 Stop and start session idle timer ( #2466 )
...
* Issue #2427 Stop and start session idle timer
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-05-03 08:05:26 +10:00
394c6313b3
Issue #2495 Make FileSessionDataStore private methods protected
2018-05-01 09:26:51 +10:00
d25fa7d20c
Code cleanup.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-27 10:12:19 +02:00
f7faf392b2
Fix operator priority in ProxyConnectionFactory
...
Due to shift operations taking less precedence over addition the expression was parsed in an unintended way.
With this change the intention is made more clear and the intended order of calculations (shift the single byte values into some variable) is actually implemented.
Signed-off-by: Benny Baumann <BenBE@geshi.org>
2018-04-26 16:15:35 +02:00
877f0a112a
Fixing javadoc and deprecations from merge
2018-04-20 11:51:00 -05:00
8763c6065d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-20 11:32:46 -05:00
f36eba4577
class.newInstance is deprecated #2435 ( #2437 )
...
* Class.newInstance() is deprecated in Java 9+ #2435
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-17 19:07:20 +10:00
7629a8f98f
Fixes #2425 - Review BufferUtil.isMappedBuffer(). ( #2432 )
...
Now explicitly using a _mappedBuffer field in
CachedContentFactory.CachedHttpContent.
Deprecated BufferUtil.isMappedBuffer().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-12 10:36:57 +02:00
b09760ca9a
Code cleanups.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-11 15:05:58 +02:00
6abf026440
Issue #1785 If only connector in vhost and not connector in request then fail to match
...
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-04-07 17:25:40 -04:00
c79b0f4e2a
Issue #1785 Update Javadoc
...
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-04-07 14:51:28 -04:00
a30ed56ac1
Issue #1785 Added vhost@connectorname format for AND behaviour
...
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-04-07 13:56:45 -04:00
92f44389b9
fixed value of public static String __MULTIPARTS
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-04 12:00:11 +10:00
4a0e4294b9
fixed path of MultiPartFormDataCompliance in jetty.xml
...
added some debug info
changes to jetty test webapp to display parts from multi-part forms
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-04 11:18:57 +10:00
9397ae2d77
revert ResourceHandlerTest changes
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-04-04 09:10:57 +10:00
81ff77108c
Moved the MultiParts interface and implementations from Request into new file MultiParts.java
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 23:55:08 +10:00
1eec234336
Minor changes after review by gregw.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 21:22:16 +10:00
b3d5333d42
Implemented switch between LEGACY and RFC7578 modes. Added tests to check this worked correctly.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 16:13:19 +10:00
95cd6e0614
Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 15:33:56 +10:00
13b15e3566
Resolved Charset Issues and Reworked Request.MultiPartInputStream
...
Changed Request.MultiPartInputStream to an interface called MultiParts where there is an implementation for both the HTTP and UTIL parsers.
Resolved some issues with default charsets in regards to request.setCharacterEncoding and the _charset_ part for issue #2398 .
Changed HTTP parser to operate the same as UTIL parser in situtions with parts not of type form-data or without name field. HTTP parser was ignoring these parts, UTIL parser was throwing exceptions.
Replaced the context attribute with a field in MultiParts.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 15:24:54 +10:00
48edc7305b
Merge remote-tracking branch 'lachlan/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
2018-04-03 14:12:19 +10:00
be2d6ebb29
Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-1027-Multipart
2018-04-03 12:36:54 +10:00
Greg Wilkins
Simone Bordet
olivier lamy
Joakim Erdfelt
Olivier Lamy
Jesse McConnell
WalkerWatch
Lachlan
Jan Bartel
Kazuhiro Sera
Venkata Jaswanth
Matthias Perktold
Steve Bolton
BenBE