Commit Graph

3574 Commits

Author SHA1 Message Date
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
Simone Bordet ad00e19328 Issue #960 - Async I/O spin when reading early EOF.
Now testing the return value of onEarlyEOF() and calling the
application when the value is true.
This means that the application can now consume the early EOF and the
spin does not happen.
2016-09-26 11:48:33 +02:00
Jan Bartel 4c131561de Issue #944 2016-09-22 18:18:40 +10:00
Jan Bartel 3359bc8548 Issue #945 2016-09-22 18:05:49 +10:00
Jan Bartel 892da7b2da Issue #927
Remove debug println.
2016-09-22 17:16:40 +10:00
Jan Bartel bc4e65ebf2 Issue #941
Return scavenge to on-by-default; make value for scavenge property in session.mod same as default in id-manager.xml.
2016-09-22 17:10:30 +10:00
Jan Bartel 133d584b94 Issue #941
Make scavenger thread able to be disabled.
2016-09-22 17:10:30 +10:00
Jan Bartel a21434f289 Issue #914
Expose SessionHandler in SessionContext.
2016-09-21 15:25:01 +10:00
Greg Wilkins b164298b99 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-21 14:01:27 +10:00
Greg Wilkins 4fca2bf8af Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-21 14:00:49 +10:00
Greg Wilkins 534fb8c427 Reset Response buffer size #940 2016-09-21 12:37:58 +10:00
Joakim Erdfelt b0880f617a Merge branch 'release-9.3.12' into jetty-9.3.x 2016-09-20 14:39:08 -07:00
Simone Bordet ef9b887ab5 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-16 11:35:33 +02:00
Simone Bordet 9848b33ec9 Fixes #915 - The jetty-maven-plugin:stop goal doesn't stop everything completely.
Closing the serverSocket when exiting ShutdownMonitorRunnable.
2016-09-16 11:33:21 +02:00
Simone Bordet f7816a6ea4 Improved logging. 2016-09-16 10:31:01 +02:00
Jan Bartel a825bab8ca Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-16 11:33:58 +10:00
Jan Bartel 5efb6d698a Merge pull request #928 from nevafuse/patch-1
add schema variables
2016-09-16 10:52:01 +10:00
nevafuse 0634882b7c prevent needing analyze privilege when using getIndexInfo
Signed-off-by: nevafuse <nevafuse@gmail.com>
2016-09-15 16:41:33 -04:00
nevafuse 459abd144e add schema variables
Signed-off-by: nevafuse <nevafuse@gmail.com>
2016-09-15 16:41:11 -04: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 14e000428f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-14 17:26:00 +02:00
Simone Bordet cb89ea8466 Fixes #131 - Improve Connector Statistic names and values.
Removed references to deprecated ConnectorStatistic in favor of
ConnectionStatistics.
2016-09-14 17:24:45 +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 2111775cb4 Fixes #131 - Improve Connector Statistic names and values. 2016-09-14 14:01:30 +02:00
Greg Wilkins ea08a6db72 Issue #911
Fix spec compliance, return HttpServletRequest.getContextPath as encoded.
2016-09-14 18:28:02 +10:00
Jan Bartel 79f276857c Issue #914
Regularize jdbc session property names.
2016-09-14 16:41:50 +10:00
Jan Bartel beecdd0a0d Issue #914
Regularize property names for file session store.
2016-09-14 16:05:58 +10:00
Greg Wilkins b6a39cf7d3 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-09 10:13:38 +10:00
Greg Wilkins 68340a94d0 Issue #911 encode requestURI in startAsync(req,res) 2016-09-09 10:12:08 +10:00
Greg Wilkins ab579d542b Issue #911 encode requestURI in startAsync(req,res) 2016-09-09 10:12:08 +10:00
Greg Wilkins e9613785f4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-09 09:21:13 +10:00
Greg Wilkins 4312995d89 Issue #911 encode requestURI in startAsync(req,res) 2016-09-09 09:19:01 +10:00
Greg Wilkins ebec811427 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-09 09:10:48 +10:00
Greg Wilkins 1247380976 Issue #911 encode requestURI in startAsync(req,res) 2016-09-09 09:09:51 +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 a6512c991b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-08 15:03:10 +10:00
Greg Wilkins f7d017ca1a Issue #911 encode requestURI in startAsync(req,res) 2016-09-08 15:00:54 +10:00
Jan Bartel 3bb9fe86d3 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-08 14:26:45 +10:00
Jan Bartel 09da3248e5 Issue #909 2016-09-08 14:24:29 +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 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 d116385d6a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-05 23:28:35 +02:00
Simone Bordet 9d72e0d94e Improved JMX attributes. 2016-09-05 23:28:15 +02:00
Simone Bordet beb5c52609 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-05 23:15:26 +02:00
Simone Bordet 08bf15634a Updated copy constructor. 2016-09-05 23:14:26 +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
Greg Wilkins 25574d2843 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-02 14:57:44 +10:00
Greg Wilkins 1f7c5a5b20 Issue #898
Added addCSV method to HttpFields to more efficiently add values to a CSV field without duplicates.
Improved usage of QuotedCSV and removed older parsing

