Commit Graph

2747 Commits

Author SHA1 Message Date
Greg Wilkins 17f6c28c7d Issue #1503 Optionally strip IPv6. Default true 2017-06-26 11:59:40 -07:00
Joakim Erdfelt fa10576bc6 Issue #207 - initial pass through for Stream backpressure 2017-06-26 11:43:18 -07:00
Joakim Erdfelt c8ffaec032 Issue #207 - Support javax.websocket version 1.1 2017-06-26 11:18:58 -07:00
Joakim Erdfelt c5954fc5d6 Trailing merge fixes 2017-06-26 11:18:57 -07:00
Greg Wilkins 23c8e64fd8 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-21 14:40:13 +02:00
Greg Wilkins 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 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-06-21 11:48:41 +02:00
Greg Wilkins ea74d86f6f Fixes #1368 2017-06-08 11:21:13 +02:00
Joakim Erdfelt 5ee1c7a533 Merge branch 'release-9.4.6' into jetty-9.4.x 2017-06-07 10:01:11 -07:00
Joakim Erdfelt 4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Greg Wilkins ad76aa6c65 Issue #1503 Optionally strip IPv6. Default true 2017-06-06 17:07:14 +02:00
Greg Wilkins e55f528643 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-06 17:05:33 +02:00
Greg Wilkins 70d55252b9 Issue #1503 Optionally strip IPv6. Fixed inverted boolean 2017-06-06 17:05:07 +02:00
Greg Wilkins 380b7d21e9 Issue #1503 Optionally strip IPv6. Default true 2017-06-06 16:58:23 +02:00
Greg Wilkins 829815be5e Merge branch 'jetty-9.4.x' 2017-06-06 16:57:44 +02:00
Greg Wilkins 55ee9279e1 Issue #1503 Optionally strip IPv6 2017-06-06 16:53:49 +02:00
Joakim Erdfelt 0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03:05 -07:00
Joakim Erdfelt 5d7e97993c Merge remote-tracking branch 'origin/master' into issue-207-master 2017-06-05 10:05:05 -07:00
Joakim Erdfelt 3e83908c58 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-06-05 10:02:01 -07:00
Simone Bordet b953f8d2d0 Merged branch 'jetty-9.4.x' into 'master'. 2017-06-05 18:07:51 +02:00
olivier lamy 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
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
Greg Wilkins 80e964ef35 Issue #1468 Configure PKIX Revocation Checker for SslContextFactory 2017-06-01 13:58:07 +02: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
Greg Wilkins 32bc9292a2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-31 11:56:47 +02: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 d3e50f8f80 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-22 23:37:51 +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 94c9fc548c Merged branch 'jetty-9.4.x' into 'master'. 2017-05-18 21:12:50 +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 2b7bdf93e7 Merged branch 'jetty-9.4.x' into 'master'. 2017-05-16 16:35:53 +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 bc2f3193ab Merged branch 'jetty-9.4.x' into 'master'. 2017-05-16 11:37:01 +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 04b6afe879 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-05-15 09:48:41 -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 cbe857de01 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-11 10:08:36 +02: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
Simone Bordet 146a1d5ed5 Merged branch 'jetty-9.4.x' into 'master'. 2017-05-02 22:17:06 +02: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 68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
Joakim Erdfelt 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
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
Joakim Erdfelt 849ad7c917 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-04-21 09:00:54 -07: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 893b153cb3 Issue #207 - initial pass through for Stream backpressure 2017-04-05 17:30:51 -07:00
Joakim Erdfelt 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
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 dd084b4e74 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-30 17:20:22 +11: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 9ea4f128d4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-09 15:59:58 +11: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 05f05520eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-07 07:55:36 +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 3c29947a0d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-02-15 11:54:57 -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 c5c7be2bc5 Merge branch 'jetty-9.4.x' 2017-02-02 16:23:13 -07: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 cef2ff9522 Happy New Year 2017. 2017-01-19 19:31:53 +01: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
Simone Bordet adc6d0ff6d Merged branch 'jetty-9.4.x' into 'master'. 2017-01-17 10:30:07 +01: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
Simone Bordet 9c975d7c9b Merged branch 'jetty-9.4.x' into 'master'. 2017-01-13 19:06:36 +01: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 4046ef26d3 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-02 13:35:16 +11: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
dreis2211 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
Simone Bordet df91fc1092 Merged branch 'jetty-9.4.x' into 'master'. 2016-11-25 09:05:51 +01:00
Simone Bordet f70c6f790c Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-25 09:05:07 +01:00
Jan Bartel 79c364368d Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-24 15:51:06 +11: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
Joakim Erdfelt 3e963df353 Adding missing license header
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-11-23 06:07:13 -07:00
Joakim Erdfelt 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
Joakim Erdfelt 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
Joakim Erdfelt 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
Greg Wilkins bf3ea9ae44 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-18 11:19:40 +11:00
Joakim Erdfelt 08012355de Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-17 14:45:55 -07:00
Joakim Erdfelt 9f317dee94 Issue #1051 - Using java.time.ZonedDateTime instead of java.util.Calendar for Java 1.8+ 2016-11-17 14:44:58 -07:00
Joakim Erdfelt 1003969468 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-11-17 11:04:40 -07:00
Joakim Erdfelt bfadca49b5 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-11-16 13:56:31 -07:00
Joakim Erdfelt fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Greg Wilkins fe1704c89a javadoc 2016-11-10 13:56:33 +11:00
Joakim Erdfelt de18e4540b Issue #1051 - RolloverFileOutputStream doesn't handle DST properly 2016-11-07 09:55:09 -07:00
Jesse McConnell 9a6f68be78 Merge branch 'release-9.3.14' into jetty-9.3.x 2016-11-07 10:45:04 -06:00
Greg Wilkins c6436c34ad Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-03 16:56:21 +11:00
Greg Wilkins 3dc2637d21 Issue #1063 Accept empty host 2016-11-03 15:06:32 +11:00
Jan Bartel 7790234589 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-02 15:42:03 +11:00
Jan Bartel ca882c8dee Issue #240
No error if no parts because input stream already consumed.
2016-11-02 15:40:59 +11:00
Joakim Erdfelt 2c38511828 Updating to version 9.3.15-SNAPSHOT 2016-10-28 13:01:34 -07:00
Joakim Erdfelt 14611d2f76 Updating to version 9.3.14.v20161028 2016-10-28 12:21:02 -07:00
Jan Bartel da853574f6 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-28 14:41:37 +11:00
Jan Bartel 6f6ccdf061 480764 Add extra tests for empty multipart. 2016-10-28 14:41:05 +11:00
Simone Bordet c6ad87c3f9 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-27 16:55:12 +02:00
Simone Bordet 8cefaba2a4 Allow process() to throw Throwable, which we catch anyway. 2016-10-27 15:43:12 +02:00
Greg Wilkins 726fcd814c fixed simple-impl naming #1023 2016-10-22 10:56:50 +11:00
Greg Wilkins 9569ff64c9 removed unnecessary dependency #1020 2016-10-22 10:34:14 +11:00
Greg Wilkins 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
Jan Bartel d3deeff32c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-20 12:39:33 +11:00
Greg Wilkins d7b781574d Improve logging modules and listing #984
All logging modules log to stderr
2016-10-20 10:57:56 +11:00
Greg Wilkins 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
Joakim Erdfelt 93741c32a8 Merge branch 'jetty-9.4.x' 2016-10-19 16:17:36 -07:00
Greg Wilkins 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
Joakim Erdfelt 4dfd3fad73 Fixing log4j.properties -> log4j.xml 2016-10-19 14:24:54 -07:00
Joakim Erdfelt 15d00767a5 Using ${jetty.logging.dir} consistently 2016-10-19 14:23:54 -07:00
Joakim Erdfelt 36d75d4c4f Merge branch 'jetty-9.4.x' 2016-10-19 10:59:28 -07:00
Joakim Erdfelt d9054d24b3 Issue #984 - minor cleanup, consistency across all modules
+ Also correcting filename jcl-simple-impl.mod
2016-10-19 10:25:44 -07:00
Simone Bordet 6db48b2f02 Merged branch 'jetty-9.4.x' into 'master'. 2016-10-19 16:35:36 +02:00
Simone Bordet 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
Simone Bordet ae240b9c17 Fixed properties in *.mod and *.xml for module console-capture. 2016-10-19 11:44:13 +02:00
Greg Wilkins 631437060b Improve logging modules and listing #984
Improved logging dependencies
2016-10-19 17:29:39 +11:00
Greg Wilkins a32923b66e Improve logging modules and listing #984
added jul-slf4j
updated logging dependencies
2016-10-19 16:25:18 +11:00
Greg Wilkins 08be6aca91 Improve logging modules and listing #984
renamed simple implementation modules.
2016-10-19 16:25:18 +11:00
Greg Wilkins 7bbfd618e3 Improve logging modules and listing #984
Used the term 'logging binding' instead of 'logging bridge'
2016-10-19 16:25:18 +11:00
Greg Wilkins 9cdfdf34a7 Improve logging modules and listing #984
renamed stderout-capture to console-capture
2016-10-19 16:25:18 +11:00
Simone Bordet 39f47244fa Merged branch 'jetty-9.4.x' into 'master'. 2016-10-17 15:36:32 +02:00
Joakim Erdfelt ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Greg Wilkins b11757a1e2 Issue #984 Improve module listing
Fixed cycle in logging from gcloud datastore
2016-10-14 15:42:12 +11:00
Greg Wilkins 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
Greg Wilkins 91f708b9f6 Issue #984 Improve module listing
Use stderrout-logging for jcl-impl
2016-10-14 08:26:41 +11:00
Greg Wilkins cfed44fa7d Issue #984 Improve module listing
Made jul-impl a dependency of logging-jul
2016-10-14 08:18:15 +11:00
Greg Wilkins 85e87322fb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-13 16:37:51 +11:00
Greg Wilkins fa3603a739 Issue #984 Improve module listing
Logback file handler
2016-10-13 16:37:24 +11:00
Greg Wilkins 0966036fbc Issue #984 Improve module listing
Fixed server classes property
2016-10-13 16:37:24 +11:00
Greg Wilkins 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
Jan Bartel 6489d7fd23 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-11 18:00:12 +11:00
Greg Wilkins 0142bcde8f Issue #984 Improve module listing
renamed verbose to internal module tag
2016-10-07 20:27:38 +11:00
Greg Wilkins d8b1c88abc Issue #984 Improve module listing
Reworked logging modules
added support for ,= and += properties
2016-10-07 12:48:47 +11:00
Simone Bordet bcc29de3eb Merged branch 'jetty-9.4.x' into 'master'. 2016-10-06 16:37:43 +02:00
Greg Wilkins 539a209bef Issue #984 Improve module listing
added verbose tags
2016-10-06 19:16:23 +11:00
Greg Wilkins 91e9e7b76a Issue #984 Improve module listing 2016-10-06 17:01:08 +11:00
Greg Wilkins 84f7fc31cb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-06 12:01:50 +11:00
Greg Wilkins 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
Jesse McConnell 863913b64e set for dev 2016-09-30 19:05:47 +00:00
Jesse McConnell b91cc8a4ea set for release 2016-09-30 18:01:20 +00:00
Simone Bordet 308bfd9b91 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-30 18:11:05 +02:00
Simone Bordet 285f283e5b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-30 18:09:58 +02:00
Simone Bordet 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
Simone Bordet 7471f5c8f2 Code cleanup. 2016-09-30 17:47:52 +02:00
Simone Bordet 8dc18fe088 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-28 11:56:24 +02:00
Simone Bordet 7e376fd9da Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-28 11:53:54 +02:00
Simone Bordet 0f97c3df5d Fixes #966 - Remove usages of ConcurrentArrayQueue. 2016-09-28 11:40:39 +02:00
Simone Bordet efe339e246 Code cleanup. 2016-09-28 11:40:39 +02:00
Joakim Erdfelt b0880f617a Merge branch 'release-9.3.12' into jetty-9.3.x 2016-09-20 14:39:08 -07:00
Joakim Erdfelt 6cf10172ca Updating to version 9.3.13-SNAPSHOT 2016-09-15 07:34:52 -07:00
Joakim Erdfelt 8b35fdc5a5 Updating to version 9.3.12.v20160915 2016-09-15 06:48:16 -07:00
Simone Bordet 9835598727 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-15 12:18:02 +02:00
Simone Bordet 1f4bb58ef4 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-15 12:17:33 +02:00
Simone Bordet 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
Simone Bordet 9e01565344 Code cleanups. 2016-09-15 12:11:11 +02:00
Simone Bordet c87c04e7f0 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-14 16:45:01 +02:00
Simone Bordet 5ec60a30ed Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-14 16:44:39 +02:00
Simone Bordet 571b0c74c5 Implemented PromiseWrapper's succeeded() and failed() methods. 2016-09-14 14:01:30 +02:00
Jan Bartel 44fa57b38a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-09 16:39:16 +10:00
Greg Wilkins 3cd52fda04 Issue #572 Javadoc 2016-09-09 14:11:16 +10:00
Joakim Erdfelt fb7da26ad2 Updating to version 9.2.20-SNAPSHOT 2016-09-08 13:04:11 -07:00
Joakim Erdfelt 7b94bc32f4 Updating to version 9.2.19.v20160908 2016-09-08 12:11:44 -07:00
Greg Wilkins 8128f57020 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-08 10:40:07 +10:00
Greg Wilkins f703d2ad38 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-08 10:39:27 +10:00
Greg Wilkins 3a42455411 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-08 10:38:54 +10:00
Greg Wilkins ada58ea65a javadoc 2016-09-08 10:35:57 +10:00
Greg Wilkins 28ca70378e Issue #844 Thread Limit Handler (#857)
* Issue #844 DoS Handler

