1504b7da93
Revert "Issue #2431 - Upgrade to Junit 5 ( #2436 )"
...
This reverts commit e24fc48539
2018-09-06 09:27:11 +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
863a19bccf
Updating to version 9.3.26-SNAPSHOT
2018-09-04 17:23:31 -05:00
3ce520221d
Updating to version 9.3.25.v20180904
2018-09-04 16:08:21 -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
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
f15bd225b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-21 14:47:19 +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
f4a0bfbdd8
Issue #2746 jmh module ( #2750 )
...
#2746 move jmh classes to a dedicated jmh module
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-04 14:08:13 +10:00
0ba1d9b5a5
Issue #307 datecache contention ( #2725 )
...
* use DateTimeFormatter which is threadsafe so no need of synchronized block #307
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-07-26 20:46:50 +10:00
0892ed8983
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-07-18 16:25:39 +02:00
a890dbfc01
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-2695-hpack-compliance
2018-07-17 17:49:19 +02:00
3d5b769706
Merge pull request #2700 from lachlan-roberts/jetty-9.4.x-2685-QuotedQualityCSV
...
Issue #2685 - bad content in QuotedQualityCSV results in empty entries
2018-07-17 17:42:12 +02:00
0ad4b4483b
WIP
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-15 19:22:31 +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
842e3c850a
Merge pull request #2707 from lachlan-roberts/jetty-9.4.x-HttpParser-headerCacheSize
...
Changing default Http headerCacheSize from 512 to 4096
2018-07-11 08:46:54 +01: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
1a4d304a0b
Removed unnecessary CACHE.put calls in HttpParser
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-09 11:33:05 +10:00
8fd5e8563e
Issue #2685 - bad content in QuotedQualityCSV results in empty entries
...
changes from review
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-09 10:52:49 +10:00
bb1b36b4c6
Issue #2685 - bad content in QuotedQualityCSV results in empty entries
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-06 14:41:15 +10:00
30f6132117
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-07-03 10:55:22 -05:00
0a7ad593e4
Issue #2684 - assumed MimeTypes can now be accessed/changed.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-27 09:52:01 -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
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
d35a332b48
Issue #2572 - Whitespace parsing test ( #2573 )
...
* Issue #2572 - Whitespace parsing test
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* fixed test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-30 15:52:58 +02:00
4785662efa
Fixes #2484 - Removed repeated null check
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-29 17:52:57 +10:00
715a637c2b
Issue #2532 Better handling of tokens in parser ( #2533 )
...
Issue #2532 Better handling of tokens in parser
Handle TCHAR and VCHAR from abnf separately
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-17 09:50:49 +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
c865aa1be7
Merge pull request #2476 from lachlan-roberts/jetty-9.4.x-1027-MultiPart-Cleanup
...
MultiPart Cleanup
2018-05-04 21:10:50 +10: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
a1ef905908
Code Cleanup and Reformat
...
Cleaned up Reformatted all new MultiPart code.
Removed redundant javadocs.
Removed re-definitions of variables and unnecessary string constructors.
Lazily create MultiException in MultiPartFormInputStream.deleteParts()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-03 21:18:08 +10:00
25888f0d83
Fix NPE in PreEncodedHttpField constructor ( #2488 )
...
Which might happen when given `HttpHeader` is null. It might be null
when most generic constructor `#PreEncodedHttpField(HttpHeader, String, String)`
is invoked with a null argument or when `#PreEncodedHttpField(String, String)`
constructor is used. Later is valuable for custom headers. NPE happens
because of an attempt to call `HttpHeader#asString()` on a null argument.
This commit fixes the problem by making encoders use specified header
name, instead of trying to retrieve it from the `HttpHeader` object.
Signed-off-by: lutovich <konstantin.lutovich@neo4j.com>
2018-04-26 08:35:24 +10:00
8763c6065d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-20 11:32:46 -05:00
0e88849a68
Issue #2164 Make osgi.serviceloader mostly optional ( #2408 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-18 14:48:53 +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
379a8d6928
Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
2018-04-04 09:48:01 +10:00
1c35324f5b
Fixed some javadoc errors and warnings
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-04 09:46:50 +10:00
6528b79fbd
Merge branch 'jetty-9.4.x-1027-Multipart' of github.com:eclipse/jetty.project into jetty-9.4.x-1027-Multipart
2018-04-04 08:08:59 +10:00
3b32e1c984
Issue #1027 - MultiPartCaptureTest cleanup
...
+ Regenerated many of the captures
- Better SJIS Encoding Test Samples
+ Added more
- file consisting of only random whitespace
- file with 1 very long line
- Jetty Http Client captures
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-03 14:55:38 -05:00
1eec234336
Minor changes after review by gregw.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 21:22:16 +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
c418297db6
Minor cleanups
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-29 18:04:42 +11:00
8a8324cb18
Completed benchmark for UTIL vs HTTP multipart parser. Fixed some tests in MultiPartCaptureTest.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-29 16:29:48 +11:00
7cea305269
Added some extra Debug information in the LOG
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-27 16:47:21 +11:00
ba88b39179
Work on resolving issues with the new tests in MultiPartCaptureTest.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-27 15:43:16 +11:00
9557f02fea
Fixed converstion to lower case by using StringUtil.asciiToLowerCase method.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-27 12:02:10 +11:00
ba56bc7994
Deprecated transfer encoding for parts
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-27 11:55:20 +11:00
a756ac50c6
Use UTF-8 for part headers
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-27 11:45:38 +11:00
6ac5970680
renamed test
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-27 10:32:13 +11:00
585f03464b
Merge remote-tracking branch 'lachlan/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
2018-03-27 10:29:05 +11:00
a59f681b00
run old and new parser in test
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-27 10:10:55 +11:00
ce3698ea75
Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
2018-03-27 09:19:47 +11:00
ca534d08fb
Minor changes to code, documentation and formatting after review.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-27 09:11:57 +11:00
8416c31ff8
compare MH5 hash without case sensitivity
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-27 08:33:07 +11:00
2f07940052
compare MH5 hash without case sensitivity
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-23 10:18:03 +11:00
2cc26f0e71
Merge branch 'jetty-9.4.x' into jetty-9.4.x-1027-Multipart
2018-03-23 09:34:52 +11:00
1c04f9838d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-22 16:42:42 -05:00
9d1809f43e
Issue #1027 - Adding raw browser multipart captures to jetty-http
...
+ Many more decoding issues identified in MultiPartParsingTest
+ Including Part.getInputStream() related issues
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-22 13:24:47 -05:00
2004f0eb78
Issue #1027 - Adding jetty-http version of newer MultiPartParsingTest
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-22 10:21:57 -05:00
8312f4567b
Merge branch 'jetty-9.4.x' into jetty-9.4.x-1027-Multipart
2018-03-21 16:50:29 +11:00
0f28107a9c
Implemented warnings for old MultiPartInputStreamParser when successfully parsing content not conforming to RFC.
...
Modified tests in new MultiPartInputStreamTest which were failing because they didn't comply with RFC.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-21 16:24:21 +11:00
c3cc138a3b
Updating to version 9.4.10-SNAPSHOT
2018-03-20 08:25:59 -05:00
1f8159b1e4
Updating to version 9.4.9.v20180320
2018-03-20 07:18:24 -05:00
93b8161afb
Reworked MultipartParser with additional option to accept CR as CRLF.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-20 11:40:55 +11:00
0ce3ccd4eb
Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
2018-03-18 22:05:29 +11:00
df83cca010
Rewrote the parse method to use the MultiPartParser, some error handling not implemented so only passing half of the tests.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-18 21:53:54 +11:00
a5d3b01659
Merge branch 'jetty-9.4.x' into jetty-9.4.x-1027-Multipart
2018-03-14 16:25:56 +11:00
fcd2d49da1
Moved a copy of MultipartInputStreamParser and MultipartInputStreamTest into jetty.http
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-14 15:51:43 +11:00
a77a127da0
tests and fixes for binary keys and content
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-14 15:02:56 +11:00
4dce09c067
Completed the split test.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-14 14:27:03 +11:00
c1f038d3bf
Merge branch 'jetty-9.4.x' into jetty-9.4.x-2232-HttpParser-cleanup
2018-03-14 09:32:51 +11:00
7374d6563d
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2018-03-13 14:24:57 -05:00
aafda1a279
Issue #2280 - adding default utf-8 encoding to application/json
2018-03-13 14:24:37 -05:00
20c9fb45f8
Reworked the tests on EPILOGUE and multiple content. All tests are passing.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 20:21:10 +11:00
faa32f0c71
improved handler signature
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 18:25:32 +11:00
d670b60e4d
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-03-13 17:58:53 +11:00
a51542ee03
work in progress EPILOGUE and END states implemented, in process of testing them
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 17:52:57 +11:00
46a8fb5dc4
fixes for partial pattern matches and optional CRLF
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 17:40:26 +11:00
0435eea708
work in progress implemented OCTETS
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 16:13:07 +11:00
915af401e1
HttpParser cleanup #2232
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 13:22:01 +11:00
0d4e202343
Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
2018-03-13 11:49:00 +11:00
66a76dae3c
work in progress
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 11:48:41 +11:00
267150c940
cleanup field parsing
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 11:09:14 +11:00
8b391a88dd
Fixes #2318 - HttpParser.Listener.onBadMessage() should take BadMessageException.
...
Changed the signature of HttpParser.Listener.onBadMessage()
to take a BadMessageException and updated dependent code.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-12 19:51:57 +01:00
1352be4308
added some unit tests for part content
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-12 17:39:11 +11:00
add08caec0
update after lachlan affb436433
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-12 17:27:05 +11:00
b0325f8299
work in progress
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-09 09:38:23 +11:00
dc67cb5241
Work in progres #1027
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-08 17:47:46 +11:00
bcb9fa3b32
Merge pull request #2257 from lachlan-roberts/jetty-9.4.x-2206-ReferenceEquality
...
Resolved errorprone ReferenceEquality warnings #2206
2018-03-07 11:11:40 +11:00
e3e3f9eb0b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-06 11:16:25 -06:00
020ebde77c
found additional ReferenceEquality warnings which have been resolved
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-06 14:28:11 +11:00
a639ee9275
Resolved errorprone MissingOverride warnings #2206
...
`@Override` was added to methods which were missing the annotation #2206
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-01 13:59:25 +11:00
a05b157c03
Updating to version 9.3.24-SNAPSHOT
2018-02-28 16:39:30 -06:00
0554f8d8b4
Updating to version 9.3.23.v20180228
2018-02-28 15:45:57 -06:00
016c8076e0
updates after review #2206
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-02-28 16:02:47 +11:00
0cfc25d4ed
Resolved errorprone ReferenceEquality warnings #2206
...
Objects which inherit or implement an `equals()` method should not be compared with == or !=
When the comparison of references is intentional `@SuppressWarnings("ReferenceEquality")` can be used
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-02-28 14:26:02 +11:00
3001c8af2f
Merge remote-tracking branch 'origin/release-9.2.24' into jetty-9.2.x
2018-02-07 15:35:04 -06:00
7b2e490036
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-12 22:24:17 +01:00
c7e03d6175
Better name for no HTTP/0.9 #2022
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-12 18:33:46 +01:00
1cbc1cf5e0
removed old javadoc
2018-01-11 16:58:26 +01:00
ec9827bb35
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-11 16:57:33 +01:00
3ae5abdda6
updated header for 2018
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-11 14:55:32 +01:00
8b7480f088
Merge branch 'jetty-9.4.x' into jetty-9.4.x-2022-FineGrainedComplianceModes
2018-01-10 22:25:49 +01:00
3a15419047
deprecated CUSTOM enums
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-10 22:18:47 +01:00
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06:00
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -06:00
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
88f64b8abf
fixed compliance names in formats
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-09 14:02:09 +01:00
54f49dec7d
Merge branch 'jetty-9.4.x' into jetty-9.4.x-2022-FineGrainedComplianceModes
2018-01-09 13:32:19 +01:00
45e3abbdcf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 13:17:32 +01:00
9f8d3e5b32
fixes after review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-08 16:14:03 +01:00
a81c1f3880
fixes after review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-08 16:09:22 +01:00
bd01e1877a
Updating to version 9.2.25-SNAPSHOT
2018-01-05 11:35:42 -06:00
a617842695
Updating to version 9.2.24.v20180105
2018-01-05 10:11:08 -06:00
f046bdc2c6
Removed RFC from enum names
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-05 10:43:00 +01:00
22beb1d02a
Updated tests to use _LEGACY modes
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-27 14:16:23 +01:00
30e9c84b33
Added RFC7230_LEGACY compliance mode as the default
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-27 13:50:10 +01:00
278b9b01c2
Added javadoc and STRICT compliance modes
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-27 13:24:13 +01:00
7e516e29fb
pass existing compliance tests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-24 18:00:03 +01:00
d8dead35ae
Issue #2022 Fine Gramed Compliance Modes
...
Added HttpComplianceSection and an EnumSet within HttpCompliance
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-24 14:41:18 +01:00
3a189ab254
#2056 javadoc warning fixes WIP
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-12-20 10:52:45 +11:00
2dd970b055
Updating to version 9.2.24-SNAPSHOT
2017-12-18 10:43:47 -06:00
cdbe733684
Updating to version 9.2.23.v20171218
2017-12-18 09:06:48 -06:00
a25d749101
work in progress of fine grained compliance
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-16 18:06:42 +01:00
71b775724f
work in progress of fine grained compliance
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-16 17:15:37 +01:00
7ee8bb82c6
Same code style fixes and remove unnecessary code reformatting
...
Signed-off-by: fb <fb@baqend.com>
2017-12-15 15:23:17 +01:00
a324a5ad77
Implement weak http header parsing and make the compliance mode configurable in the client
...
Signed-off-by: fb <fb@baqend.com>
2017-12-15 15:13:48 +01:00
b76240e678
Fixes #2022 - Ignore invalid chars in http header names, when the compliance mode is not RFC7230
...
Signed-off-by: fb <fb@baqend.com>
2017-12-15 15:12:34 +01:00
78a2c8c6d2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-12-06 15:46:49 +01:00
d4061fcfeb
Issue #1966 Case Sensitive method (PR #1967 )
...
Issue #1966 Case Sensitive method (PR #1967 )
* Modified the compliance violations to warn if case insensitivety is applied to a header
* removed duplicated if
* Fixed string comparison
* Improved compliance messages and comments
* updated expected violation messages
* Require a header colon only when in 7230 compliance mode
2017-11-29 18:56:54 +01:00
ff53002fac
Updating to version 9.4.9-SNAPSHOT
2017-11-21 13:11:31 -07:00
82b8fb23f7
Updating to version 9.4.8.v20171121
2017-11-21 12:33:52 -07:00
51d7f859c4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-16 16:56:41 +01:00
olivier lamy
Joakim Erdfelt
Jesse McConnell
Greg Wilkins
Kazuhiro Sera
Olivier Lamy
Simone Bordet
lachan-roberts
Matthias Perktold
Konstantin Lutovich
Jan Bartel
olivier lamy
fb