Commit Graph

3431 Commits

Author SHA1 Message Date
Simone Bordet c3e608fae3 Fixes #1184 - IllegalStateException for HEAD requests responded with 404.
Now committing the default 404 response body early,
so that attempts to try to change the content length
will be ignored since the response is already committed.
2016-12-16 18:38:27 +01:00
Joakim Erdfelt c70fa88be0 Issue #1175 - Correcting test DispatchType 2016-12-14 12:16:53 -07:00
Joakim Erdfelt 58b8f56a36 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-14 12:15:50 -07:00
Joakim Erdfelt f91d1e01fe Issue #1175 - More realistic test of commons-fileupload behavior 2016-12-14 11:53:10 -07:00
Joakim Erdfelt f846b37cbb Issue #1175 - Adding testcase to Jetty 9.3.x 2016-12-14 10:58:36 -07:00
Simone Bordet dd3a73e57a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-12-14 11:19:49 +01:00
Simone Bordet 07c9bc5a51 Fixes #1169 - HTTP/2 reset on a stalled write does not unblock writer thread.
The fix notifies the transport when a reset frame is received,
allowing the transport to fail the write callback which then notifies
the application, either by throwing (in case of blocking writes) or
by calling error listeners.

Also added a guard, in HttpChannel.handle() for the ERROR_DISPATCH case,
that checks if the response is already committed, and if so, abort
the transport - similar to what's already there for 9.4.
2016-12-14 11:07:00 +01:00
Jesse McConnell 9f012dcd17 Merge branch 'release-9.4.0' into jetty-9.4.x 2016-12-12 09:03:57 -06:00
Jan Bartel 5d5b9c5998 Issue #1162 2016-12-12 20:24:54 +11: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 19333b8b3b Merge branch 'jetty-9.4.x' into release-9.4.0 2016-12-08 08:50:15 -06:00
Jan Bartel 4f48d7aadf Issue #1153
Refactor calcExpiry methods a little.
2016-12-08 20:15:49 +11:00
Greg Wilkins 5186c1e6d0 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-12-08 18:35:40 +11:00
Jan Bartel 51855ba45e Issue #1153 2016-12-08 17:16:27 +11:00
Jan Bartel 8e0725db1c Issue #123
Make sync on id generation more tightly scoped.
2016-12-08 11:29:13 +11: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 af5d27c2f7 Issue #1146 DecryptedEndPoint deadlock 2016-12-07 22:50:27 +11:00
Jan Bartel 4caaad7166 Issue #1142 2016-12-01 12:09:49 +11:00
Simone Bordet f70c6f790c Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-25 09:05:07 +01:00
Simone Bordet dd76ed2449 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-11-25 09:04:16 +01:00
Simone Bordet f254dbc0b6 Fixes #1130 - PROXY protocol support reports incorrect remote address. 2016-11-25 08:56:56 +01:00
Greg Wilkins dd2f9d73b6 tests cleanup 2016-11-25 14:37:19 +11:00
Greg Wilkins 0b54fa0bc7 Issue #1128 2016-11-24 15:47:11 +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 5b5a2e845b Removing commented out debug code 2016-11-23 06:05:35 -07:00
Greg Wilkins 2ef23a6725 Issue #572
Improved to the toString and dump output of connections, endpoints and channel to assist with debugging
made the SSL callbacks and runnables Invocable to avoid thread starvation.
2016-11-23 16:58:35 +11:00
Joakim Erdfelt efc227e0e4 Updates for better ThreadStarvationTests 2016-11-22 17:37:40 -07:00
Joakim Erdfelt bb428fb402 Using non-deprecated SocketChannelEndpoint 2016-11-22 16:35:56 -07:00
Joakim Erdfelt 7c90d19983 Minor updates to ThreadStarvationTest to diagnose read starvation under SSL issue 2016-11-22 15:00:13 -07:00
Joakim Erdfelt b5cd3cfca1 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-17 17:00:58 -07:00
Joakim Erdfelt fd20d46659 Issue #1062 - adding https/ssl/tls test varient to ThreadStarvationTest 2016-11-17 16:42:37 -07:00
Greg Wilkins ed14d739f3 Issue #1103 original URI trimmed 2016-11-16 23:31:03 +11:00
Jan Bartel 05f2e56aa1 Merge pull request #1093 from nevafuse/patch-3
Keep restored file if saving periodically
2016-11-16 10:53:59 +11:00
nevafuse 236571eaee only periodically save recently accessed sessions
Signed-off-by: nevafuse <nevafuse@gmail.com>
2016-11-12 22:12:56 -05:00
nevafuse e05faf77c8 keep restored file if saving periodically
Signed-off-by: nevafuse <nevafuse@gmail.com>
2016-11-12 22:11:17 -05:00
Greg Wilkins 62331ce8f0 Issue #1074 javadoc 2016-11-08 16:26:03 +11:00
Greg Wilkins a7048a325a Issue #1077
Removed concrete handle from AbstractHandler
Added AbstractHandler.ErrorDispatchHandler
cleanup context listeners
Removed vanity inlining of ScopeHandler methods