First cut at implementation of Thread limiting handler for #844

* Added modules, simplified API, added IP exemptions

* fixed xml

* fixed preallocation

* simplified code
2016-09-08 08:49:03 +10:00
Simone Bordet bdf26da0c0 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-05 23:12:44 +02:00
Simone Bordet e21ad09e3a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-05 23:09:12 +02:00
Simone Bordet 89b20b4692 Merged branch 'jetty-9.3.x-845'. 2016-09-05 21:36:04 +02:00
Simone Bordet 705a68dfc4 Issue #845 - Improve blocking IO for data rate limiting.
Moved tests to run HTTP and HTTP/2 tests, and added more test cases.
2016-09-05 19:13:05 +02:00
Jan Bartel 0d6667dc9f Issue #894 2016-09-02 13:50:25 +10:00
Greg Wilkins f208b1d46f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-01 17:39:35 +10:00
Greg Wilkins 095a71f11d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-01 17:39:08 +10:00
Greg Wilkins aeeab8d5bb Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-01 17:38:40 +10:00
Greg Wilkins d43b9af428 fix javadoc 2016-09-01 17:38:09 +10:00
Greg Wilkins ec5dd51fe1 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-01 16:44:32 +10:00
Greg Wilkins 718c8e2444 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-01 16:44:03 +10:00
Greg Wilkins a799b21eb3 fixed merge 2016-09-01 16:41:49 +10:00
Greg Wilkins c2621bcad6 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-01 16:29:00 +10:00
Greg Wilkins f7c32c5fc7 Issue #882 IPv6 map
The new IPv6 capable InetAddressSet has been added as an alternative for IPAddressMap
The IncludeExclude class has been generalized to IncludeExcludeSet that can have a different
Predicate type to the set type and this works well with InetAddressSet.