Used new method in GazipHttpOutPutInterceptor to avoid duplicate Vary fields
2016-09-02 14:57:13 +10:00
Greg Wilkins 0c6c11d79d Issue #897
If a request is not handled within the scope of the GzipHandler, the gzip interceptor is removed so it cannot be used by any subsequent handlers.
If the request is handled, it is left in place to be used by any async handling.
2016-09-02 12:14:23 +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
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
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
Jesse McConnell 174a3bc9be merge 9.3.x 2016-08-26 14:35:49 -05:00
Simone Bordet 0322a1640d Code cleanup. 2016-08-26 12:49:31 +02:00
Simone Bordet 2389b65578 Code cleanup. 2016-08-26 10:45:04 +02:00
Joakim Erdfelt 4c5d0319b1 Minor code cleanup
+ Changed variable from rfc7230 to rfc7239
+ Javadoc updates
2016-08-25 11:40:51 -07:00
Jan Bartel 9aa0371188 Fix javadoc comments 2016-08-18 13:23:38 +10:00
Jan Bartel 4ac821d582 Updates to session javadoc 2016-08-18 11:20:45 +10:00
Greg Wilkins 5528dc60f5 Issue #845 data rate limits
Converted to long minimum data rather than the numerically sensitive data rate.
2016-08-17 17:24:57 +10:00
Greg Wilkins 19a20a486d ssue #845 data rate limits
double
2016-08-17 07:11:36 +10:00
Greg Wilkins a60fe5e523 Issue #845 data rate limits
use nanotime
2016-08-16 23:15:30 +10:00
Greg Wilkins d4ebdd6875 Issue #845 data rate limits
added @sbordets feedback
2016-08-16 21:47:49 +10:00
Greg Wilkins 83f503b86f Issue #845 data rate limits
test for variable idle time
2016-08-16 17:40:18 +10:00
Greg Wilkins 34f22dcbce Issue #845 data rate limits
Added data rate unit tests
2016-08-16 17:09:46 +10:00
Greg Wilkins 3d93d39b39 Issue #845 data rate limits
Initial thoughts
2016-08-16 16:24:14 +10:00
Greg Wilkins a90e197633 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-16 00:11:48 +10:00
Greg Wilkins 94c1424029 Issue #841 support reset in buffering interceptors
Added resetBuffers to the output interceptor.
2016-08-15 19:38:18 +10:00
Simone Bordet 6f20feddcb Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-12 14:57:47 +02:00
Simone Bordet 9f9e9ecaf9 Changes for Issue #824 (#825)
* Issue #824 - Implement notifications of asynchronous error conditions for HTTP/2.

Introduced new method HttpChannelState.asyncError() to be called in
case of asynchronous errors, i.e. those errors that do not happen in
the HttpChannel.handle() loop.

Implemented HTTP/2 callbacks to call HttpChannelState.asyncError()
and plug in the existing error handling mechanism.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Issue #824 - Implement notifications of asynchronous error conditions for HTTP/2.

