Commit Graph

2449 Commits

Author SHA1 Message Date
Simone Bordet cebe2a7c4e Fixes #1871 - JMXify SslContextFactory. 2017-10-05 23:02:02 +02:00
Simone Bordet 3b98a6c000 Issue #1851 - Improve insufficient thread warnings/errors.
ThreadBudget -> ThreadPoolBudget.
Added selectors to the leased threads.
2017-10-02 13:40:31 +02:00
Simone Bordet 17a1484143 Code cleanups.
Removed unnecessary imports and fixed typos.
2017-10-02 11:43:45 +02:00
Greg Wilkins d166881a5a Issue #1806 Concurrent ReservedThreadExcecutor
Squashed commit of the following:

commit ab7f711c30ad1408ecdceffdca51cf167dc11a9c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 28 10:20:08 2017 +1000

    Fixed format

commit 062b051b56efb9924b81cf755297f538e4691851
Merge: d1e27d4 7d98cbb
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 28 09:19:40 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1806-ConcurrentReservedThreadExecutor

commit d1e27d42983487941c6dd7cb0ea1068f36ff92f0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 11:28:21 2017 +1000

    improvements after review

commit 477e3ac05610825cc834d3195e39e8e8620a44cb
Merge: 51a3ac3 35d0b59
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 10:10:30 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1806-ConcurrentReservedThreadExecutor

commit 51a3ac37e63108ca93fe2fdd9e02e7f8161072ba
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 10:08:55 2017 +1000

    improvements after review

commit 23df855bf457fe609576a35327db3fbd4c82b491
Merge: b52c6de 5764afc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 09:30:42 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1806-ConcurrentReservedThreadExecutor

commit b52c6de6573433a960fdb6f2692e7bbd9effb48c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Sep 22 15:36:53 2017 +1000

    Issue #1806

    Added a concurrent stack class
    Converted ReservedThreadExcecutor to use the concurrent stack
    Added support for idle
2017-09-28 12:44:23 +10:00
Greg Wilkins 7d98cbb870 Issue #1851 Improve insufficient thread warnings/errors
Squashed commit of the following:

commit 1d9e8e4b4d53898cb6435f67529347bd2ba82cf0
Merge: 7280594 55b0f10
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 28 07:20:37 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1851-ThreadBudget

commit 7280594a0058538b603ad35625713a79830e9b93
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 22:48:58 2017 +1000

    fixed headers

commit f962f18e5b098ae40846ee3832736ee4650aed84
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 18:12:33 2017 +1000

    Issue #1851 added reset

commit a63894de284c8d8dc5ed031f1f6e0fccaf6c7715
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 18:08:53 2017 +1000

    Issue #1851 improved test

commit 8bcc460dc63273165305a7adcb88e991e30de4b7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 18:03:47 2017 +1000

    Issue #1851 Improve insufficient thread warnings/errors

    Refactor approach to use Leases, to handle multiple executors

commit fe4be5f56594f342ab5c2e6c886397d9b4fe9c14
Merge: abc5eac a248d38
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 15:37:56 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1851-ThreadBudget

commit abc5eac2b73d306a91b28ef4db778455095a5bdb
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 12:20:03 2017 +1000

    Issue #1851 Improve insufficient thread warnings/errors

    Created a ThreadBudget class that can be used to warn/error for
    registered and unregistered allocations of threads.

    The server on doStart does an unregistered check of all its components that
    implement the Allocation interface.

    The client will register itself as an Allocation if a shared Executor is used.