However for #881 and #883, this may not be enough and Map semantics may need to be added.

The IPAccessHandler also has path mappings supported, which could need the map semantics, so for now a new InetAccessHandler has been
added that just uses an IncludeExcludeSet<InetAddressSet>, but this has yet to be tested.

The AbstractProxyServlet uses a host:port combinations, so IncludeExcludeSet<InetAddressSet> is not directly applicable.
2016-09-01 16:12:35 +10:00
Joakim Erdfelt 544686255c Merge branch 'jetty-9.4.x' 2016-08-31 10:19:02 -07:00
Greg Wilkins 5ab9846ac5 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-31 20:32:54 +10:00
Simone Bordet e0c83757aa Fixes #889 - ConstantThrowable.name can be removed. 2016-08-31 12:25:19 +02:00
Greg Wilkins f856107301 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-31 19:05:57 +10:00
Greg Wilkins 0155ae761c Issue #880 Improve IPv6 support
For #880 added the HostPort class, which was used to fix #878, #879, #884 and #886
2016-08-31 16:46:11 +10:00
Jan Bartel c78e0b7565 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-31 16:30:31 +10:00
Jan Bartel 088f19704a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-31 16:30:00 +10:00
Jan Bartel 34d465555b Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-31 16:23:06 +10:00
Grzegorz Grzybek b70f0fdf15 Issue #868 - Use static Throwables without backtrace/stackTrace
Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
2016-08-26 10:44:23 +02:00
Simone Bordet 2d5078cc24 Merged branch 'jetty-9.4.x' into 'master'. 2016-08-19 01:48:29 +02:00
Simone Bordet 8de4751c6f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-19 01:47:41 +02:00
Simone Bordet b316148625 Fixed test failure. 2016-08-19 01:44:14 +02:00
Joakim Erdfelt 692bd60844 Merge branch 'jetty-9.4.x' 2016-08-18 14:42:13 -07:00
Joakim Erdfelt 196f5eeb96 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-18 14:30:48 -07:00
Joakim Erdfelt 24b4aeb147 Fixes #854 - other testcase triggers ISE on .destroy() -> .start() as well 2016-08-18 14:30:11 -07:00
Simone Bordet f0cf67348b Merged branch 'jetty-9.4.x' into 'master'. 2016-08-18 15:48:22 +02:00
Simone Bordet 66c3603050 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-18 15:47:41 +02:00
Simone Bordet 10f994a0a2 Fixes #854 - If container.destroy() is called, calling container.start() again should throw an IllegalStateException. 2016-08-18 15:47:06 +02:00
Simone Bordet 7a7d5e2f1e Code cleanup. 2016-08-18 15:47:06 +02:00
Simone Bordet f488bd4118 Merged branch 'jetty-9.4.x' into 'master'. 2016-08-17 21:50:39 +02:00
Simone Bordet deef53467d Fixes #855 - JMXify MBeanContainer. 2016-08-17 21:44:35 +02:00
Simone Bordet 00a065b064 Fixes #855 - JMXify MBeanContainer. 2016-08-17 21:28:19 +02:00
Greg Wilkins 07f547782f Cleanup metadata and HttpURI usage 2016-08-10 16:28:05 +10:00
Simone Bordet 7bb0a00ff4 Merged branch 'jetty-9.4.x' into 'master'. 2016-08-08 23:25:54 +02:00
Simone Bordet 1a88dfa8c0 Code cleanups. 2016-08-08 23:22:51 +02:00
Greg Wilkins 5cb50e5f5d ignore PathResource test 2016-08-04 14:02:16 +10:00
Greg Wilkins e33b549c7f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-03 18:49:48 +10:00
Greg Wilkins d0101dc81a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-03 18:01:42 +10:00
Greg Wilkins a1885afff8 fix #804 by removing old javadoc reference to org.eclipse.jetty.util.URI.charset 2016-08-03 09:17:15 +10:00
Joakim Erdfelt 2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Greg Wilkins 7d4a509462 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-28 18:45:47 +10:00
Greg Wilkins 1f949d509b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-28 18:18:11 +10:00
Greg Wilkins 35c21d7ced Utility improvements
Add Arrays
XML config get class
2016-07-28 16:50:12 +10:00
Joakim Erdfelt 6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt 9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
Joakim Erdfelt 0b18340179 Updating to version 9.2.19-SNAPSHOT 2016-07-21 13:10:23 -07:00
Joakim Erdfelt d3ff3423f0 Updating to version 9.2.18.v20160721 2016-07-21 12:35:26 -07:00
Simone Bordet 8f5985e0e1 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-21 18:16:01 +02:00
Simone Bordet 823ba4add6 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 18:15:38 +02:00
Greg Wilkins b8b9d222eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-21 16:50:27 +10:00
Greg Wilkins f902181a83 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-21 13:02:57 +10:00
Greg Wilkins 21a618e6a8 SLOTH protection #631
Exclude all MD5 and SHA1 ciperhs, not just RSA based ones.
2016-07-21 12:39:07 +10:00
Simone Bordet 20b774cc25 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-14 12:44:55 +02:00
Simone Bordet d976b4d36a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-14 12:44:15 +02:00
Greg Wilkins f6071ca7fc Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized 2016-07-14 18:26:51 +10:00
Greg Wilkins 35a64828fb Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized 2016-07-14 15:17:50 +10:00
Jan Bartel 868eb50625 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-14 14:12:12 +10:00
Greg Wilkins f5d59cacca Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-14 14:04:21 +10:00
Greg Wilkins 112244d6ef Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized 2016-07-14 13:44:49 +10:00
Greg Wilkins 45bbde408f Fix #708 SslContextFactory: newSslServerSocket/newSslSocket/doStart are not customized 2016-07-14 12:17:52 +10:00
Jan Bartel 700d051587 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-13 15:32:58 +10:00
Jan Bartel 6628a42d5d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-13 15:32:03 +10:00
Jan Bartel 37cda79f7b Issue #720 2016-07-13 15:28:33 +10:00
Greg Wilkins 2ee64a8d56 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-07 11:49:00 +10:00
Greg Wilkins 8675c17d92 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 11:46:38 +10:00
Greg Wilkins 322fe73869 Suppress stacks during sweeper test 2016-07-07 08:32:36 +10:00
Greg Wilkins 40f816256b Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-06 16:48:33 +10:00
Greg Wilkins c9e6141844 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-06 16:47:58 +10:00
Greg Wilkins fc36e45795 Support UNC paths in PathResource #669
Also-by: Marco Signorini <m.signorini@iontrading.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-07-06 16:46:22 +10:00
Greg Wilkins 5b50e41e7e Issue #687
Alias should be absolute not relative
2016-07-06 16:46:22 +10:00
Jan Bartel c3da8b27eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-06 13:43:52 +10:00
Greg Wilkins f058054cbe Issue #644 Modules for logging
Added slf4j-jul
2016-07-06 12:14:22 +10:00
Joakim Erdfelt c4f6d3503e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-29 15:11:55 -07:00
Joakim Erdfelt d13d3cc3f5 Fixes #675 - Slf4jLog.ignore() now logs at DEBUG level 2016-06-29 15:11:46 -07:00
Joakim Erdfelt 2dfb5f463a Fixes #677 - Logging of ignore() events now show as "Ignored Exception" 2016-06-29 15:11:37 -07:00
Joakim Erdfelt a5dc01bbb1 Fixes #676 - JavaUtilLog.ignore() logs at FINEST level now 2016-06-29 15:11:28 -07:00
Joakim Erdfelt 3d988c9ff8 Fixes #675 - Slf4jLog.ignore() now logs at DEBUG level 2016-06-29 15:10:01 -07:00
Joakim Erdfelt e2058f9787 Fixes #677 - Logging of ignore() events now show as "Ignored Exception" 2016-06-29 15:08:44 -07:00
Joakim Erdfelt dbc8352aa6 Fixes #676 - JavaUtilLog.ignore() logs at FINEST level now 2016-06-29 15:07:43 -07:00
Joakim Erdfelt ed8310dbff Merge branch 'jetty-9.4.x' 2016-06-28 13:48:12 -07:00
Joakim Erdfelt ac90d2b562 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-28 13:47:54 -07:00
Joakim Erdfelt b20e2ddf18 Fixes #672 - Allow logging configuration announcement to be programmatically disabled 2016-06-28 13:01:16 -07:00
Jan Bartel ef65639674 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-24 16:22:23 +10:00
Greg Wilkins 26276575e7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-24 15:40:21 +10:00
Greg Wilkins 7df3b83a8e Issue #644 Modules for logging
Added logback classic modules
2016-06-24 14:42:34 +10:00
Greg Wilkins 0e0fc77771 skip symlink test on windows 2016-06-24 14:33:18 +10:00
Simone Bordet 237502932a Merged branch 'jetty-9.4.x' into 'master'. 2016-06-23 13:04:06 +02:00
Greg Wilkins 0239d6390f Issue #644 Modules for logging
module for direct slf4j to log4j2 bridge
2016-06-23 15:32:18 +10:00
Greg Wilkins 501b8e9dca Issue #644 Modules for logging
Added log4j2.xml configuration
Added jetty-log4j2 mapping module
2016-06-23 15:21:34 +10:00
Jan Bartel f1d9cf89a4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-23 12:04:59 +10:00
Greg Wilkins e4eafd0fee Issue #644 Modules for logging
parameterized logging versions
2016-06-23 09:54:28 +10:00
Greg Wilkins 80903c5ab1 Issue #644 Modules for logging
Added a jetty-log4j module that depends internally on slf4j
2016-06-23 08:38:29 +10:00
Jesse McConnell ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell 2b947e8f72 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 13:22:27 -05:00
Joakim Erdfelt 0a196e2123 Merge branch 'jetty-9.4.x' 2016-06-22 10:43:58 -07:00
Joakim Erdfelt 8157a4533c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-22 10:43:43 -07:00
Joakim Erdfelt cce7837e64 Fixes #654 - ServletContext.getResourceAsStream("/") should return null
+ Jetty 9.2 (and earlier) used a Resource.getInputStream() implementation
   that would trigger an IOException on-construction (vs on-first-access)
   due its use of java.io.FileInputStream(File) which had a isDirectory
   check in its constructor.
 + Jetty 9.3 and onward uses java.nio.file.Files.newInputStream() which
   has the bad on-first-access behavior.
 + Changing the behavior of PathResource.getInputStream() to behave the
   same way as the prior FileResource.getInputStream(), as well as adding
   the Resource.isDirectory() check back into ContextHandler.getResourceAsStream(String)
   to prevent creation of the InputStream in the first place.
