bb0f06fecc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-14 18:15:55 +01:00
0f07c6518e
Issue #1970 - ManagedSelector loses selector thread ( #1971 )
...
* Issue #1970 - ManagedSelector loses selector thread.
Removed broken data structure ConcurrentStack (ABA problem).
Made ReservedThreadExecutor use a ConcurrentLinkedDeque
instead of ConcurrentStack.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-11-14 10:48:33 +01:00
48df74224a
Jetty 9.4.x 1931 rollover ( #1932 )
...
* Issue #1931 Rollover log file
Added a protected method that is called whenever a log file is rolled over.
Support a date format of "" so that a rollover file may have the same name and a backup file is created.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* removed bad javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #1931 Rollover
Replaced FilteredOutputStream with a volatile field so that rollover events will be seen immediately
* Issue #1931 Rollover
use mutex to avoid write and close race
2017-11-14 09:16:47 +01:00
a7283e8e2a
Merge pull request #1959 from olamy/feature/build_properties_master_1956
...
master merge add a build.properties file containing git hash, build timestamp scm …
2017-11-10 15:55:15 -07:00
6499baa3a2
add a build.properties file containing git hash, build timestamp scm url ( #1957 )
...
* add a build.properties file containing git hash, build timestamp and scm url #1956
Signed-off-by: olivier lamy <olamy@webtide.com>
* move build infos to Jetty class so it's available for server and client
Signed-off-by: olivier lamy <olamy@webtide.com>
* apply changes by Greg review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-11 09:26:00 +11:00
99e56f97a2
add a build.properties file containing git hash, build timestamp scm url ( #1957 )
...
* add a build.properties file containing git hash, build timestamp and scm url #1956
Signed-off-by: olivier lamy <olamy@webtide.com>
* move build infos to Jetty class so it's available for server and client
Signed-off-by: olivier lamy <olamy@webtide.com>
* apply changes by Greg review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-11 09:02:10 +11:00
9fab69ea02
add a build.properties file containing git hash, build timestamp scm url ( #1957 )
...
* add a build.properties file containing git hash, build timestamp and scm url #1956
Signed-off-by: olivier lamy <olamy@webtide.com>
* move build infos to Jetty class so it's available for server and client
Signed-off-by: olivier lamy <olamy@webtide.com>
* apply changes by Greg review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-10 18:39:28 +01:00
4329df70b5
Merged branch 'jetty-9.4.x' into 'master'.
2017-11-09 10:31:07 +01:00
0bc8305535
Improved ReservedThreadExecutor by reporting waiting threads.
2017-11-09 10:26:11 +01:00
e244aad86e
Merged branch 'jetty-9.4.x' into 'master'.
2017-11-08 22:44:20 +01:00
d496cc85b6
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-11-08 22:43:48 +01:00
b1d5fea96c
Issue #1797 - JEP 238 - Multi-Release JAR files break bytecode scanning. ( #1951 )
...
Made MultiReleaseJarFile closeable and using try-with-resources in
AnnotationParser to avoid leaking file descriptors.
Made few code simplifications.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-11-08 21:38:26 +01:00
0ef51b67dc
Fix NPE when stopping with no resesrved threads ( #1939 )
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-03 23:58:00 +11:00
070546148e
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-03 08:55:00 +11:00
969c2d8e6a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-11-03 08:52:58 +11:00
6e7560acd1
Issue #1797 MR Jar. Fixed NPE
2017-11-03 07:51:26 +11:00
4fa2140d17
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-29 08:21:22 +11:00
ab849e8cc5
Issue #1920 - Connect Timeouts with NonBlocking CreateEndPoint.
...
Added a LiveLock (BusyBlocking) test.
Modified ManagedSelector to fair share between actions and selecting
2017-10-28 14:55:40 +11:00
a210add95a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-20 10:45:46 +11:00
17867dc0a7
improved QueuedThreadPool dump
2017-10-20 09:44:08 +11:00
7a3f9bfeb7
Fixing compilation issue surrounding deprecated Utf8PartialBuilder
2017-10-19 12:35:34 -07:00
7a04b423cd
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-19 19:56:28 +11:00
7399947d56
Added partial string support to Utf8Appendable
2017-10-19 19:55:55 +11:00
7d9645cb11
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 12:26:40 +11:00
c12ba01014
Issue #1797 use platform for MR jars
2017-10-18 12:24:26 +11:00
44a1f1e1a6
Issue #1797 use platform for MR jars
2017-10-18 12:19:33 +11:00
a9e98a5a7e
Issue #1901 Backport some java9 support to 9.3
2017-10-17 17:08:50 +11:00
8bcf10395d
Fix #1814 Java Version utility
2017-10-17 15:25:25 +11:00
6b7bbbe66a
Issue #1797 Multi Release Jar javadoc
2017-10-17 15:09:19 +11:00
5de895af88
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-10-17 15:06:09 +11:00
17df0bf930
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-11 17:39:45 +02:00
91c11f5a64
Fixes #1888 - Implement cookie matching on Path attribute.
...
Implemented path matching following RFC 6265.
2017-10-11 17:39:06 +02:00
c3c3881c9f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-10 13:44:22 -07:00
a8d08df84f
Issue #901 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType.
...
Improved code that defaults trustStore parameters from the keyStore parameters.
2017-10-10 21:23:46 +02:00
ef65f083b8
Issue #901 - defaulting trustStoreType to keyStoreType if unspecified
2017-10-10 09:34:57 -07:00
2eca7492dd
Issue #901 - updating exception testing in SslContextFactoryTest
2017-10-10 09:29:25 -07:00
a6a09d586a
Issue #901 - adding safetycheck for null storeType in CertificateUtils
2017-10-10 09:19:23 -07:00
632365f2e2
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-10 16:53:07 +02:00
c87b714a46
Fixes #901 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType.
...
The default value of _trustStoreType is now null rather than "JKS", so
that existing logic will use the _keyStoreType also for the trust store.
2017-10-10 16:52:25 +02:00
2b847405e0
Code reformatting.
2017-10-10 16:52:25 +02:00
63beada72e
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-06 16:46:00 +02:00
c93360ad9c
Issue #1851 - Improve insufficient thread warnings/errors.
...
Added ExecutorSizedThreadPool, a wrapper around JDK's ThreadPoolExecutor
that implements SizedThreadPool (and therefore returns a ThreadPoolBudget).
Deprecated ExecutorThreadPool, an older version of ExecutorSizedThreadPool.
2017-10-06 16:36:46 +02:00
da72bff86a
Formatting cleanups and added Javadocs.
2017-10-06 16:36:35 +02:00
5178f63a95
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-06 00:13:15 +02:00
268799b8bc
Fixes #1871 - JMXify SslContextFactory.
...
Fixed toString() formatting.
2017-10-06 00:12:03 +02:00
b1ba04ee0e
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-05 23:02:50 +02:00
cebe2a7c4e
Fixes #1871 - JMXify SslContextFactory.
2017-10-05 23:02:02 +02:00
bee383c894
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-03 01:22:35 +02:00
3b98a6c000
Issue #1851 - Improve insufficient thread warnings/errors.
...
ThreadBudget -> ThreadPoolBudget.
Added selectors to the leased threads.
2017-10-02 13:40:31 +02:00
17a1484143
Code cleanups.
...
Removed unnecessary imports and fixed typos.
2017-10-02 11:43:45 +02:00
0564b47657
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-28 12:56:30 +10:00
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 7d98cbb35d0b595764afc#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
1ce96be964
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-28 07:58:15 +10:00
7d98cbb870
Issue #1851 Improve insufficient thread warnings/errors
...
Squashed commit of the following:
commit 1d9e8e4b4d53898cb6435f67529347bd2ba82cf0
Merge: 7280594 55b0f10#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#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
d81b835ad0
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-27 12:19:54 +10:00
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
fe0a0ead37
Minimizing diff lines at @janbartel’s request.
2017-09-25 18:21:01 -04:00
f721e1d6c0
Issue #1836 - Review Locker.
...
Removed deprecated methods.
2017-09-22 16:48:35 +02:00
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
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
effec06eb6
Issue #1797 Multi Release Jar javadoc
2017-09-20 15:40:17 +10:00
50f861e8f2
Issue #1797 MR jar support in java8 code
2017-09-20 13:47:37 +10:00
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
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
3399fd36dc
Fix #1814 Java Version utility
2017-09-13 15:20:43 +10:00
172bf27922
Fixed test after #1805 .
2017-09-08 15:40:34 +02:00
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
2ff3a80800
Fixes #1798 - JMXify EatWhatYouKill.
2017-09-08 10:52:40 +02:00
ec9a4ecdc1
Fixed #1796 - ReservedThreadExecutor defaulting to capacity=1 only.
...
Using getMaxThreads() instead of getThreads().
2017-09-08 10:52:40 +02:00
aa85bca2a9
Minor test cleanup
2017-09-06 13:49:20 -07:00
ca750cf582
#1792 Accept ISO-8859-1 in Response reason
2017-09-05 17:29:49 +10:00
bc47942d17
Issue #1200 Improve PathWatcher
...
Squashed commit of the following:
commit 08b5acccf87c3b99152a8042d650aadf7e43c5ff
Merge: cea3366 daeb844#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#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#1200 Improve PathWatcher
2017-09-05 12:44:31 +10:00
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
02f0649840
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-28 11:33:12 -07:00
8de580d77e
Revert "Issue #1200 Improve PathWatcher"
...
This reverts commit 3eadc5f1db
2017-08-28 16:32:29 +10:00
d0d9b7f8d7
Revert "Issue #1520"
...
This reverts commit ecad4125a4
2017-08-28 16:26:44 +10:00
ecad4125a4
Issue #1520
2017-08-28 16:17:31 +10:00
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
b8e5a1f018
Issue #1498 RTResource
...
Added a test that indicates the existing URLResource is adequate for JRT
2017-08-26 09:50:48 +10:00
3eadc5f1db
Issue #1200 Improve PathWatcher
2017-08-24 16:24:57 +10:00
5a9e2ea25a
Issue #1498 RTResource
...
Added a test that indicates the existing URLResource is adequate for JRT
2017-08-24 13:01:03 +10:00
a947122235
Issue #1200 Update deployment manager to use PathWatcher
...
Updated PathWatcher to use IncludeExcludeSet
2017-08-24 10:01:51 +10:00
d8efc177ec
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-22 19:34:14 +02:00
7e764bad3e
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-08-22 19:33:46 +02:00
1711642309
Added guard to avoid the case where count == 0.
2017-08-22 15:47:17 +02:00
927fe9ec44
Callback.NOOP is obviously non-blocking.
2017-08-22 15:46:33 +02:00
1f847f998a
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2017-08-19 12:03:26 +10:00
201a11a899
Issue #1556 Timing attack
2017-08-19 12:02:43 +10:00
651f422034
Merge branch 'jetty-9.4.x' to 'master'
2017-08-18 10:54:58 -07:00
a7e8b4220a
Issue #1556 Timing attack
2017-08-18 11:38:55 +10:00
60a7551785
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-15 11:55:58 +10:00
829fa4fe9b
Improved logging.
2017-08-11 16:48:06 +02:00
39cb278577
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-10 13:22:54 +10:00
bb39fe6009
improved test for running in IDE
2017-08-10 12:54:41 +10:00
cf418c639f
Revert "added assume from running directly"
...
This reverts commit 39ea66368c
2017-08-10 12:52:28 +10:00
39ea66368c
added assume from running directly
2017-08-10 11:34:13 +10:00
13e928dfd0
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-10 11:30:09 +10:00
7b5d3b2b5a
Issue #1706 Log class uses self Loader
2017-08-10 11:22:06 +10:00
3ec5f8fa3d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-09 16:21:08 -07:00
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
9f285d92e7
Issue #1637
...
Limit reserved threads if threadpool is of small size
2017-08-08 09:15:59 -07:00
e5f7fee279
Fix #1664 CIDR IP
2017-08-08 09:14:30 -07:00
e65d0ba0e7
Improving test reliability (esp on Windows)
2017-08-08 09:14:10 -07:00
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 90e5b566702248
2017-08-08 09:13:44 -07:00
d3e42cf064
Issue #1503 Optionally strip IPv6. Fixed inverted boolean
2017-08-08 09:12:53 -07:00
8e3f950892
Issue #1503 Optionally strip IPv6
2017-08-08 09:12:52 -07:00
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
806dff64f3
Issue #1590 - Revert Java 8 class usage back to Java 7 limits
2017-08-08 09:10:22 -07:00
c8cd6629d9
Issues #1513 #1515
...
Fixed and tested backup file
2017-08-08 09:10:21 -07:00
675889a993
Issues #1513 #1515
...
Fixed removed of old files.
Added test to check file handling
2017-08-08 09:10:21 -07:00
4d8987459d
Fixed #1513 paranoid cleanup
2017-08-08 09:10:20 -07:00
01be856663
Fixed #1513 back ported some 9.4 changes
2017-08-08 09:10:19 -07:00
6f0cb033e7
Fixed #1513 sync shared timer
2017-08-08 09:10:18 -07:00
15cad7379d
Issue #1507
2017-08-08 09:10:17 -07:00
2d24922383
Issue #1469 - conforming to java.util.Timer quirks
2017-08-08 09:10:16 -07:00
7b8e3bf47c
Eliminate time creep in RFOS
2017-08-08 09:10:16 -07:00
b0bead2bc0
Fixes #1357 - Refactored date/time handling and added tests for RolloverFileOutputStream
2017-08-08 09:10:15 -07:00
189cc4e369
Issue #1468 Configure PKIX Revocation Checker for SslContextFactory
2017-08-08 09:10:14 -07:00
7065196400
Issue #1676 remove deprecated properties from XML
2017-07-19 16:29:13 +02:00
134dfd318d
Issue #1676 removed deprecated FileResource
2017-07-18 20:12:53 +02:00
3a4da94e1a
Issue #1676 removed deprecated IPAddressMap and IPAccessHandler. Created module inetaccess.mod
2017-07-18 16:48:02 +02:00
1956087277
update to latest servlet API behaviour
2017-07-18 13:11:53 +02:00
b358c06974
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-18 12:46:44 +02:00
8ca8735c95
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-07-13 15:41:54 +02:00
7b1d4c7ccf
Fix #1664 CIDR IP
2017-07-13 15:41:21 +02:00
a9c329859d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-12 13:18:12 -07:00
5b6b80ef81
Merge remote-tracking branch 'origin/jetty-9.4.x' into backport-jws11
2017-07-12 11:18:20 -07:00
ee8d4c1587
gitattributes followup
2017-07-06 16:24:31 -07:00
15cbaf9f83
Improving test reliability (esp on Windows)
2017-06-29 06:43:27 -07:00
67cccd610a
Post cherry-pick cleanup of jetty-9.4.x...master jetty-websocket
2017-06-26 13:11:33 -07:00
17f6c28c7d
Issue #1503 Optionally strip IPv6. Default true
2017-06-26 11:59:40 -07:00
fa10576bc6
Issue #207 - initial pass through for Stream backpressure
2017-06-26 11:43:18 -07:00
c8ffaec032
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:18:58 -07:00
c5954fc5d6
Trailing merge fixes
2017-06-26 11:18:57 -07:00
23c8e64fd8
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-21 14:40:13 +02:00
11b5cf5a2b
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 90e5b566702248
2017-06-21 11:48:41 +02:00
ea74d86f6f
Fixes #1368
2017-06-08 11:21:13 +02:00
ad76aa6c65
Issue #1503 Optionally strip IPv6. Default true
2017-06-06 17:07:14 +02:00
e55f528643
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-06 17:05:33 +02:00
70d55252b9
Issue #1503 Optionally strip IPv6. Fixed inverted boolean
2017-06-06 17:05:07 +02:00
380b7d21e9
Issue #1503 Optionally strip IPv6. Default true
2017-06-06 16:58:23 +02:00
829815be5e
Merge branch 'jetty-9.4.x'
2017-06-06 16:57:44 +02:00
55ee9279e1
Issue #1503 Optionally strip IPv6
2017-06-06 16:53:49 +02:00
5d7e97993c
Merge remote-tracking branch 'origin/master' into issue-207-master
2017-06-05 10:05:05 -07:00
3e83908c58
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-06-05 10:02:01 -07:00
b953f8d2d0
Merged branch 'jetty-9.4.x' into 'master'.
2017-06-05 18:07:51 +02:00
16f441541b
unit test must not force a maven repository path #1574
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-05 21:29:59 +10:00
c9732c5349
Issue #1590 - Revert Java 8 class usage back to Java 7 limits
2017-06-02 11:33:42 -07:00
6d450bdc7f
Issues #1513 #1515
...
Fixed and tested backup file
2017-06-02 10:13:13 -07:00
314c9f31b0
Issues #1513 #1515
...
Fixed removed of old files.
Added test to check file handling
2017-06-02 10:13:03 -07:00
2d8ef2f5f0
Fixed #1513 paranoid cleanup
2017-06-02 10:12:31 -07:00
d9f9791e39
Fixed #1513 back ported some 9.4 changes
2017-06-02 10:12:13 -07:00
108fd25086
Fixed #1513 sync shared timer
2017-06-02 10:11:56 -07:00
d2ee6bdf08
Issue #1507
2017-06-02 10:11:38 -07:00
89a82ac8cd
Issue #1469 - conforming to java.util.Timer quirks
2017-06-02 10:09:24 -07:00
897d0264c9
Eliminate time creep in RFOS
2017-06-02 10:09:10 -07:00
0d4fcd0cb4
Fixes #1357 - Refactored date/time handling and added tests for RolloverFileOutputStream
2017-06-02 10:08:44 -07:00
80e964ef35
Issue #1468 Configure PKIX Revocation Checker for SslContextFactory
2017-06-01 13:58:07 +02:00
32bc9292a2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-31 11:56:47 +02:00
2b93c4ecd9
Fixing PathResource.toString() duplicate
2017-05-30 13:31:09 -07:00
6c89cebcbf
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2017-05-30 13:25:26 -07:00
b318f1c6dd
Merge + Fixing formatting
2017-05-30 13:14:49 -07:00
d42ff37e57
Fixing compile error
2017-05-30 13:13:28 -07:00
ce67192399
Fixed determining mime type of `PathResource` based on its file name. ( #1532 )
2017-05-30 22:13:25 +02:00
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
e9f398cf41
Deprecate ConcurrentHashSet ( #1570 )
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-05-30 21:46:11 +02:00
d3e50f8f80
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-22 23:37:51 +02:00
971044fe31
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-05-22 23:35:04 +02:00
0d316345ad
StopLifeCycle utility class
2017-05-22 23:34:24 +02:00
94c9fc548c
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-18 21:12:50 +02:00
c09a78adae
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-05-18 21:12:29 +02:00
9427aa95e8
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-05-18 21:09:54 +02:00
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
2b7bdf93e7
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-16 16:35:53 +02:00
20e7f4881f
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-05-16 16:35:33 +02:00
1e2093c14a
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-05-16 16:34:39 +02:00
f3751d7078
Issue #1556 - A timing channel in Password.java.
...
Fixed comparison logic, doh.
2017-05-16 16:34:04 +02:00
bc2f3193ab
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-16 11:37:01 +02:00
bd2f3db69f
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-05-16 11:35:01 +02:00
1ef845556b
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-05-16 10:44:46 +02:00
042f325f1c
Fixes #1556 - A timing channel in Password.java.
2017-05-16 10:41:08 +02:00
b1b94d870e
Code cleanups.
2017-05-16 10:25:34 +02:00
ca4e72ca5d
Issue #1553 - Guard against X509.isCertSign AIOOBE
2017-05-15 10:23:22 -07:00
04b6afe879
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-05-15 09:48:41 -07:00
3521c76d53
Missing license header
2017-05-12 10:14:16 -07:00
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
cbe857de01
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-11 10:08:36 +02:00
4ab08c0e80
Issue #1539 decode path in jar:file
2017-05-10 14:24:10 +02:00
146a1d5ed5
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-02 22:17:06 +02:00
179d40edcb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-05-02 12:40:44 +02:00
f2721d3407
Issues #1513 #1515
...
Fixed and tested backup file
2017-05-02 12:40:00 +02:00
58492b3ebc
fixed merge
2017-05-02 12:14:00 +02:00
9cc23b1901
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-05-02 11:49:01 +02:00
1f8b48cb83
Issues #1513 #1515
...
Fixed removed of old files.
Added test to check file handling
2017-05-02 11:47:32 +02:00
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
002ba9cf00
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
...
Conflicts:
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/AltFilterTest.java
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeAnnotatedTest.java
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeContainerTest.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/DecoratorsTest.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/TestABCase3.java
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/WebSocketCloseTest.java
2017-04-28 06:01:06 -07:00
90a90d6c76
Issue #304 Deprecated sid methods
2017-04-28 13:30:49 +02:00
89bb7db58c
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-28 11:40:26 +02:00
a4cfd8a7a5
Fixed #1513 paranoid cleanup
2017-04-28 11:38:48 +02:00
fe4928b8ea
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-28 11:07:00 +02:00
c87903f39d
Fixed #1513 back ported some 9.4 changes
2017-04-28 11:01:42 +02:00
860d8658ca
Fixed #1513 sync shared timer
2017-04-28 10:25:29 +02:00
94ea83b49a
Issue #1507 - adding state information to ISE if it occurs
2017-04-27 08:58:24 -07:00
1acc064281
Issue #1507 - ROFS: Simplifying, Documenting, Testing
2017-04-27 07:25:13 -07:00
776fd3e947
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-27 10:59:04 +02:00
118652e985
Issue #1507
2017-04-27 10:57:55 +02:00
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
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
849ad7c917
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
2017-04-21 09:00:54 -07:00
de7c146bd7
Fixes #1235 - DNS lookup in newSSLEngine(InetSocketAddress address).
2017-04-21 11:29:10 +02:00
8aa64949c2
Fixes #1492
...
ini properties should be overridable
2017-04-21 13:25:52 +10:00
874662fe4a
Issue #1475 - retain encoded form of path
2017-04-20 09:00:48 -07:00
02276974a8
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-20 13:19:28 +10:00
2f04b0f869
Fix #1487
2017-04-20 11:38:28 +10:00
9ce9832293
Issue #1480 - more testcase updates
2017-04-19 15:14:44 -07:00
a85da08fd4
Issue #1480 - Fixed single dot handling
2017-04-20 08:10:44 +10:00
f64b0409ff
Issue #1480 - improving canonicalPath test cases
2017-04-19 12:16:42 -07:00
ad2fe27303
Improving javadoc
2017-04-19 12:16:37 -07:00
7e61570481
Issue #1480 Optimised canonicalPath implementation
2017-04-19 13:24:49 +10:00
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
68ff657c0b
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-13 09:07:58 -07:00
399ff337c8
Issue #1469 - conforming to java.util.Timer quirks
2017-04-13 09:07:26 -07:00
5d6bda39b6
Cleaned up test logging levels.
2017-04-12 12:27:03 +02:00
3359db09bb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-12 16:55:50 +10:00
6a10b4272b
Issue #1463
2017-04-12 16:55:31 +10:00
b6b451a988
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-12 14:56:47 +10:00
23a9c6c1be
Issue #1463
2017-04-12 14:54:18 +10:00
8885f24ccb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-12 11:26:09 +10:00
893b153cb3
Issue #207 - initial pass through for Stream backpressure
2017-04-05 17:30:51 -07:00
3aeb8dbd78
Merge remote-tracking branch 'origin/jetty-9.4.x'
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java
2017-04-05 06:47:25 -07:00
f53776628f
Issue #1448 - Reduce unncessary URL creation
2017-04-04 09:08:44 -07:00
1d9f9e86c0
Added getter to expose nested callback to subclasses.
2017-04-03 22:25:50 +02:00
d841dba997
Documentation updates for #1437
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2017-04-03 11:04:11 -04:00
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 25eeb321814f370d84ca8159c50823cbe18159c508f05805a92daf61cddaf61cd294#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 5805a92d0ecfabbd2dc759dbcfabbd2341c7aa64aa10bacf51a18f17acbacf51a83d11ba4bc2fafa1d11ba4bc84969003d31a0b2df69003d3dd9f89b08da8ff18df89b08d08a7a87c8e00b42ca7a87c8ec9d1a9201512dc1691a92015471c01a910b690b2b9ea67ec4b00b2b9ea187c1d92ebde6d2d6bc3e65c1a159b7a901349ac78f471201349ac9354dc150308f351b4dc15032ba5d18c654b8d52a09a6cdc097db32e7
2017-04-01 09:18:37 +11:00
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
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
dd084b4e74
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-30 17:20:22 +11:00
2fafa1de0f
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-30 14:13:07 +11:00
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
9ea4f128d4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-09 15:59:58 +11:00
18d87aa972
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-09 15:59:19 +11:00
9f9e1ab190
Issue #1374 Stop on Failure
2017-03-09 15:56:54 +11:00
05f05520eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-07 07:55:36 +11:00
0a2da4822d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-06 14:20:23 +11:00
1e46576bf4
Eliminate time creep in RFOS
2017-02-27 14:20:06 -07:00
196b2c384b
Fixes #1357 - Refactored date/time handling and added tests for RolloverFileOutputStream
2017-02-27 11:25:39 -07:00
1361b31beb
Issue #1353 . fixed growable Trie
2017-02-25 11:15:10 +09:00
3c29947a0d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-02-15 11:54:57 -07:00
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
0cd8d21bfd
Issue #1331 - replacing with ${jetty.base.uri} form
2017-02-15 11:34:47 -07:00
24e39cf944
update TypeUtil test for java9
2017-02-09 17:36:12 +11:00
c5c7be2bc5
Merge branch 'jetty-9.4.x'
2017-02-02 16:23:13 -07:00
5e57b9562f
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-02-02 16:14:10 -07:00
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
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
adc6d0ff6d
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-17 10:30:07 +01:00
fb8ecf9970
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-17 15:27:22 +11:00
76e9849fcd
Issue #1262 Avoid reflection in isMappedBuffer
2017-01-17 15:23:26 +11:00
9c975d7c9b
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-13 19:06:36 +01:00
07fb9c97db
Issue #1260 expand system properties
2017-01-13 17:49:27 +11:00
4046ef26d3
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-02 13:35:16 +11:00
3ea2d1cf95
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-12-02 13:01:26 +11:00
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
640801987c
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-11-30 09:37:21 +11:00
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
16334c1893
Issue #1135 - Avoid allocations from Method.getParameterTypes() if possible
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2016-11-28 21:17:04 +01:00
df91fc1092
Merged branch 'jetty-9.4.x' into 'master'.
2016-11-25 09:05:51 +01:00
f70c6f790c
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-11-25 09:05:07 +01:00
79c364368d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-24 15:51:06 +11:00
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
3e963df353
Adding missing license header
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-23 06:07:13 -07:00
d57cfe8ce1
Issue #1108 - adding comment about the purpose of the pristine SSLEngine
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-22 12:00:10 -07:00
b308574dd5
Issue #1108 - Use pristine SSLEngine for detecting JreDisabled
...
+ The use of the SSLEngine from SslContextFactory will include
the as-configured the SSLEngine exclusions from the configuration.
The dump routines now use a fresh SSLEngine to detect the JVM
level disabled features.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-22 11:46:43 -07:00
1672904d84
Issue #1108 - adding SslContextFactory.dump() selection details
...
+ Protocol selection details
+ Cipher Suites selection details
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-22 11:30:13 -07:00
bf3ea9ae44
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-18 11:19:40 +11:00
08012355de
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-17 14:45:55 -07:00
9f317dee94
Issue #1051 - Using java.time.ZonedDateTime instead of java.util.Calendar for Java 1.8+
2016-11-17 14:44:58 -07:00
1003969468
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-11-17 11:04:40 -07:00
bfadca49b5
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-11-16 13:56:31 -07:00
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
fe1704c89a
javadoc
2016-11-10 13:56:33 +11:00
de18e4540b
Issue #1051 - RolloverFileOutputStream doesn't handle DST properly
2016-11-07 09:55:09 -07:00
c6436c34ad
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-11-03 16:56:21 +11:00
3dc2637d21
Issue #1063 Accept empty host
2016-11-03 15:06:32 +11:00
7790234589
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-11-02 15:42:03 +11:00
ca882c8dee
Issue #240
...
No error if no parts because input stream already consumed.
2016-11-02 15:40:59 +11:00
da853574f6
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-28 14:41:37 +11:00
6f6ccdf061
480764 Add extra tests for empty multipart.
2016-10-28 14:41:05 +11:00
c6ad87c3f9
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-10-27 16:55:12 +02:00
8cefaba2a4
Allow process() to throw Throwable, which we catch anyway.
2016-10-27 15:43:12 +02:00
726fcd814c
fixed simple-impl naming #1023
2016-10-22 10:56:50 +11:00
9569ff64c9
removed unnecessary dependency #1020
2016-10-22 10:34:14 +11:00
97470c4736
Overlay directories for modules #1013
...
Implemented overlay directories for modules.
Implemented by extending the basehome initializer to be able to handle
directory to directory copies, with a default of jetty.base if no location
is specified.
2016-10-20 17:44:39 +11:00
d3deeff32c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-10-20 12:39:33 +11:00
d7b781574d
Improve logging modules and listing #984
...
All logging modules log to stderr
2016-10-20 10:57:56 +11:00
1706c6d9ed
Improve logging modules and listing #984
...
Do not support JCL as a logging mechanism. Only support jcl-slf4j binding
2016-10-20 10:57:56 +11:00
93741c32a8
Merge branch 'jetty-9.4.x'
2016-10-19 16:17:36 -07:00
6bc8717053
Improve logging modules and listing #984
...
Trim provider list and accept as default if only 1 available
2016-10-20 10:06:52 +11:00
4dfd3fad73
Fixing log4j.properties -> log4j.xml
2016-10-19 14:24:54 -07:00
15d00767a5
Using ${jetty.logging.dir} consistently
2016-10-19 14:23:54 -07:00
36d75d4c4f
Merge branch 'jetty-9.4.x'
2016-10-19 10:59:28 -07:00
d9054d24b3
Issue #984 - minor cleanup, consistency across all modules
...
+ Also correcting filename jcl-simple-impl.mod
2016-10-19 10:25:44 -07:00
6db48b2f02
Merged branch 'jetty-9.4.x' into 'master'.
2016-10-19 16:35:36 +02:00
d07d78066e
Moved console-capture.xml from modules/console-capture/ to etc/.
...
This is needed to ease migrations from Jetty 9.3.x, that otherwise
won't be able to find that file.
Furthermore, it's a file that will be rarely modified, since it can
be tuned via properties in start.ini.
Finally, it needs to be in etc/ if it is to be referenced by jetty.conf.
2016-10-19 16:01:16 +02:00
ae240b9c17
Fixed properties in *.mod and *.xml for module console-capture.
2016-10-19 11:44:13 +02:00
631437060b
Improve logging modules and listing #984
...
Improved logging dependencies
2016-10-19 17:29:39 +11:00
a32923b66e
Improve logging modules and listing #984
...
added jul-slf4j
updated logging dependencies
2016-10-19 16:25:18 +11:00
08be6aca91
Improve logging modules and listing #984
...
renamed simple implementation modules.
2016-10-19 16:25:18 +11:00
7bbfd618e3
Improve logging modules and listing #984
...
Used the term 'logging binding' instead of 'logging bridge'
2016-10-19 16:25:18 +11:00
9cdfdf34a7
Improve logging modules and listing #984
...
renamed stderout-capture to console-capture
2016-10-19 16:25:18 +11:00
39f47244fa
Merged branch 'jetty-9.4.x' into 'master'.
2016-10-17 15:36:32 +02:00
b11757a1e2
Issue #984 Improve module listing
...
Fixed cycle in logging from gcloud datastore
2016-10-14 15:42:12 +11:00
d9c2352966
Issue #984 Improve module listing
...
improved logging of file copies
renamed stderrout-logging to stderrout-capture
2016-10-14 10:17:39 +11:00
91f708b9f6
Issue #984 Improve module listing
...
Use stderrout-logging for jcl-impl
2016-10-14 08:26:41 +11:00
cfed44fa7d
Issue #984 Improve module listing
...
Made jul-impl a dependency of logging-jul
2016-10-14 08:18:15 +11:00
85e87322fb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-10-13 16:37:51 +11:00
fa3603a739
Issue #984 Improve module listing
...
Logback file handler
2016-10-13 16:37:24 +11:00
0966036fbc
Issue #984 Improve module listing
...
Fixed server classes property
2016-10-13 16:37:24 +11:00
d5a4f0f6d4
Issue #984 Improve module listing
...
Simplified start.jar ini mechanism
updated logging modules to have file handlers
2016-10-13 16:37:24 +11:00
6489d7fd23
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-10-11 18:00:12 +11:00
0142bcde8f
Issue #984 Improve module listing
...
renamed verbose to internal module tag
2016-10-07 20:27:38 +11:00
d8b1c88abc
Issue #984 Improve module listing
...
Reworked logging modules
added support for ,= and += properties
2016-10-07 12:48:47 +11:00
bcc29de3eb
Merged branch 'jetty-9.4.x' into 'master'.
2016-10-06 16:37:43 +02:00
539a209bef
Issue #984 Improve module listing
...
added verbose tags
2016-10-06 19:16:23 +11:00
91e9e7b76a
Issue #984 Improve module listing
2016-10-06 17:01:08 +11:00
84f7fc31cb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-10-06 12:01:50 +11:00
afb750515e
Issue #963 Location based classpath pattern ( #978 )
...
Issue #963 location based white/black classpath lists
- removed outdated annotations/ClassNameResolver
- implemented loadedFrom in TypeUtil
- created a growable Trie
- reimplemented classpathpattern
- simplified OSGi classloading
2016-10-06 10:47:09 +11:00
308bfd9b91
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-30 18:11:05 +02:00
285f283e5b
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-30 18:09:58 +02:00
38d48395b0
Issue #918 - Support certificates hot reload.
...
Introduced SslContextFactory.reload(Consumer) to perform atomic
reload of SslContextFactory.
2016-09-30 17:48:09 +02:00
7471f5c8f2
Code cleanup.
2016-09-30 17:47:52 +02:00
8dc18fe088
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-28 11:56:24 +02:00
7e376fd9da
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-28 11:53:54 +02:00
0f97c3df5d
Fixes #966 - Remove usages of ConcurrentArrayQueue.
2016-09-28 11:40:39 +02:00
efe339e246
Code cleanup.
2016-09-28 11:40:39 +02:00
9835598727
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-15 12:18:02 +02:00
1f4bb58ef4
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-15 12:17:33 +02:00
01e29aa45a
Fixes #870 - TLS protocol exclusion broken for SslContextFactory(String).
...
Introduced a private constructor that performs the correct
initialization, and have the other constructors delegate to it.
2016-09-15 12:11:11 +02:00
9e01565344
Code cleanups.
2016-09-15 12:11:11 +02:00
c87c04e7f0
Merged branch 'jetty-9.4.x' into 'master'.
2016-09-14 16:45:01 +02:00
5ec60a30ed
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-09-14 16:44:39 +02:00
571b0c74c5
Implemented PromiseWrapper's succeeded() and failed() methods.
2016-09-14 14:01:30 +02:00
44fa57b38a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-09-09 16:39:16 +10:00
3cd52fda04
Issue #572 Javadoc
2016-09-09 14:11:16 +10:00
8128f57020
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-09-08 10:40:07 +10:00
Greg Wilkins
Simone Bordet
Joakim Erdfelt
Olivier Lamy
Jan Bartel
Jesse Glick
olivier lamy
Bernhard Haumacher
Christoph Dreis
WalkerWatch
Fabian van der Veen
Jesse McConnell
dreis2211
Joakim Erdfelt