Squashed commit of the following:

commit 0f3619ac1101707de476ad9b7f7394e8de18d95f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Nov 8 10:59:55 2016 +1100

    Issue #1077

    Removed concrete handle from AbstractHandler
    Added AbstractHandler.ErrorDispatchHandler

commit 0876fee0334b9f43297f28fc4b855f447b7ee73f
Merge: 5eabad2 7716ada
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Nov 8 08:48:53 2016 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-issue-1077

commit 5eabad29a5c4d893e204cb403a1d276ea3b15281
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 7 21:15:40 2016 +1100

    Issue #1077 cleanup context listeners

commit 9edf91a386aa20a3c0af86a634b4b3dbbc8e1092
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 7 18:08:01 2016 +1100

    Issue #1077 Removed vanity inlining of ScopeHandler methods
2016-11-08 15:58:15 +11:00
Jesse McConnell 9a6f68be78 Merge branch 'release-9.3.14' into jetty-9.3.x 2016-11-07 10:45:04 -06:00
Simone Bordet 526d385a62 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-11-07 16:23:10 +01:00
Simone Bordet 998c5729ec Fixes #1072 - InetAccessHandler needs InetAddress & Path based restrictions like IPAccessHandler did.
Introduced isAllowed(InetAddress, HttpServletRequest) so that it
would be possible to make access decisions also based on request
information such as context, path, headers, etc.
2016-11-07 16:20:15 +01:00
Simone Bordet fe1aed24c0 Code cleanup. 2016-11-07 16:15:11 +01:00
Greg Wilkins d9bf635e64 removed warnings from unit test 2016-11-07 15:41:17 +11:00
Greg Wilkins 0495bb896e Issue #1074
Removed wake() call from within pollContent
Instead the EOF status is evaluated :
 - when setReadListener is called
 - when read returns -1
 - when run() is called before calling either onDataAvailable or onAllDataRead

Squashed commit of the following:

commit 6a345356998331a90e60c7ee8ee590920464c72f
Merge: 92bc0e9 60d9001
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 7 09:46:23 2016 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-issue-1074

commit 92bc0e9f3aafdce2f4aa7b2fde31affc942be042
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Nov 5 18:24:00 2016 +1100

    Issue #1074

    Do not do async IO callbacks if completed

commit ee220a12d1e6c5f6e39b4597a209c5043aa775cf
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Nov 5 16:22:55 2016 +1100

    Issue #1074

    Turned off debug
    improved proxy test to be able to run with debug on

commit e2fb0b9ef1ec422a2c82cb388820581e359234ba
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Nov 5 15:37:27 2016 +1100

    Issue #1074

    Improved test cases
    Handle early EOF

commit 3c47c022fe7e48f82e41d9a208073b64cfeb5af7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Nov 5 12:28:15 2016 +1100

    provisional implementation
2016-11-07 15:01:39 +11:00
Simone Bordet dc034e533c Removed @Ignore from test. 2016-11-05 13:08:28 +01:00
Jan Bartel ef06948790 Issue #1075 2016-11-05 13:09:16 +11:00
Greg Wilkins 6d845d37b9 Issue #586
Ignoring failing test and reopened issue
2016-11-05 11:53:25 +11:00
Simone Bordet 34d0aa3ab8 Fixed test to correctly count minimum required server threads. 2016-11-04 08:54:42 +01:00
Jan Bartel 15e2259885 Issue #1071 2016-11-04 11:44:15 +11:00
Jan Bartel f79d7cfe20 Issue #1070 2016-11-04 10:49:48 +11:00
Simone Bordet ca3af68809 Code cleanup.
Clarified with comments how the 2 execution strategies work in ManagedSelector.

Fixed computation of the minimum number of threads in Server.
2016-11-03 11:44:49 +01: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 6781a949b1 Issue#1066 Simplify HttpGeneration
Reduce the transformations needed on header fields, so they can be more often
set directly and no need to split and recombine.

The Content-Length field is added IF it is needed for framing or if it was explicitly set

The Transfer-Encoding: chunk field is used only as a hint that there is content.