2016-06-22 09:09:05 -07:00
Jesse McConnell 030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell 9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell 16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Greg Wilkins 7a8edef808 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-17 23:33:45 +10:00
Greg Wilkins d05c282baa Issue #644 Modules for enabling logging
Improved descriptions
2016-06-17 23:33:26 +10:00
Jan Bartel 003e9cd302 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-17 15:54:02 +10:00
Greg Wilkins d79b0a7acd Issue #644 Modules for enabling logging
Separated modules for jetty logging
Added JCL
2016-06-17 14:57:25 +10:00
Jan Bartel 1e7b866d6f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-17 13:36:56 +10:00
Greg Wilkins 07b0127587 Issue #644 rename module 2016-06-17 07:42:57 +10:00
Greg Wilkins 2fbf466393 Issue #644 Modules for enabling logging 2016-06-17 07:39:11 +10:00
Greg Wilkins 8dd61c6d1c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-15 18:07:01 +10:00
Greg Wilkins e607acfa4e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-15 18:06:32 +10:00
Greg Wilkins a8e315a3f5 Fix #663 NPE during context stop
Avoid adding null beans
protect against null beans.
2016-06-15 18:04:33 +10:00
Jan Bartel 29fcd50354 Issue #632
Fix jetty version number
2016-06-10 16:53:52 +10:00
Simone Bordet a300ffdc0f Merged branch 'jetty-9.4.x' into 'master'. 2016-06-03 18:03:51 +02:00
Jesse McConnell 16f3ea82c1 fix javadoc 2016-06-03 09:45:10 -05:00
Greg Wilkins 502f27f43e Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-06-03 16:22:17 +10:00
Greg Wilkins 723563aa84 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-03 16:21:48 +10:00
Greg Wilkins a2309057dc Test Harness for #596
Test harness to try to repeat problem with #596 of content-length added to a HEAD response.