2017-09-28 07:35:05 +10:00
Jan Bartel 49b2823ee9 Merge pull request #1824 from jglick/WebAppClassLoader.addJars-ordering
Ensure that WebAppClassLoader.addJars considers classpath entries in a deterministic order
2017-09-27 11:12:39 +10:00
Jesse Glick fe0a0ead37 Minimizing diff lines at @janbartel’s request. 2017-09-25 18:21:01 -04:00
Simone Bordet 7768a781be Fixes #1836 - Review Locker.
Made Locker a simpler wrapper around ReentrantLock.
Deprecated lockIfNotHeld() and replaced its usages.
2017-09-21 19:16:36 +02:00
Greg Wilkins effec06eb6 Issue #1797 Multi Release Jar javadoc 2017-09-20 15:40:17 +10:00
Greg Wilkins 50f861e8f2 Issue #1797 MR jar support in java8 code 2017-09-20 13:47:37 +10:00
Greg Wilkins 219b61f5b4 Issue #1797
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha  java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
2017-09-19 13:40:59 +10:00
Jesse Glick ac61f0e968 Ensure that WebAppClassLoader.addJars considers classpath entries in a deterministic order.
Signed-off-by: Jesse Glick <jglick@cloudbees.com>
2017-09-18 16:20:53 -04:00
Joakim Erdfelt d9865a02ba Updating to version 9.4.8-SNAPSHOT 2017-09-14 08:44:27 -07:00
Joakim Erdfelt 80fb788d0c Updating to version 9.4.7.v20170914 2017-09-14 07:35:18 -07:00
Greg Wilkins 3399fd36dc Fix #1814 Java Version utility 2017-09-13 15:20:43 +10:00
Simone Bordet 172bf27922 Fixed test after #1805. 2017-09-08 15:40:34 +02:00
Simone Bordet c1a4153861 Fixes #1805 - ReservedThreadExecutor should start ReservedThreads lazily.
Removed doStart() that was eagerly starting ReservedThreads.
Other small code cleanups.
2017-09-08 10:52:40 +02:00
Simone Bordet 2ff3a80800 Fixes #1798 - JMXify EatWhatYouKill. 2017-09-08 10:52:40 +02:00
Simone Bordet ec9a4ecdc1 Fixed #1796 - ReservedThreadExecutor defaulting to capacity=1 only.
Using getMaxThreads() instead of getThreads().
2017-09-08 10:52:40 +02:00
Joakim Erdfelt aa85bca2a9 Minor test cleanup 2017-09-06 13:49:20 -07:00
Greg Wilkins ca750cf582 #1792 Accept ISO-8859-1 in Response reason 2017-09-05 17:29:49 +10:00
Greg Wilkins bc47942d17 Issue #1200 Improve PathWatcher
Squashed commit of the following:

commit 08b5acccf87c3b99152a8042d650aadf7e43c5ff
Merge: cea3366 daeb844
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 12:43:01 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200

commit cea3366625e16debf66e07284ab7afa89e73a32d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 12:42:21 2017 +1000

    Issue #1200 ignore OSX failure

commit fd2493f2b30ffb19f4b404636e1e38c8612cb502
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 12:11:05 2017 +1000

    Issue #1789 PropertyUserStoreTest failures on windows

commit 89aa59ca7b16a393edc77116b13050d2d8a2c3e2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 11:56:52 2017 +1000

    Issue #1200 fixes for windows

commit 1904b4566d9224a19729f83a7b49a5ab23aaa5d8
Merge: 74d770e eec6453
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 11:45:19 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200

commit 74d770e557e8ff613a5965cb430a7b83ee75bd45
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Sep 1 10:47:05 2017 +1000

    Issue #1200 fixes for windows

commit f4ee0e97dcd0a07257cea8da8b3106f71150957f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 10:24:07 2017 +1000

    Issue #1200 improved tests for long duration quiet time

commit 17381cbb0bbebe3ea27ed5f55caeb45c2856e1be
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 10:03:04 2017 +1000

    Issue #1200 fixed javadoc

commit b3a12c15167ce77a9781942680ca2d5c872374dd
Merge: ed0db46 ce4adb5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 09:41:50 2017 +1000

    Merge branch 'jetty-9.4.x-1200' of github.com:eclipse/jetty.project into jetty-9.4.x-1200

commit ed0db46f495f27491ba58e6c4353cf1ef6f2061e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 09:39:46 2017 +1000

    Issue #1200 Improved PathWatcher

commit ce4adb54ed58d39789ea1ba4f5d58035e57980ce
Merge: f993a7c 48aaecb
Author: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date:   Wed Aug 30 16:38:07 2017 -0700

    Merge branch 'jetty-9.4.x-1200' of github.com:eclipse/jetty.project into jetty-9.4.x-1200