Improved implementation to ignore idle timeouts for streams and
session in case that requests are being handled, matching the HTTP/1.1
behavior.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2016-08-12 11:02:52 +02:00
Greg Wilkins 20fd9c08b0 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-12 11:44:45 +10:00
Greg Wilkins 5fefd5d8bd Issue #185 Implement RFC 7239
Improved test harness
Added more configurability
Fixed SSL session and certificate bugs
2016-08-12 11:39:36 +10:00
Greg Wilkins 5c9a637d4f UnitTest #833 2016-08-12 10:29:38 +10:00
Greg Wilkins d45ebcb2bf Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-11 19:14:34 +10:00
Greg Wilkins b45af1a3c9 Issue #185 Implement RFC 7239
Also handle legacy Https headers for #834
2016-08-11 18:56:51 +10:00
Greg Wilkins 923f8d5a37 updated test 2016-08-11 08:40:26 +10:00
Greg Wilkins 08b9ac6b27 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-10 16:27:22 +10:00
Greg Wilkins f493e0f528 remove println 2016-08-10 16:26:43 +10:00
Greg Wilkins cc8c3590c0 Issue #786 Buffering Response Handler
Fixed commit of empty buffers
2016-08-10 16:01:56 +10:00
Greg Wilkins f0bd6ceb8d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-05 08:56:05 +10:00
Andriy Rosa 1d968ef53a HttpOtput: fix async write for heap ByteBuffer (#811)
* Remove unused imports

Signed-off-by: arhimondr <andriyrosa@gmail.com>

* Improve HttpOtputTest

HttpOutputTest gives false positive results for couple of tests
(testAsyncWriteBufferLargeHEAD, testAsyncWriteBufferLarge). This happens
because only the tail of the response is being checked, and that fact that
the beginning of the response in not being sent is ignored.

For regular encoding responses it is easy to check that the entire content is
received by checking it with `response.endWith(expectedContent)`. However
for chunked responses extra parsing is required to check the content in such way.
For the sake of code simplicity only start and end of the response is being checked
for the chunked encoded responses.

Signed-off-by: arhimondr <andriyrosa@gmail.com>

* Add testAsyncWriteBufferLargeDirect test to HttpOutputTest

Just to verify that everything is right when sending native buffers
asynchronously instead of heap ones.

Signed-off-by: arhimondr <andriyrosa@gmail.com>

* HttpOtput: fix async write for heap ByteBuffer

Fix bug when asynchronous writes of Heap ByteBuffer were ignored.

ByteBuffer position was moved to the end in the constructor,
then in the `process` method `if (_buffer.hasRemaining())` condition
was always evaluated to `false` and the actual write was not performed.

Add assertion in `HttpOutputTest` to verify that after the asynchronous
write position of the buffer is always at the end.

Signed-off-by: arhimondr <andriyrosa@gmail.com>
2016-08-05 08:51:10 +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 d57a11668d Issue #798 Sporadic async IO failure 2016-08-03 17:22:31 +10:00
Greg Wilkins a7a52e04c9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-02 13:58:15 +10:00
Greg Wilkins 83483e1f69 Response.reset does not clear session cookie #789
Added unit test
2016-08-02 13:49:05 +10:00
Greg Wilkins 06a40e919a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-29 18:03:27 +10:00
Greg Wilkins e0a1a1988f Response.reset does not clear session cookie #789 2016-07-29 16:45:09 +10:00
Greg Wilkins ad93923e1d Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-07-29 16:43:04 +10:00
Greg Wilkins 23cb28e856 improved debug logging of request/response 2016-07-29 12:34:12 +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 a415e72e2d Fixed Debug NPE #754
Fixed the fix
2016-07-28 18:29:21 +10:00
Jan Bartel e45e649761 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-28 15:06:12 +10:00
Greg Wilkins ffb52a948b Buffering Response Handler #786 2016-07-28 15:05:44 +10:00
Greg Wilkins 2f1d2dac72 Fixed Debug NPE #754 2016-07-27 17:46:41 +10:00
Greg Wilkins 4cd51c43a1 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-27 14:14:34 +10:00
Greg Wilkins 32e2ee8cb9 start property for stopTimeout #774 2016-07-27 14:12:46 +10:00
Greg Wilkins fdc8059d2c Fix NCSA request log in case of missing useragent. (#770)
Updated to use getResponse
2016-07-27 10:38:22 +10:00
Greg Wilkins 8d380220c4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-27 10:35:37 +10:00
Niels Basjes 117cbc2bd1 Fix NCSA request log in case of missing useragent. (#770)
Signed-off-by: Niels Basjes <niels@basjes.nl>
2016-07-27 10:32:31 +10:00
Joakim Erdfelt 87c8e1c019 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-25 17:02:51 -07:00
Greg Wilkins e53ea55f48 Issue #752 SETTINGS_MAX_HEADER_LIST_SIZE
Defined missing status codes (removed old/wrong javadoc)
Changed use of 413 to 431
Received SETTINGS_MAX_HEADER_LIST_SIZE is set on hpack encoded and warning generated only for large responses.
2016-07-23 12:17:50 +10:00
Jan Bartel 92e91e8695 Revert "Issue #759"
This reverts commit 7b6bf03133.
2016-07-22 16:10:37 +10:00
Jan Bartel 7b6bf03133 Issue #759 2016-07-22 15:50:17 +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 5e3269d3b6 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 18:50:33 +02:00
Simone Bordet 71eaacf855 Fixed Javadocs. 2016-07-21 18:48:44 +02:00
Simone Bordet cf0ecbd88f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 17:50:08 +02:00
Greg Wilkins 3c0859d034 improve commit debug 2016-07-21 15:59: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 5718726a8c Incorrect default ALPN protocol #671
Correctly handle protocol aliases
2016-07-21 13:01:25 +10:00
Jesse McConnell 4a2d471537 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-20 15:17:57 -05:00
Greg Wilkins e82ed5afb9 Fix #671 Incorrect default ALPN protocol 2016-07-20 23:16:50 +10:00
Greg Wilkins 0a7903485a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-20 17:01:21 +10:00
Greg Wilkins 7e16731b9d fix #592 2016-07-20 16:59:28 +10:00
Jan Bartel 6de88fcee9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-20 12:33:39 +10:00
Greg Wilkins 25341e9ac4 Calling onWritePossible in race with write #730
This commit cleans up the combination of the prior fix to #730 in 0433a8c
and the prior cleanup in 86ff9f9.   More comments have been added to explain.
2016-07-20 11:10:52 +10:00
Greg Wilkins 5afbcd4c6a Allow setCharacterEncoding after getOutputStream #733 2016-07-20 09:56:25 +10:00
Greg Wilkins 86ff9f984d fixed noisy/broken tests 2016-07-19 15:16:14 +10:00
Greg Wilkins cca9027285 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-19 00:55:13 +10:00
Greg Wilkins 35bb6620a1 Extensible ErrorHandler for different mimetypes #230 2016-07-18 21:12:48 +10:00
Greg Wilkins 3765efad2b Extensible ErrorHandler for different mimetpyes #727 2016-07-18 11:38:10 +10:00
Jesse McConnell 8718f4e1bf Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-15 14:32:30 -05:00
Jesse McConnell 1e3cef80ee Merge pull request #735 from WalkerWatch/jetty-9.3.x
Updated RequestLog xml/module/documentation. Resolves #734
2016-07-15 14:32:03 -05:00
WalkerWatch 00b3738536 Updated RequestLog xml/module/documentation. Resolves #734
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-15 13:08:30 -04:00
Simone Bordet 6adb5eb031 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-15 18:12:02 +02:00
Simone Bordet 0433a8ca73 Issue #730 - "Slow" client causes IllegalStateException.
Fixed by allowing state ASYNC to call onWritePossible().
2016-07-15 18:11:28 +02:00
Greg Wilkins 9c881525b7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-13 11:12:33 +10:00
Greg Wilkins 4055146dcd Fix #671 Incorrect default SLPN protocol 2016-07-13 11:09:53 +10:00
Joakim Erdfelt 232a077b9d Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 17:50:16 -07:00
Joakim Erdfelt 35de3899b6 Issue #706 - Removing org.apache.jasper.compiler.disablejsr199 references 2016-07-12 17:49:11 -07:00
Joakim Erdfelt bdefbdfcf0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 11:44:16 -07:00
Joakim Erdfelt 0e6833b770 Issue #687 - Simplifying AllowSymLinkAliasChecker logic 2016-07-12 11:39:58 -07:00
Joakim Erdfelt bc9007a9ed Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-11 10:32:33 -07:00
Joakim Erdfelt 596e372c7a Fixes #687 - Normalizing resolved symlinks 2016-07-11 10:31:07 -07:00
Joakim Erdfelt 369a105524 Issue #695 - Flagging with method level @Deprecated for improved IDE experience 2016-07-08 08:38:43 -07:00
Greg Wilkins 16c43727bf Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-08 21:19:53 +10:00
Greg Wilkins adf3281ba8 Issue #696 Improve testing of LocalConnector
Fixed some races in the implementation
2016-07-08 21:15:36 +10:00
Greg Wilkins 0d74658ab6 fixed bad tests 2016-07-08 13:37:41 +10:00
Joakim Erdfelt 5c6e271b2c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-07 13:43:01 -07:00
Joakim Erdfelt 602222182c Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-07-07 09:12:09 -07:00
Joakim Erdfelt a6276c3017 Issue #687 - Adding AllowSymLinkAliasCheckerTest
+ Replicated, in test case form, the example present in the
  filed issue.  All tests pass.
2016-07-07 09:11:19 -07:00
Greg Wilkins 5d77bb4d8f fixed bad unit test 2016-07-08 00:30:53 +10:00
Greg Wilkins e38ec83de9 Issue #695 use the getResponse methods 2016-07-07 18:13:44 +10:00
Greg Wilkins a40002bd74 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 16:37:45 +10:00
Greg Wilkins 183e3acabb Issue #695 improve getResponse methods 2016-07-07 16:36:46 +10:00
Greg Wilkins 0c0ed00747 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-06 12:16:01 +10:00
Greg Wilkins 5af61cfc38 fix #685 SecureRequestCustomizer SslSession attribute 2016-07-06 11:55:41 +10:00
Greg Wilkins d0d11244b3 Issue #644 Modules for logging
Added module for logback-access
2016-06-24 18:40:00 +10:00