In the process added a much better getResponse mechanism to the local connector that avoids
using the idle time.
2016-06-03 14:15:25 +10:00
Greg Wilkins 98c328fb23 Jetty 9.4.x 572 (#614)
* Issue #572 Scheduling Strategy Deadlocks

Implemented dual strategy idea from #572 discussion

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* fixed http2 strategy choice

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* code cleanups

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* clean up seelctor actions/products

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* cleanups
2016-06-03 09:07:00 +10:00
Jesse McConnell dc4574f380 [maven-release-plugin] prepare for next development iteration 2016-05-17 17:30:17 -05:00
Jesse McConnell 0bbebec1e0 [maven-release-plugin] prepare release jetty-9.3.9.v20160517 2016-05-17 17:30:13 -05:00
Jesse McConnell d5c6793e6a [maven-release-plugin] prepare for next development iteration 2016-05-17 15:33:46 -05:00
Jesse McConnell 0bab7e6616 [maven-release-plugin] prepare release jetty-9.2.17.v20160517 2016-05-17 15:33:42 -05:00
Joakim Erdfelt 6c47951fae Merge branch 'jetty-9.4.x' 2016-05-13 11:59:17 -07:00
Joakim Erdfelt 8305125df0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-13 11:59:02 -07:00
Joakim Erdfelt 97af3d663f Fixes #556 - Improve Resource.getAlias() checks on Windows
+ Reworks PathResource and FileResource alias checking to
  use originally passed paths, before Windows JVM has a
  chance to normalize and "correct" the bad paths.
2016-05-13 11:57:23 -07:00
Greg Wilkins 8754344ea2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-13 11:22:40 +10:00
Greg Wilkins d2b0daefb4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-13 11:21:50 +10:00
Greg Wilkins 0a1f4ac98c Issue #570
Encoding mechanism was based on if the first encodable character found was unicode or not.  Changed to not be
order dependent!
2016-05-13 10:52:49 +10:00
Simone Bordet 3e3e891636 Merged branch 'jetty-9.4.x' into 'master'. 2016-05-12 19:31:19 +02:00
Simone Bordet 922319c3a3 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-12 19:30:50 +02:00
Simone Bordet 51dd5c902c Fixed Javadoc. 2016-05-12 19:07:06 +02:00
Simone Bordet 242b6b5f66 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-05-12 18:59:40 +02:00
Simone Bordet 1937701127 Merged branch 'jetty-9.4.x' into 'master'. 2016-05-12 00:22:56 +02:00
Simone Bordet 2a4cbdd111 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-12 00:22:31 +02:00
Simone Bordet 016fc6569f Fixes #558 - HTTP/2 server hangs when thread pool is low on threads.
Modified ExecuteProduceConsume to test for Rejectable tasks when
trying to execute a task in low threads mode, and if so, reject them
immediately.
2016-05-12 00:13:35 +02:00
Simone Bordet 2c787bbc05 Merged branch 'jetty-9.4.x' into 'master'. 2016-05-11 13:57:32 +02:00
Simone Bordet d8961139f3 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-11 13:57:08 +02:00
Simone Bordet 1fc40864e1 Issue #558 (HTTP/2 server hangs when thread pool is low on threads).
Verify that rejecting tasks avoids hanging the server when in low
threads mode.
2016-05-11 13:05:16 +02:00
Simone Bordet 509e1f0f93 Fixes #557 (Review ThreadPool.isLowOnThreads()).
Updated the isLowOnThreads() formula with a more conservative one,
introducing lowThreadsThreshold parameter to tune it.
2016-05-11 13:05:16 +02:00
Simone Bordet f47b6811b4 Improved javadocs and JMX descriptions. 2016-05-11 13:05:16 +02:00
Simone Bordet d9c9e4a399 Issue #557 (Review ThreadPool.isLowOnThreads())
Updated isLowOnThreads() to take into account also the number of idle
threads, so that it now returns true if the number of idle threads <= 1.
2016-05-11 13:05:16 +02:00
Simone Bordet fe8102a430 Cosmetics. 2016-05-11 13:05:16 +02:00
Simone Bordet 30fd8323f4 Added jobs to detailed dump. 2016-05-11 13:05:16 +02:00
Simone Bordet 5af72ed1fc Merged branch 'jetty-9.4.x' into 'master'. 2016-05-06 17:44:16 +02:00
Simone Bordet 9a5d8f3943 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-06 17:43:49 +02:00
Simone Bordet caa45283c7 Fixes #547 (ExecuteProduceConsume (EWYK) does not exit low threads mode)
Exposed getters/setters for ExecutionStrategy.Factory in
ServerConnector and SelectorManager, to allow explicit configuration
and testing.

Added test to verify that EPC exits low threads mode.
2016-05-06 17:10:46 +02:00
Simone Bordet 903a6cb49c Expanded static imports. 2016-05-06 17:10:46 +02:00
Greg Wilkins 13d9263d78 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-05 11:37:29 +10:00
Greg Wilkins 15480a7c94 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-05 11:37:00 +10:00
Greg Wilkins c77df55bb6 Issue #547 EWYK leaves low resource mode
Merged code cleanups
2016-05-05 11:35:32 +10:00
Greg Wilkins 6591137ba0 Issue #547 EWYK leaves low resource mode
Directly implement PEC in EPC low resource mode
2016-05-05 11:22:37 +10:00
Joakim Erdfelt 43ba169b43 Fixing broken javadoc 2016-05-04 13:35:15 -07:00
Simone Bordet 3decd95de9 Merged branch 'jetty-9.4.x' into 'master'. 2016-05-04 11:48:51 +02:00
Simone Bordet 4d4ecfd5cf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-04 11:47:54 +02:00
Simone Bordet e6e63d5549 Code cleanups. 2016-05-04 11:46:59 +02:00
Simone Bordet a0bd9d3887 Fixes #546 (Guard concurrent calls to ExecutionStrategy.execute())
Guarded invocations to execute() with a state change.
2016-05-04 11:43:50 +02:00
Greg Wilkins 1c292819fe Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-05-04 11:45:23 +10:00
Greg Wilkins a5d3f29f11 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-04 11:10:03 +10:00
Greg Wilkins 90110659e2 fixed javadoc 2016-05-04 10:49:22 +10:00
Greg Wilkins 3066880cd2 fixed bad merge 2016-05-04 09:53:00 +10:00
Joakim Erdfelt 9c5beaad4f Merge branch 'jetty-9.4.x' 2016-05-03 11:36:42 -07:00
Joakim Erdfelt 86bf31aad7 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-03 11:36:25 -07:00
Joakim Erdfelt 2dbecb0843 Fixing broken javadoc 2016-05-03 11:23:10 -07:00
Joakim Erdfelt 114ac79808 Merge branch 'jetty-9.4.x' 2016-05-02 09:53:02 -07:00
Joakim Erdfelt 932e0125d2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-02 09:51:24 -07:00
Joakim Erdfelt ff1ca8d993 Limiting versions that trigger !STABLE warning
+ Only RC# and M# trigger warning now.
+ Warning includes URL for where to download stable version.
2016-05-02 09:50:05 -07:00
Greg Wilkins a5ad291add Squashed commit of the following: (#528)
commit 4bf6b7c951
Merge: a50e882 301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 27 12:12:08 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 23 09:38:00 2016 +1000

    work in progress

commit 4e286266c0
Merge: 5ae7da0 f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 16:34:12 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 21 12:12:24 2016 +1000

    Work in progress on Features

commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 22:05:55 2016 +1000

    Refactor Configurations.isEnabledByDefault, enable all configurations by default.

commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date:   Wed Apr 20 17:32:22 2016 +1000

    Fix features for jsp with osgi

commit 22d2b251e9
Merge: 571d503 2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Apr 14 16:19:43 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Apr 13 15:36:36 2016 +1000

    code comment

commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Apr 9 21:24:22 2016 +1000

    fixed quickstart validation

commit 154d58bf62
Merge: 8e54aad ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:25:17 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 18:21:30 2016 +1000

    general cleanup of Configuration and ClasspathPattern usage

commit 65f8e5dbd0
Merge: ea1deda 2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Apr 8 09:15:28 2016 +1000

    Merge branch 'master' into jetty-9.4.x-Feature

commit ea1deda4f9
Merge: cfe9c83 f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 18:21:56 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 17:57:23 2016 +1100

    work in progress

commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Mar 15 10:11:49 2016 +1100

    work in progress

commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 14:01:00 2016 +1100

    progress on OSGi

commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:52:33 2016 +1100

    Fixed plugin

commit f08b84ba0e
Merge: f19bd2c 8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:55 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 11 12:21:06 2016 +1100

    work in progress... all but OSGi

commit 2f15c3e4f9
Merge: 36b5687 7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 16:52:43 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 36b5687329
Merge: 13d914a e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 07:20:05 2016 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Mar 10 04:41:30 2016 +1100

    Work in progress on Features

    Moved jar discovery to META-INF

commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 17:48:15 2016 +0100

    Work in progress towards new quickstart arch

commit c5c23698c4
Merge: fd34007 692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:29:18 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Mar 5 11:04:35 2016 +0100

    Work in progress on Features for QuickStart

commit c5f0c80cd2
Merge: 0e6d886 b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Mar 4 16:05:23 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 0e6d886b01
Merge: d150405 2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 17:32:36 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit d1504055de
Merge: 22a6cd0 3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Mar 2 15:21:20 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 20:53:17 2016 +0100

    Features work in progress

    convert more server/system classes to Configurations

commit 037e04bfe5
Merge: add9876 bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Feb 29 17:11:04 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit add9876f83
Merge: 5263f15 eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Feb 25 10:11:08 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5263f15acd
Merge: 89803ae 21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 23 14:35:31 2016 +0100

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

commit 89803aec95
Merge: 5fed7c7 779317d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 16:09:38 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 11:21:13 2016 +0100

    fixed merge

commit ec22a1ba0b
Merge: 4c8257d d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Feb 16 10:53:16 2016 +0100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 17 09:34:28 2015 +1100

    Do not default quickstart

commit 57ce87770a
Merge: 14bde1f 96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 16 17:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 16:26:58 2015 +1100

    work in progress on Configurations as services

commit 46ce2aef3a
Merge: 9e82fa0 ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 10:11:09 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Dec 4 08:52:37 2015 +1100

    work in progress to Configurations as ServiceLoader

commit 6e11f22de4
Merge: 120e330 5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 18:16:14 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 120e33034f
Merge: 6c5b95d 384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Dec 3 14:20:52 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 6c5b95d6b8
Merge: 722eb60 5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Dec 2 11:16:37 2015 +1100

    Merge branch 'master' into jetty-9.4.x-Feature

commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 13:58:16 2015 +1100

    Configurations can add server/system classes

commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 27 11:47:03 2015 +1100

    Self ordering WebApp Configurations

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-05-02 17:55:54 +10:00
Joakim Erdfelt c09f31a51d Bumping up master to version 10.0.0-SNAPSHOT 2016-04-29 11:47:15 -07:00
Greg Wilkins 3e8187dcd5 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-29 16:58:00 +10:00
Greg Wilkins c74dd571fa Issue #519 Disable SSL session caching
Set -1 defaults for session caching
2016-04-29 08:10:18 +10:00
Greg Wilkins 88c1339784 Issue #519 Disable SSL session caching
Improve the configuration of the SSL session cache
2016-04-29 08:02:41 +10:00
Greg Wilkins 092ed57a17 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-28 08:17:45 +10:00
Greg Wilkins 5f7a32e30e warning if not stable release 2016-04-28 08:15:06 +10:00