commit f993a7c83ee7294a34b00cea68242adb7993e565
Author: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date:   Wed Aug 30 16:37:45 2017 -0700

    Issue #1200 - adding some important OSX/HFS+ timing differences

    + We should really be testing the FileSystem (not the OS) to make the timing
       constants be more sane. (APFS for example should be much lower on newer
       OSX installations

commit 48aaecb4dd291d94d591c1545f671eecff1e3587
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 08:50:42 2017 +1000

    Issue #1200 Improved PathWatcher diff

commit 1917f8b177d163bd42c07d5a2715858e7cf9787a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 08:36:40 2017 +1000

    Issue #1200 Improved PathWatcher diff

commit ecf002395a426ee3c00a4b42a32222e61805234f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 08:22:41 2017 +1000

    Issue #1200 Test improved PathWatcher

commit 0d76544093cbcddd9b29fc2c92a4d0bb0a6839a8
Merge: 0fd7187 eb1320f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Aug 30 16:43:15 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200

commit 0fd7187f908ed2d1bed24d5d82e25cb7ec244b0e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Aug 30 15:58:24 2017 +1000

    Issue #1200 Improve PathWatcher
2017-09-05 12:44:31 +10:00
Greg Wilkins 165ca36f6b Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2017-08-30 16:38:09 +10:00
Greg Wilkins d0d9b7f8d7 Revert "Issue #1520"
This reverts commit ecad4125a4.
2017-08-28 16:26:44 +10:00
Greg Wilkins ecad4125a4 Issue #1520 2017-08-28 16:17:31 +10:00
Greg Wilkins 6390b335fc Issue #1520
Removed a lot of cruft from this class that had accumulated over the years.
Deprecated methods like setConfigPath(File) and setConfigPath(String)
removed asymmetries like setConfigPath(String) and Path getConfigPath()
removed redundant configResource field
improved jarfile extraction to work for all string setters.
do not hot reload extracted config
fixed code style issues
2017-08-28 15:59:36 +10:00
Greg Wilkins b8e5a1f018 Issue #1498 RTResource
Added a test that indicates the existing URLResource is adequate for JRT
2017-08-26 09:50:48 +10:00
Simone Bordet 7e764bad3e Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-08-22 19:33:46 +02:00
Simone Bordet 1711642309 Added guard to avoid the case where count == 0. 2017-08-22 15:47:17 +02:00
Simone Bordet 927fe9ec44 Callback.NOOP is obviously non-blocking. 2017-08-22 15:46:33 +02:00
Greg Wilkins 1f847f998a Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2017-08-19 12:03:26 +10:00
Greg Wilkins 201a11a899 Issue #1556 Timing attack 2017-08-19 12:02:43 +10:00
Greg Wilkins a7e8b4220a Issue #1556 Timing attack 2017-08-18 11:38:55 +10:00
Simone Bordet 829fa4fe9b Improved logging. 2017-08-11 16:48:06 +02:00
Greg Wilkins bb39fe6009 improved test for running in IDE 2017-08-10 12:54:41 +10:00
Greg Wilkins cf418c639f Revert "added assume from running directly"
This reverts commit 39ea66368c.
2017-08-10 12:52:28 +10:00
Greg Wilkins 39ea66368c added assume from running directly 2017-08-10 11:34:13 +10:00
Greg Wilkins 7b5d3b2b5a Issue #1706 Log class uses self Loader 2017-08-10 11:22:06 +10:00
Joakim Erdfelt 1311052b15 Cleaning up state of branch to match the original jetty-9.4.x
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Greg Wilkins 9f285d92e7 Issue #1637
Limit reserved threads if threadpool is of small size
2017-08-08 09:15:59 -07:00
Greg Wilkins e5f7fee279 Fix #1664 CIDR IP 2017-08-08 09:14:30 -07:00
Joakim Erdfelt e65d0ba0e7 Improving test reliability (esp on Windows) 2017-08-08 09:14:10 -07:00
Greg Wilkins a105be95e4 Issue #1637 Thread per HTTP/2 Connection
This fix simplifies the EWYK scheduler by factoring out the preallocated producer into a
ReservedThreadExecutor class.   A shared ReservedThreadExecutor can then be used by multiple
EWYK instances to avoid over allocation of threads.

Squashed commit of the following:

commit c435dc20e25bd274d69423be1be7b0565925f249
Merge: 58a5a9a 90e5b56
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 21 10:48:22 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 58a5a9a655ee1a72a66f54ac8c95d7c9d73afe85
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Jun 14 15:56:43 2017 +0200

    Code cleanups.

commit 4e5296216b52948523572352cba391438ff6b494
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:34:58 2017 +0200

    refixed Producing to Reproducing

commit a1f8682f86d1f0803121162e3f14d7768286d3ed
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:26:29 2017 +0200

    fixed Producing to Reproducing

commit 9468932e062d2271d8dc1d43a78544757732fff5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:33:44 2017 +0200

    fixed javadoc

commit 9d4941eb97638fec09b3fe34d423538d17943b6f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:05:27 2017 +0200

    Renamed Preallocated to ReservedThread

commit 6d3379ab64c6dcc2a7aa8ec7088afd77863816c2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 12:28:52 2017 +0200

    Added configuration in modules

commit 1bd1adea4682538e1546c2ae53f4c9340dafb3bb
Merge: 83418a9 6702248
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:09:29 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 83418a91320c8bfc54465ca02efdce0d2c874a0e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:08:35 2017 +0200

    javadoc

commit 62918fd39189fed3414fec4a7c8380c21e90a4b8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Jun 10 00:04:06 2017 +0200

    Improved EatWhatYouKill implementation

    Simplified by abstracting out PreallocatedExecutor
    Removed invocation execution
    HTTP2 now uses a shared PreallocationExcecutor between connection
2017-08-08 09:13:44 -07:00
Joakim Erdfelt 3fdbcffbbd Updating to version 9.2.23-SNAPSHOT 2017-08-08 09:12:55 -07:00
Greg Wilkins d3e42cf064 Issue #1503 Optionally strip IPv6. Fixed inverted boolean 2017-08-08 09:12:53 -07:00
Greg Wilkins 8e3f950892 Issue #1503 Optionally strip IPv6 2017-08-08 09:12:52 -07:00
Joakim Erdfelt 8a674adddc Updating to version 9.2.22.v20170606 2017-08-08 09:12:46 -07:00
olivier lamy 4ce42c19ec unit test must not force a maven repository path #1574
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:10:23 -07:00
Joakim Erdfelt 806dff64f3 Issue #1590 - Revert Java 8 class usage back to Java 7 limits 2017-08-08 09:10:22 -07:00
Greg Wilkins c8cd6629d9 Issues #1513 #1515
Fixed and tested backup file
2017-08-08 09:10:21 -07:00
Greg Wilkins 675889a993 Issues #1513 #1515
Fixed removed of old files.
Added test to check file handling
2017-08-08 09:10:21 -07:00
Greg Wilkins 4d8987459d Fixed #1513 paranoid cleanup 2017-08-08 09:10:20 -07:00
Greg Wilkins 01be856663 Fixed #1513 back ported some 9.4 changes 2017-08-08 09:10:19 -07:00
Greg Wilkins 6f0cb033e7 Fixed #1513 sync shared timer 2017-08-08 09:10:18 -07:00
Greg Wilkins 15cad7379d Issue #1507 2017-08-08 09:10:17 -07:00
Joakim Erdfelt 2d24922383 Issue #1469 - conforming to java.util.Timer quirks 2017-08-08 09:10:16 -07:00
Joakim Erdfelt 7b8e3bf47c Eliminate time creep in RFOS 2017-08-08 09:10:16 -07:00
Joakim Erdfelt b0bead2bc0 Fixes #1357 - Refactored date/time handling and added tests for RolloverFileOutputStream 2017-08-08 09:10:15 -07:00
Greg Wilkins 189cc4e369 Issue #1468 Configure PKIX Revocation Checker for SslContextFactory 2017-08-08 09:10:14 -07:00
Joakim Erdfelt a7bcac6d75 Updating to version 9.3.20.v20170531 2017-08-08 09:07:35 -07:00
Joakim Erdfelt 11a544d6ac Updating to version 9.3.22-SNAPSHOT 2017-08-01 11:26:37 -07:00
Joakim Erdfelt bb1d69ca52 Updating to version 9.3.21.M0 2017-08-01 10:47:04 -07:00
Greg Wilkins 7b1d4c7ccf Fix #1664 CIDR IP 2017-07-13 15:41:21 +02:00
Joakim Erdfelt 4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Joakim Erdfelt 0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03:05 -07:00
Joakim Erdfelt c9732c5349 Issue #1590 - Revert Java 8 class usage back to Java 7 limits 2017-06-02 11:33:42 -07:00
Greg Wilkins 6d450bdc7f Issues #1513 #1515
Fixed and tested backup file
2017-06-02 10:13:13 -07:00
Greg Wilkins 314c9f31b0 Issues #1513 #1515
Fixed removed of old files.
Added test to check file handling
2017-06-02 10:13:03 -07:00
Greg Wilkins 2d8ef2f5f0 Fixed #1513 paranoid cleanup 2017-06-02 10:12:31 -07:00
Greg Wilkins d9f9791e39 Fixed #1513 back ported some 9.4 changes 2017-06-02 10:12:13 -07:00
Greg Wilkins 108fd25086 Fixed #1513 sync shared timer 2017-06-02 10:11:56 -07:00
Greg Wilkins d2ee6bdf08 Issue #1507 2017-06-02 10:11:38 -07:00
Joakim Erdfelt 89a82ac8cd Issue #1469 - conforming to java.util.Timer quirks 2017-06-02 10:09:24 -07:00
Joakim Erdfelt 897d0264c9 Eliminate time creep in RFOS 2017-06-02 10:09:10 -07:00
Joakim Erdfelt 0d4fcd0cb4 Fixes #1357 - Refactored date/time handling and added tests for RolloverFileOutputStream 2017-06-02 10:08:44 -07:00
Joakim Erdfelt 6a3c40e935 Updating to version 9.4.7-SNAPSHOT 2017-05-31 17:26:34 -07:00
Joakim Erdfelt 8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt 429380d36a Updating to version 9.3.21-SNAPSHOT 2017-05-31 16:10:04 -07:00
Joakim Erdfelt 0f3b1cbe36 Updating to version 9.3.20.v20170531 2017-05-31 15:24:57 -07:00
Joakim Erdfelt 2b93c4ecd9 Fixing PathResource.toString() duplicate 2017-05-30 13:31:09 -07:00
Joakim Erdfelt 6c89cebcbf Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2017-05-30 13:25:26 -07:00
Joakim Erdfelt b318f1c6dd Merge + Fixing formatting 2017-05-30 13:14:49 -07:00
Joakim Erdfelt d42ff37e57 Fixing compile error 2017-05-30 13:13:28 -07:00
Greg Wilkins ce67192399 Fixed determining mime type of `PathResource` based on its file name. (#1532) 2017-05-30 22:13:25 +02:00
Bernhard Haumacher 5e63c4db62 Fixed determining mime type of `PathResource` based on its file name. (#1532)
The result of `toString()` is expected to be the path name of a Resource. This is used for determining the mime type based on the file name extension in `org.eclipse.jetty.server.ResourceCache.Content`. Without a custom `toString()` implementation, no mime type can be determined for a resource. This problem does no longer exist in current Jetty, since `PathResource` has vanished.
2017-05-30 21:51:31 +02:00
Christoph Dreis e9f398cf41 Deprecate ConcurrentHashSet (#1570)
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-05-30 21:46:11 +02:00
Greg Wilkins 971044fe31 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-22 23:35:04 +02:00
Greg Wilkins 0d316345ad StopLifeCycle utility class 2017-05-22 23:34:24 +02:00
Simone Bordet c09a78adae Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-18 21:12:29 +02:00
Simone Bordet 9427aa95e8 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-05-18 21:09:54 +02:00
Simone Bordet 2baa1abe4b Issue #1556 - A timing channel in Password.java.
Improved logic to avoid timing attacks:
now the password length cannot be inferred.
2017-05-18 21:09:16 +02:00
Simone Bordet 20e7f4881f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-16 16:35:33 +02:00
Simone Bordet 1e2093c14a Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-05-16 16:34:39 +02:00
Simone Bordet f3751d7078 Issue #1556 - A timing channel in Password.java.
Fixed comparison logic, doh.
2017-05-16 16:34:04 +02:00
Simone Bordet bd2f3db69f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-16 11:35:01 +02:00
Simone Bordet 1ef845556b Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-05-16 10:44:46 +02:00
Simone Bordet 042f325f1c Fixes #1556 - A timing channel in Password.java. 2017-05-16 10:41:08 +02:00
Simone Bordet b1b94d870e Code cleanups. 2017-05-16 10:25:34 +02:00
Joakim Erdfelt ca4e72ca5d Issue #1553 - Guard against X509.isCertSign AIOOBE 2017-05-15 10:23:22 -07:00
Joakim Erdfelt 3521c76d53 Missing license header 2017-05-12 10:14:16 -07:00
Joakim Erdfelt 5e0d11cfc3 Issue #1108 - adding SslContextFactory.dump() selection details
+ Protocol selection details
+ Cipher Suites selection details

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
2017-05-12 09:29:27 -07:00
Greg Wilkins 4ab08c0e80 Issue #1539 decode path in jar:file 2017-05-10 14:24:10 +02:00
Joakim Erdfelt cf56168f7d Updating to version 9.3.20-SNAPSHOT 2017-05-02 15:26:56 -07:00
Joakim Erdfelt d36d57d5c7 Updating to version 9.3.19.v20170502 2017-05-02 14:31:51 -07:00
Joakim Erdfelt 782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt 9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00
Greg Wilkins 179d40edcb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-02 12:40:44 +02:00
Greg Wilkins f2721d3407 Issues #1513 #1515
Fixed and tested backup file
2017-05-02 12:40:00 +02:00
Greg Wilkins 58492b3ebc fixed merge 2017-05-02 12:14:00 +02:00
Greg Wilkins 9cc23b1901 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-02 11:49:01 +02:00
Greg Wilkins 1f8b48cb83 Issues #1513 #1515
Fixed removed of old files.
Added test to check file handling
2017-05-02 11:47:32 +02:00
Greg Wilkins 90a90d6c76 Issue #304 Deprecated sid methods 2017-04-28 13:30:49 +02:00
Greg Wilkins 89bb7db58c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-28 11:40:26 +02:00
Greg Wilkins a4cfd8a7a5 Fixed #1513 paranoid cleanup 2017-04-28 11:38:48 +02:00
Greg Wilkins fe4928b8ea Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-28 11:07:00 +02:00
Greg Wilkins c87903f39d Fixed #1513 back ported some 9.4 changes 2017-04-28 11:01:42 +02:00
Greg Wilkins 860d8658ca Fixed #1513 sync shared timer 2017-04-28 10:25:29 +02:00
Joakim Erdfelt 94ea83b49a Issue #1507 - adding state information to ISE if it occurs 2017-04-27 08:58:24 -07:00
Joakim Erdfelt 1acc064281 Issue #1507 - ROFS: Simplifying, Documenting, Testing 2017-04-27 07:25:13 -07:00
Greg Wilkins 776fd3e947 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-27 10:59:04 +02:00
Greg Wilkins 118652e985 Issue #1507 2017-04-27 10:57:55 +02:00
Greg Wilkins 9e65d1ebcb Issue #1505
* minor cleanups of ClasspathPattern
* defined jetty.home.uri and jetty.base.uri in start.jar and webapp configuration properties
* minor cleanup of start.jar property handling (more needed)
* updated location classpathpatterns in modules
2017-04-26 14:54:37 +02:00
Joakim Erdfelt 6ca9bacee6 Issue #1448 - Eliminating Resource creation from TypeUtil.getLoadedFrom()
+ Replaced with URI TypeUtil.getLocationOfClass(Class clazz)
+ and File TypeUtil.getLocationOfClassAsFile(Class clazz)
+ This is done to eliminate extraneous "new URL" and "URI.toURL" calls
  that can trigger URL Stream Handler creation and initialization
  which is the cause of the StackOverflowError
2017-04-26 13:43:35 +02:00
Simone Bordet de7c146bd7 Fixes #1235 - DNS lookup in newSSLEngine(InetSocketAddress address). 2017-04-21 11:29:10 +02:00
Greg Wilkins 8aa64949c2 Fixes #1492
ini properties should be overridable
2017-04-21 13:25:52 +10:00
Joakim Erdfelt 874662fe4a Issue #1475 - retain encoded form of path 2017-04-20 09:00:48 -07:00
Greg Wilkins 02276974a8 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-20 13:19:28 +10:00
Greg Wilkins 2f04b0f869 Fix #1487 2017-04-20 11:38:28 +10:00
Joakim Erdfelt 9ce9832293 Issue #1480 - more testcase updates 2017-04-19 15:14:44 -07:00
Greg Wilkins a85da08fd4 Issue #1480 - Fixed single dot handling 2017-04-20 08:10:44 +10:00
Joakim Erdfelt f64b0409ff Issue #1480 - improving canonicalPath test cases 2017-04-19 12:16:42 -07:00
Joakim Erdfelt ad2fe27303 Improving javadoc 2017-04-19 12:16:37 -07:00
Joakim Erdfelt e9138026f8 Merge branch 'release-9.4.4' into jetty-9.4.x 2017-04-19 10:50:20 -07:00
Greg Wilkins 7e61570481 Issue #1480 Optimised canonicalPath implementation 2017-04-19 13:24:49 +10:00
Joakim Erdfelt 92ea5bda21 Updating to version 9.4.5-SNAPSHOT 2017-04-14 14:43:36 -07:00
Joakim Erdfelt 3dc8f557c6 Updating to version 9.4.4.v20170414 2017-04-14 13:20:17 -07:00
Joakim Erdfelt ccfe579a55 Issue #1475 - SIOOBE in ContextHandler startup
+ Fixed ContextHandler logname creation to be more resilient to
  bad characters that are unsuitable for a log name
+ Corrected AbstractLogger condensePackageString() to be
  more resilient to bad characters and classname formatting
2017-04-14 12:04:18 -07:00
Joakim Erdfelt 68ff657c0b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-13 09:07:58 -07:00
Joakim Erdfelt 399ff337c8 Issue #1469 - conforming to java.util.Timer quirks 2017-04-13 09:07:26 -07:00
Simone Bordet 5d6bda39b6 Cleaned up test logging levels. 2017-04-12 12:27:03 +02:00
Greg Wilkins 3359db09bb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-12 16:55:50 +10:00
Greg Wilkins 6a10b4272b Issue #1463 2017-04-12 16:55:31 +10:00
Greg Wilkins b6b451a988 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-12 14:56:47 +10:00
Greg Wilkins 23a9c6c1be Issue #1463 2017-04-12 14:54:18 +10:00
Jan Bartel 8885f24ccb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-12 11:26:09 +10:00
Joakim Erdfelt 9e2aeda052 Updating to version 9.3.19-SNAPSHOT 2017-04-06 07:47:53 -07:00
Joakim Erdfelt 63273aa40b Updating to version 9.3.18.v20170406 2017-04-06 06:31:02 -07:00
Joakim Erdfelt f53776628f Issue #1448 - Reduce unncessary URL creation 2017-04-04 09:08:44 -07:00
Simone Bordet 1d9f9e86c0 Added getter to expose nested callback to subclasses. 2017-04-03 22:25:50 +02:00
WalkerWatch d841dba997 Documentation updates for #1437
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-04-03 11:04:11 -04:00
Greg Wilkins f06c7c358f Fixes #1440
Improve low resource solution for scheduling strategy.

Replaced the dual scheduling strategy with a single re-implementation of EatWhatYouKill
that can adapt to act as ProduceConsume, ExectureProduceConsume or ProduceExecuteConsume
as need be.

Squashed commit of the following:

commit 25eeb32181
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 1 09:08:49 2017 +1100

    renamed variables

commit 4f370d84ca
Merge: 8159c50 823cbe1
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 31 11:54:26 2017 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

commit 8159c508f0
Merge: 5805a92 daf61cd
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 30 17:28:00 2017 +1100

    Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x-ewyk

commit daf61cd294
Author: Denis Nedelyaev <denvned@gmail.com>
Date:   Thu Mar 30 04:15:32 2017 +0300

    Fix memory leak in GzipHandler (#1429)

    Looks like this leak shows itself only with asynchronous responses.

    Some relevant info: http://www.devguli.com/blog/eng/java-deflater-and-outofmemoryerror/

    Signed-off-by: Denis Nedelyaev <denvned@gmail.com>

commit 5805a92d0e
Merge: cfabbd2 dc759db
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 30 17:12:38 2017 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

commit cfabbd2341
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 30 16:04:57 2017 +1100

    minor cleanups

commit c7aa64aa10
Merge: bacf51a 18f17ac
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 30 14:58:37 2017 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

commit bacf51a83d
Merge: 11ba4bc 2fafa1d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 30 14:13:36 2017 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

commit 11ba4bc849
Merge: 69003d3 1a0b2df
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 30 13:48:09 2017 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

commit 69003d3dd9
Merge: f89b08d a8ff18d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 30 12:35:27 2017 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

commit f89b08d08a
Merge: 7a87c8e 00b42ca
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 23 16:01:00 2017 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

commit 7a87c8ec9d
Merge: 1a92015 12dc169
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 23 10:27:14 2017 +1100

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ewyk

commit 1a92015471
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 21 09:23:53 2017 +1100

    better spruious wakeup handling and other simplifications

commit c01a910b69
Merge: 0b2b9ea 67ec4b0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 17 14:59:37 2017 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

commit 0b2b9ea187
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 17 14:52:49 2017 +1100

    cleanup

commit c1d92ebde6
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 17 13:41:45 2017 +1100

    Fixed push

commit d2d6bc3e65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 17 12:18:03 2017 +1100

    minor cleanups

commit c1a159b7a9
Merge: 01349ac 78f4712
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 17 09:30:44 2017 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

commit 01349ac935
Merge: 4dc1503 08f351b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 17 08:16:06 2017 +1100

    Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ewyk

commit 4dc15032ba
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 16 23:26:59 2017 +1100

    work in progress

commit 5d18c654b8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 16 22:05:03 2017 +1100

    work in progress

commit d52a09a6cd
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 16 18:03:16 2017 +1100

    work in progress

commit c097db32e7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 16 15:59:29 2017 +1100

    Experiement enhancement to EatWhatYouKill ExecutionStrategy

    Use the existence of a pending producer threads to determine if low resources or not.
2017-04-01 09:18:37 +11:00
Joakim Erdfelt e8f8e6a279 Issue #1439 - Cleanup of PR #1438 to enable UNC support
+ Uses Path.toRealPath() to satisfy requirements on both
  Windows and Linux respectively
2017-03-31 11:18:30 -07:00
Fabian van der Veen 9a00c038ff Make PathResource UNC compatible again
The newly added checkAliasPath used the File constructor on a uri
resulting from Path's toUri, which caused an IllegalArgumentException due to
the uri having an authority component. (File's toURI and Path's toUri
differ slightly wrt. UNC paths; file:////unc vs file://unc.)

Signed-off-by: Fabian van der Veen <djyhnzo@gmail.com>
2017-03-30 16:03:11 +02:00
Greg Wilkins 2fafa1de0f Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-30 14:13:07 +11:00
Joakim Erdfelt dff8fb6b90 Issue parameter decoding (#1330)
* Issue #1327 - Removing non-standard (Microsoft only) %uXXXX support

* Issue #1322 - Removing attempts at "solving" bad behavior in UrlEncoded

+ No longer captures NumberFormatException and Utf8Exception and
  NotUtf8Exception for purposes of "recovering" from a bad encoding.
+ Introduces UrlEncode.decodeHexChar() and .decodeHexByte() to make
  reporting of bad encoding more clear.

* Issue #1316 - throw a BadMessageException on bad parameter parsing

+ If BadMessageException is uncaught by the webapp, this will result
  in an error 400 response message.
+ If an application decides to catch the BadMessageException, they can
  choose to ignore the exception and do their own error reporting.
+ This piggybacks on Issue #1327 and Issue #1322
2017-03-30 14:00:39 +11:00
Joakim Erdfelt 1360b863dc Updating to version 9.4.4-SNAPSHOT 2017-03-17 10:53:54 -07:00
Joakim Erdfelt 95e94b49d8 Updating to version 9.4.3.v20170317 2017-03-17 09:54:58 -07:00
Joakim Erdfelt a6a0ab991f Updating to version 9.3.18-SNAPSHOT 2017-03-17 09:48:19 -07:00
Joakim Erdfelt 307d23975e Updating to version 9.3.17.v20170317 2017-03-17 09:07:39 -07:00
Greg Wilkins 18d87aa972 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-09 15:59:19 +11:00
Greg Wilkins 9f9e1ab190 Issue #1374 Stop on Failure 2017-03-09 15:56:54 +11:00
Greg Wilkins 0a2da4822d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-06 14:20:23 +11:00
Joakim Erdfelt 1e46576bf4 Eliminate time creep in RFOS 2017-02-27 14:20:06 -07:00
Joakim Erdfelt 196b2c384b Fixes #1357 - Refactored date/time handling and added tests for RolloverFileOutputStream 2017-02-27 11:25:39 -07:00
Greg Wilkins 1361b31beb Issue #1353. fixed growable Trie 2017-02-25 11:15:10 +09:00
Joakim Erdfelt 523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt 4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Joakim Erdfelt 1f2ed754f3 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-02-15 11:35:44 -07:00
Joakim Erdfelt 0cd8d21bfd Issue #1331 - replacing with ${jetty.base.uri} form 2017-02-15 11:34:47 -07:00
Greg Wilkins 24e39cf944 update TypeUtil test for java9 2017-02-09 17:36:12 +11:00
Joakim Erdfelt 5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt 9a8f22d5dd Testing Updates
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
Jesse McConnell e695fc80d6 Updating to version 9.2.22-SNAPSHOT 2017-01-20 12:32:51 -06:00
Jesse McConnell 513b5e5f90 Updating to version 9.2.21.v20170120 2017-01-20 12:32:00 -06:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Greg Wilkins fb8ecf9970 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-17 15:27:22 +11:00
Greg Wilkins 76e9849fcd Issue #1262 Avoid reflection in isMappedBuffer 2017-01-17 15:23:26 +11:00
Greg Wilkins 07fb9c97db Issue #1260 expand system properties 2017-01-13 17:49:27 +11:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
Jesse McConnell 6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell c54efb5929 Updating to version 9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jesse McConnell f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell dac1d17a2d Updating to version 9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Greg Wilkins 3ea2d1cf95 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-12-02 13:01:26 +11:00
Greg Wilkins b6b33bd679 Issue #1134 HPACK
Added test that demonstrates large headers are incorrectly indexed
Do not index fields if too large to fit
2016-12-02 10:27:14 +11:00
Jan Bartel 640801987c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-30 09:37:21 +11:00
dreis2211 9b0f6b1fd5 Issue #1135 - Avoid allocations from Method.getParameterTypes() if possible
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
(cherry picked from commit 16334c1893)
2016-11-30 09:36:30 +11:00
Simone Bordet f70c6f790c Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-25 09:05:07 +01:00
Greg Wilkins deac849325 Fixes #1127
Fixes #1127 by updating #1074 solution.  Spurious calls to HttpInput.run can be ignored.
Hide some more test stacks
2016-11-24 10:18:06 +11:00