Connection fields are used as is, but are checked for close and keep-alive
2016-11-03 16:55:33 +11:00
Jan Bartel 41d506fe4e Issue #1067 2016-11-03 16:21:24 +11:00
Greg Wilkins bbc21e8648 Issue #1065 Improved error message on setBufferSize 2016-11-03 15:06:32 +11:00
Jan Bartel 2d6ec3aee2 Remove unnecessary cast to DefaultSessionIdManager in Session.invalidate 2016-11-03 14:25:30 +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
Simone Bordet 69aa9d77ee Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-28 12:15:14 +02:00
Simone Bordet 206122756f Fixes #1037 - Don't execute AsyncListener.onTimeout events in spare Scheduler-Thread.
Now calling onTimeout() from pooled threads.
Restored AsyncListener test cases.
2016-10-28 12:01:39 +02:00
Greg Wilkins 3e4f7b1fbf Issue #1045 abort connections with non matching content-length 2016-10-28 15:36:19 +11:00
Simone Bordet b741b454af Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-25 15:45:56 +02:00
Simone Bordet 33eb768d69 Fixes #1029 - Restore Request.setHttpVersion().
Also cleaned up the asymmetry in MetaData between the setter
(setHttpVersion()) and the getter (getVersion()).
2016-10-25 15:45:29 +02:00
Joakim Erdfelt ac78631e4c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-10-20 09:57:49 -07:00
Joakim Erdfelt fccffdb526 Merge branch 'release-9.3.13' into jetty-9.3.x 2016-10-20 09:25:57 -07:00
Vladimir Bukhtoyarov bbce9df664 Enhancement for detection of insufficient threads (#1010)
* Issue #586 Enhancement for detection of insufficient threads

Do not count acceptors and selectors at server level if connector uses own dedicated thread pool

Signed-off-by: vladimir.bukhtoyarov <jsecoder@mail.ru>
2016-10-20 12:11:23 +02:00
Jan Bartel 6ff5a3a7e9 Issue #1017 2016-10-20 12:38:05 +11:00
Jan Bartel 0a19c13570 Issue #1014 2016-10-19 14:11:16 +11:00
Simone Bordet dc5edcac74 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-17 19:24:37 +02:00
Simone Bordet be93a1ff31 Fixes #292 - NPE in SslConnectionFactory newConnection.
ConnectionFactories may be added after the connector is started.
As such there is always the possibility that creating a new
connection fails because there is no available ConnectionFactory for
that protocol.

Rather than failing with an IllegalStateException instead of a
NullPointerException, we now check at connector start whether the
SslConnectionFactory is properly configured.
This should catch 99% of the cases, where the connector is
misconfigured, reporting the error earlier and explicitly
(connector does not start) rather later and hidden (connection cannot
 be created).
2016-10-17 19:14:01 +02:00
Simone Bordet ad8bdde4f3 Code cleanup. 2016-10-17 18:51:28 +02:00
Greg Wilkins 81d98407a4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-17 12:01:45 +11:00
Greg Wilkins 6adfc324ad remove blockfor #1009 2016-10-17 11:43:58 +11: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 cb74cb8c1f fixed racew in unit test 2016-10-14 15:40:11 +11:00
Greg Wilkins f47cc6cbc9 fixed racew in unit test 2016-10-14 08:13:59 +11:00
Simone Bordet 7e2f991cc4 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-13 11:59:02 +02:00
Simone Bordet 12e907d162 Fixes #999 - Create a Flight Recorder module. 2016-10-13 11:57:37 +02:00
Greg Wilkins c7b833c595 Issue #984 Improve module listing
Changed |= to ?= for optional property set
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
Greg Wilkins 9d475a624b Normalize tags #998 2016-10-13 10:06:17 +11:00
Jan Bartel 6e19bddc2d Issue #993 2016-10-11 17:59:38 +11:00
Greg Wilkins 0142bcde8f Issue #984 Improve module listing
renamed verbose to internal module tag
2016-10-07 20:27:38 +11:00
Simone Bordet f2061cbe60 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-06 16:33:58 +02:00
Greg Wilkins 91e9e7b76a Issue #984 Improve module listing 2016-10-06 17:01:08 +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
Simone Bordet 85f50da053 Code cleanups. 2016-10-05 09:15:33 +02:00
Greg Wilkins 4410610ef3 javadoc 2016-10-05 13:50:12 +11:00
Greg Wilkins 98bb582d45 Jetty 9.4.x http interceptor #382
* Issue #382 Request compression

Added identity HttpInput.Interceptor
Moved GZIPContentDecoder to jetty-http
Reworking interceptor and GZIPContentDecoder to avoid data copies
Completed and tested GZIPContentDecoder
Implemented GzipHttpInputInterceptor
updated GzipHandler.java
updated gzip module
use common GZIP decoder
Gzip Bomb
handle read() after empty interception
2016-10-05 13:49:20 +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 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 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
Jan Bartel 6c1f0a6b4a Issue #954 2016-09-28 18:30:33 +10:00
Simone Bordet 716c595cdf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-26 12:20:22 +02:00