Jesse McConnell
6409366499
[maven-release-plugin] prepare for next development iteration
2015-08-27 10:11:29 -05:00
Jesse McConnell
3086adc965
[maven-release-plugin] prepare release jetty-9.3.3.v20150827
2015-08-27 10:11:21 -05:00
Jesse McConnell
f5d1fb1058
Merge branch 'master' into release-9.3.3
2015-08-27 08:31:22 -05:00
Simone Bordet
bee5437bad
475927 - SecureRequestCustomizer fails to match host.
...
Cosmetic changes during review.
2015-08-27 11:14:33 +02:00
Greg Wilkins
8070ce61f3
475927 - SecureRequestCustomizer fails to match host.
...
Moved host and wildcard to new X509 class
2015-08-27 12:25:52 +10:00
Simone Bordet
7057dae67b
475927 - SecureRequestCustomizer fails to match host.
...
Fixed by storing in the SSLSession the SNI names correspondent to the
alias that was selected when the TLS connection was initiated.
2015-08-26 20:36:43 +02:00
Simone Bordet
874300472e
Do not hardcode the "http" scheme, but use that of the request.
2015-08-26 11:58:18 +02:00
Jesse McConnell
f8734f23ce
[maven-release-plugin] prepare for next development iteration
2015-08-25 14:10:01 -05:00
Jesse McConnell
e9edf4c24b
[maven-release-plugin] prepare release jetty-9.3.3.v20150825
2015-08-25 14:09:54 -05:00
Simone Bordet
bfeb7f56a6
Closing the connection also in case the parser is in CLOSED state.
...
When the request is fully read and the response is sent, the parser
may enter the CLOSE state if there were Connection: close headers.
It may happen that later the connection reads -1, then moves the
parser is CLOSED state, so the condition to close the connection must
include the CLOSED state.
2015-08-20 18:23:55 +02:00
Greg Wilkins
d44ba7e24a
Improved Context pluggability
2015-08-19 16:28:36 +10:00
Greg Wilkins
2cc663685a
ContextHandler.ContextScopeListener
...
Added a listener that is called as any thread enters/exits a context/request scope. This is
both normal servlet dispatches and async callbacks.
2015-08-19 15:30:52 +10:00
Greg Wilkins
afda638dd9
474685 - GzipHandler configuration supports csv paths and mimetypes.
...
readded for backward compatibility, but with a warning it will be removed.
2015-08-19 09:39:38 +10:00
Simone Bordet
805ec9554c
475195 - SNI matching fails when keystore does not contain wild certificates.
...
Fixed condition in SslContextFactory.getKeyManagers() that installs
the SniX509ExtendedKeyManager.
Miscellaneous code cleanups.
2015-08-17 20:55:20 +02:00
Simone Bordet
b96f2f5b24
474634 - AsyncListener.onError() handling.
...
Simplified exception handling, making sure that we terminate the
handling even in case the state was COMPLETING but the container
could not write the response.
2015-08-14 14:48:51 -07:00
Simone Bordet
b819273c7b
474634 - AsyncListener.onError() handling.
...
Refactored continuation tests.
2015-08-14 14:48:51 -07:00
Greg Wilkins
946b1476f8
474634 - AsyncListener.onError() handling.
...
reverted onComplete behaviour
2015-08-14 12:24:06 +10:00
Greg Wilkins
d780839bec
474634 - AsyncListener.onError() handling.
...
Added HttpConfiguration.maxErrorDispatches to detect error loops
Fixed ManyWays... unit test to handle error dispatch.
2015-08-14 10:06:57 +10:00
Greg Wilkins
9b9b9524dc
474634 - AsyncListener.onError() handling.
...
Allow IOException from complete flush to goto an onError call.
2015-08-13 19:09:57 +10:00
Greg Wilkins
8c0e4f53d3
474634 - AsyncListener.onError() handling.
...
Fixed AsyncContextTests
2015-08-13 18:12:38 +10:00
Greg Wilkins
f21ea15725
474634 - AsyncListener.onError() handling.
...
Handle errors thrown from dispatch when async is started with onError
2015-08-13 18:06:14 +10:00
Greg Wilkins
d1aa9ce993
474634 - AsyncListener.onError() handling.
...
Removed special termination case handling. Unhandle can be avoided with a break loop.
Replaced actions COMPLETING and COMPLETED with COMPLETE (which is an action)
Refactored test harness to use a static history array rather than headers
2015-08-13 16:22:02 +10:00
Simone Bordet
79086f3fe3
474634 - AsyncListener.onError() handling.
...
Interim work on getting the right behavior for onError().
2015-08-13 01:33:28 +02:00
Joakim Erdfelt
791896339d
Fixing javadoc
2015-08-12 14:22:53 -07:00
Simone Bordet
4c7d5f661e
Fixed import error.
2015-08-11 12:32:27 +02:00
Simone Bordet
aa684a5dcc
470311 - Introduce a proxy-protocol module.
...
Support for the PROXY protocol is now enabled via 2 new modules:
proxy-protocol and proxy-protocol-ssl, respectively for the HTTP
connector and the SSL connector.
2015-08-11 12:17:24 +02:00
Joakim Erdfelt
9ca235beca
Revert "474618 - AsyncListener.onComplete not called when error occurs"
...
This reverts commit 60f409e4ff
.
2015-08-10 09:38:40 -07:00
Joakim Erdfelt
60f409e4ff
474618 - AsyncListener.onComplete not called when error occurs
2015-08-10 07:56:14 -07:00
Joakim Erdfelt
b522dd7fe2
474617 - AsyncListener.onError not called for errors
...
+ Making onError call correctly
2015-08-10 07:53:56 -07:00
Greg Wilkins
98f8852b51
more robust testharness for graceful stop
2015-08-05 15:44:46 +10:00
Greg Wilkins
4939854893
473321 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType
2015-08-05 14:58:08 +10:00
Joakim Erdfelt
a3684f7fb8
[maven-release-plugin] prepare for next development iteration
2015-07-30 09:47:57 -07:00
Joakim Erdfelt
798fc8118b
[maven-release-plugin] prepare release jetty-9.2.13.v20150730
2015-07-30 09:47:48 -07:00
Joakim Erdfelt
4b3879845d
[maven-release-plugin] prepare for next development iteration
2015-07-30 07:02:10 -07:00
Joakim Erdfelt
6b7e9ac4b0
[maven-release-plugin] prepare release jetty-9.3.2.v20150730
2015-07-30 07:02:02 -07:00
Greg Wilkins
5aa5a4e525
fixed accidental NPE on Context logger
2015-07-30 18:50:04 +10:00
Greg Wilkins
a568ee6f17
473832 SslConnection flips back buffers on handshake exception
2015-07-30 11:52:31 +10:00
Greg Wilkins
4a727a7f08
472974 Improved StatisticsHandler 503 generation
2015-07-30 11:24:30 +10:00
Greg Wilkins
df6b935b94
470351 Fixed SNI matching of wildcard certificates
2015-07-23 19:49:06 +10:00
Greg Wilkins
e1827f659e
Ignore read/write timeout tests
2015-07-23 19:47:40 +10:00
Greg Wilkins
ea7c0fed30
implemented ServletContext.getVersionServerName
2015-07-23 19:46:51 +10:00
Greg Wilkins
830b126e43
Fixed javadoc errors
2015-07-23 09:35:38 +10:00
Joakim Erdfelt
fa92938243
Fixing javadoc errors
2015-07-22 10:22:39 -07:00
Greg Wilkins
607239028c
470727 - Thread Starvation of selector wakeups.
...
Changed the CallBack.NonBlocking to a default Callback.isNonBlocking, so that wrapping callbacks can determine if they are NonBlocking or not.
2015-07-22 17:31:54 +10:00
Jesse McConnell
4b8a6e584f
Merge branch 'release-9.3.1'
2015-07-17 12:10:49 -05:00
Greg Wilkins
54995452d6
472931 - HttpConfiguration copy constructor incomplete
2015-07-17 23:50:39 +10:00
Greg Wilkins
edc8bae556
472781 - GzipHandler isMimeTypeGzipable() bad logic
...
Added utility classes:
IncludeExclude - handles standard include exclude set
RegexSet - A set of regular expressions that have a combined compiled pattern
PathMap.PathSet - A set of standard path mappings
2015-07-17 16:28:48 +10:00
Greg Wilkins
9ee4b64e89
472781, 472782 Improve GzipHandler Include/Exclude handling
...
Fixed javadoc
2015-07-17 11:54:18 +10:00
Greg Wilkins
de39bf5227
472781, 472782 Improve GzipHandler Include/Exclude handling
...
Made a common utility class for include/exclude handling
Use path exclusion rather than mime exclusion for svg
2015-07-17 08:11:11 +10:00
Greg Wilkins
deba2f0d6a
472621 - Unjustified timeout when serving static content
...
Created HttpConfiguration.setBlockingTimeout as a new timeout to apply to the total read/write operation.
Default is -1, which is no overall timeout and only the idle timeout will apply.
2015-07-15 17:09:18 +10:00
Jesse McConnell
9b790c38ce
[maven-release-plugin] prepare for next development iteration
2015-07-14 11:42:34 -05:00
Jesse McConnell
b35d32f2b8
[maven-release-plugin] prepare release jetty-9.3.1.v20150714
2015-07-14 11:42:28 -05:00
Greg Wilkins
c2615d5fbd
472411 - PathResource.checkAliasPath typo
2015-07-12 21:33:15 +10:00
Greg Wilkins
2c3326e049
Improved graceful shutdown and added tests
2015-07-12 21:32:38 +10:00
Jan Bartel
325c65a6cb
464745 Remove @org.apache.xbean.XBean references
2015-07-10 18:14:02 +10:00
Jesse McConnell
7204707902
[maven-release-plugin] prepare for next development iteration
2015-07-09 12:14:38 -05:00
Jesse McConnell
3b1533673e
[maven-release-plugin] prepare release jetty-9.2.12.v20150709
2015-07-09 12:14:30 -05:00
Greg Wilkins
a9dd6ec676
fixed header
2015-07-02 17:24:37 +10:00
Greg Wilkins
04062a8383
Improved graceful shutdown and added tests
2015-07-02 16:57:56 +10:00
John Myers
2d0bedd9bf
[Bug 470664] Handle multiple RequestLogHandler in chain
...
Signed-off-by: John Myers <jgmyers@proofpoint.com>
Change-Id: Iff4d80957f43ddeafc212500cf912ae9c928b261
2015-07-02 01:57:26 -04:00
Greg Wilkins
75f74ff76f
471251 - Improved debugging on async timeout
2015-07-02 15:53:52 +10:00
Greg Wilkins
ca8ba1c080
471251 - Improved debugging on async timeout
2015-07-02 08:01:03 +10:00
Greg Wilkins
8d869bf88b
470727 - Thread Starvation with EWYK
...
Implemented NonBlockingCallbacks and fallback to PEC scheduling
2015-07-01 17:21:53 +10:00
Greg Wilkins
13ce021e5e
471464 - Parsing issues with HttpURI
...
Fixed parsing of CONNECT URIs
2015-07-01 15:50:31 +10:00
Joakim Erdfelt
7ebbe58c81
Fixing javadoc
2015-06-25 08:58:57 -07:00
Jan Bartel
3ac6a727cf
470803 If a webapp is not fully started do not fully stop it
2015-06-25 18:29:51 +10:00
Greg Wilkins
07c81d6ec7
Bug: 470790 Fixed alias checking of symlinked directories
2015-06-24 12:28:50 +10:00
Greg Wilkins
814000531f
Bug: 447781 Allow additional methods to be x-www-form-encoded
...
Added configuration to the HttpConfiguration class to allow additional methods to be set as
acceptable for x-www-form-encoding.
2015-06-24 11:45:44 +10:00
Greg Wilkins
3e401a62e9
StringUtil.csvSplit(String)
2015-06-19 16:48:53 +10:00
Greg Wilkins
b0a3c7c5ea
Simplified ManagedAttribute mechanism
2015-06-19 15:24:06 +10:00
Greg Wilkins
1a572c3236
improved Dump
2015-06-18 17:24:06 +10:00
Jesse McConnell
60e45a940e
[maven-release-plugin] prepare for next development iteration
2015-06-15 15:34:11 -05:00
Jesse McConnell
d3dec8d513
[maven-release-plugin] prepare release jetty-9.2.12.M0
2015-06-15 15:34:03 -05:00
Joakim Erdfelt
cf6c4a914e
Updating version to 9.3.1-SNAPSHOT
2015-06-15 10:25:49 -07:00
Joakim Erdfelt
1a9da9f9e4
Updating versions to 9.3.0.v20150612
2015-06-12 09:34:24 -07:00
Joakim Erdfelt
c6ac82f50b
Merge branch 'master' into release-9.3
2015-06-12 09:30:46 -07:00
Joakim Erdfelt
c20c5a2bed
Jetty SSL distribution default port is 8443 (XML is now source of default)
2015-06-12 09:24:24 -07:00
Joakim Erdfelt
7c737a587b
Removing [version] sections in modules
2015-06-12 09:14:34 -07:00
Joakim Erdfelt
496b4dfc83
[maven-release-plugin] prepare for next development iteration
2015-06-11 15:08:36 -07:00
Joakim Erdfelt
f53c5d8fac
[maven-release-plugin] prepare release jetty-9.3.0.v20150611
2015-06-11 15:08:29 -07:00
Joakim Erdfelt
1f24d44987
469341 - Not possible to use old/deprecated start properties
...
+ Distribution default is 8080, based on the XML
2015-06-11 12:58:48 -07:00
Joakim Erdfelt
b670b9e47d
Merge branch 'master' into bugs/469860
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
jetty-start/src/test/resources/assert-home-with-http2.txt
2015-06-11 06:57:16 -07:00
Greg Wilkins
cd420d7db5
465118 Fixed GzipHandler handling of multiple closes
2015-06-11 12:39:03 +10:00
Joakim Erdfelt
916efd6aa7
469860 - Add module metadata versioning to support backwards compat
...
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
Greg Wilkins
8c89f141ab
Revert "469341 - Not possible to use old/deprecated start properties"
...
This reverts commit fcd0a3b270
.
Port 80 is the HTTP default
2015-06-10 13:42:43 +10:00
Joakim Erdfelt
fcd0a3b270
469341 - Not possible to use old/deprecated start properties
...
+ Using xml for defaults, not the modules/ini section
2015-06-09 16:35:02 -07:00
Greg Wilkins
5ae9614d11
[469688] Added configuration for keystore type and provider
2015-06-10 08:46:57 +10:00
Simone Bordet
b18adb525f
469633 - Make SpinLock behavior pluggable.
...
Renamed SpinLock to Locker, uses ReentrantLock by default, but can be
turned into a spin lock by setting the system property
org.eclipse.jetty.util.thread.Locker.spin=true.
2015-06-08 17:15:54 +02:00
Jesse McConnell
bfe6c2638e
[maven-release-plugin] prepare for next development iteration
2015-05-29 09:06:42 -05:00
Jesse McConnell
71e0f4d8ce
[maven-release-plugin] prepare release jetty-9.2.11.v20150529
2015-05-29 09:06:36 -05:00
Greg Wilkins
69bf5ab46c
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2015-05-29 21:05:26 +10:00
Greg Wilkins
4472b614b9
468747 - XSS vulnerability in HttpSpiContextHandler
2015-05-29 20:12:57 +10:00
Jesse McConnell
a7087cbfbf
[maven-release-plugin] prepare for next development iteration
2015-05-28 10:06:51 -05:00
Jesse McConnell
913c63e597
[maven-release-plugin] prepare release jetty-9.2.11.v20150528
2015-05-28 10:03:44 -05:00
Simone Bordet
6cabf8452e
468347 - Fix modules/debuglog.mod.
2015-05-26 18:22:22 +02:00
Greg Wilkins
b2e8d2cd04
minor optimisations
2015-05-22 22:53:01 +10:00
Greg Wilkins
4028df12ca
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
2015-05-22 10:50:33 +10:00
Greg Wilkins
68412d1958
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-05-22 10:01:04 +10:00
Greg Wilkins
5bde7f34ea
467936 -w Check HttpOutput aggregateSize is < bufferSize
2015-05-22 09:56:51 +10:00
Greg Wilkins
ff15aa4a5c
Added optional http2 to https for ALPN ordering
2015-05-21 00:38:07 +10:00
Greg Wilkins
3f0fd550dc
467702 - SslContextFactory not backward compatible
2015-05-20 22:20:33 +10:00
Simone Bordet
b844bdde0b
Removed leftover configuration that was forgotten there.
2015-05-20 11:06:44 +02:00
Greg Wilkins
02a1350965
abstracted AbstractHandler setServer
2015-05-20 11:21:55 +10:00
Greg Wilkins
c5e4abd792
467281 Remove Java 1.7 support from Jetty 9.3
2015-05-14 09:31:50 +10:00
Simone Bordet
61f6763a68
Removed example syntax leftovers.
2015-05-12 10:57:04 +02:00
Simone Bordet
1a2eca098a
Fixed XML's <Ref> elements to use refid instead of id.
2015-05-12 08:55:17 +02:00
Jan Bartel
fe0bbe8e2f
Add scavenge interval property to jdbc-sessions.mod
2015-05-08 14:03:16 +10:00
Greg Wilkins
f1f6c67acf
fixed typo
2015-05-08 13:29:39 +10:00
Greg Wilkins
6428718962
457788 Powered By in o.e.j.util.Jetty conditional on sendServerVersion
...
moved conditional to HttpConfiguration
2015-05-08 09:44:19 +10:00
Jan Bartel
532b0019cc
466678 Make a .mod file for jdbc session management
2015-05-07 17:10:31 +10:00
Greg Wilkins
5d041ad54f
466645 Allow XmlConfiguration Properties to use Elements or Attributes
2015-05-07 16:24:11 +10:00
Jan Bartel
e2c7499bae
466628 Improve IllegalStateException on ServletInputStream.setReadListener()
2015-05-07 14:24:08 +10:00
Greg Wilkins
13c7fc3c38
move keystore to test config
2015-05-07 10:35:11 +10:00
Joakim Erdfelt
8ae1de727f
466648 - jetty-ssl download of keystore should be from tags, not master
...
+ Using new ${jetty.tag.version} from start.jar to use
an appropriate tag/branch/master for the download of
the keystore
2015-05-06 16:27:25 -07:00
Greg Wilkins
dd7313ca82
replaced keystore
2015-05-07 08:44:56 +10:00
Greg Wilkins
ad16f0c334
fixed test integration to use example-keystore
2015-05-01 19:32:16 +10:00
Greg Wilkins
29393ace68
moved keystore to example-keystore
2015-05-01 18:23:17 +10:00
Greg Wilkins
2271464406
430951 Support SNI with ExtendedSslContextFactory
...
Made modules do automatic selection of Extended SSL Context if running java 8
2015-05-01 15:50:06 +10:00
Joakim Erdfelt
0443ef7b93
Fixing bad javadoc
2015-04-30 11:02:37 -07:00
Simone Bordet
c04896c9cb
465857 - Support HTTP/2 clear-text server-side upgrade.
...
Added earlier check about the connection being upgraded to avoid
doing more work in the now obsolete connection.
2015-04-30 09:33:24 +02:00
Greg Wilkins
fb958833de
464419 Removed xinetd support
2015-04-30 16:44:23 +10:00
Greg Wilkins
8b39e7ffb8
464629 JDK8 Socket customization
...
Added the SocketCustomizationListener class which may be added as a bean to either a Connector or a ConnectionFactory
so that customizations may be made per connector by connection type or even per connection factory.
SSL is unwrapped.
2015-04-30 11:46:10 +10:00
Greg Wilkins
d5e868b645
less verbose unit tests
2015-04-30 10:58:01 +10:00
Jan Bartel
e30c05cc2b
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java
tests/test-integration/src/test/resources/BIOHttp.xml
tests/test-integration/src/test/resources/BIOHttps.xml
tests/test-integration/src/test/resources/NIOHttp.xml
tests/test-integration/src/test/resources/NIOHttps.xml
2015-04-30 10:44:44 +10:00
Jan Bartel
25474ff7ab
465700 NullPointerException in ResourceHandler with welcome files
2015-04-30 09:06:01 +10:00
Simone Bordet
a6cc4ff2f5
465857 - Support HTTP/2 clear-text server-side upgrade.
...
Fixed and test both types of upgrade, from HTTP/1.1 via its
upgrade mechanism, and direct HTTP/2.
2015-04-29 22:27:50 +02:00
Simone Bordet
aaaf65bf3c
Code and Javadoc cleanups.
2015-04-29 22:27:50 +02:00
Simone Bordet
8bfb50176b
Fixed XML syntax to create SecureRequestCustomizer.
2015-04-29 09:23:09 +02:00
Simone Bordet
49168077ce
Restored default ports for http and tls to 8080 and 8443 respectively.
2015-04-29 09:16:43 +02:00
Greg Wilkins
0dc394869b
465754 Unchecked PrintWriter errors
...
Removed the old unused UncheckedPrintWriter
Added similar bahaviour to the ResponseWriter class
2015-04-29 14:34:24 +10:00
Greg Wilkins
d5c95a1302
465747 - Jetty is failing to process all HTTP OPTIONS requests.
...
The Server handleOptions method was handling all OPTIONS * requests with a blank 200 response.
This has been fixed so that this method only checks that * URI is only applied to OPTIONS method.
2015-04-29 14:01:20 +10:00
Joakim Erdfelt
084a307ea1
socket.reuse-address on windows doesn't work from ServerConnector
2015-04-28 08:32:20 -07:00
Simone Bordet
aa8ea82b28
Cleanup.
2015-04-27 17:21:57 +02:00
Jan Bartel
184c4d4af8
464564 NoSql sessions created inside a forward not persisted correctly
2015-04-23 14:27:11 +10:00
Greg Wilkins
d434f419d2
457788 Powered By in o.e.j.util.Jetty conditional on sendServerVersion
2015-04-23 11:26:23 +10:00
Greg Wilkins
e633189b48
457788 Powered By in o.e.j.util.Jetty
2015-04-23 11:07:30 +10:00
Greg Wilkins
deec5291f0
460746 HttpConfiguration#setPersistentConnectionsEnabled(boolean)
2015-04-23 10:57:51 +10:00
Joakim Erdfelt
f126d02944
464727 - Update Javadoc for Java 8 DocLint
...
+ Fixing now bad javadoc on RequestLog class
2015-04-22 08:45:57 -07:00
Greg Wilkins
baede130c0
430951 Support SNI with ExtendedSslContextFactory
...
exclude certificates with usages
2015-04-22 17:16:41 +10:00
Greg Wilkins
eee2a53197
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-04-22 16:12:10 +10:00
Jan Bartel
a7bd9d1dd9
464989 AbstractSessionManager.removeEventListener() should remove HttpSessionIdListener
2015-04-22 15:39:35 +10:00
Greg Wilkins
c3577bbbb0
430951 Support SNI with ExtendedSslContextFactory
...
refactored common code in SniX509ExtendedKeyManager
added sniHostCheck code to ensure request host is the same as SNI host
2015-04-22 15:05:56 +10:00
Greg Wilkins
9eb2cb4c0f
446564 Refactored RequestLog Mechanism
...
reverted API
2015-04-22 10:37:39 +10:00
Joakim Erdfelt
5bdfd53e9c
464727 - Update Javadoc for Java 8 DocLint
...
+ Fixing javadoc in jetty-server
2015-04-21 13:58:42 -07:00
Greg Wilkins
2d283edf26
430951 Support SNI with ExtendedSslContextFactory
...
map lookup of wildcards
use LdapName to parse DN
2015-04-21 18:04:29 +10:00
Greg Wilkins
53fdbd2ec0
430951 Support SNI with ExtendedSslContextFactory
...
Added support for SAN names
optimised lookup
2015-04-21 14:14:45 +10:00
Greg Wilkins
12a9c0578e
430951 Support SNI with ExtendedSslContextFactory
...
case insensitive CN
2015-04-20 10:14:40 +10:00
Greg Wilkins
ae31162669
430951 Support SNI with ExtendedSslContextFactory
...
Improved debugging
Regex selection of cn
2015-04-20 10:02:37 +10:00
Joakim Erdfelt
09b5f680b7
464727 - Update Javadoc for Java 8 DocLint
...
Eliminate empty tag warnings
+ Changed <p/> to <p>
+ Changed <br/> to <br>
2015-04-15 14:38:35 -07:00
Simone Bordet
7a75faa770
Fixed default value for requestlog directory.
2015-04-15 18:06:15 +02:00
Simone Bordet
f4a6b4b5eb
460671 - Rationalize property names.
...
Made requestlog use a similar configuration to logging and debugmod modules.
2015-04-14 22:11:59 +02:00
Simone Bordet
599ab9bb1b
460671 - Rationalize property names.
...
Property format is now "jetty.<module|component>.<propertyName>".
Updated all references with new properties.
2015-04-13 16:21:48 +02:00
Joakim Erdfelt
dc2221a152
Build under Java 1.8
...
+ Enforcer setup to JDK 1.8+
+ Java7 profiles removed (for now)
+ Main compile phase source/test is 1.7
+ Test compile phase source/test is 1.8
2015-04-10 13:21:12 -07:00
Joakim Erdfelt
645ee9223c
Temp revert to make CI happy (but everything else sad)
2015-04-10 06:47:28 -07:00
Joakim Erdfelt
d89aa3a866
Fixing compiler source for modules that now require Java 8
2015-04-09 13:32:30 -07:00
Joakim Erdfelt
60d790cbf8
Marking java8 specifics excluded when compiling with java7
2015-04-08 15:10:53 -07:00
Greg Wilkins
0a943a928c
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2015-04-02 19:13:00 +11:00
Greg Wilkins
5ed2f84d06
430951 Support SNI with ExtendedSslContextFactory
2015-04-02 19:12:44 +11:00
Jan Bartel
7375ba2cc3
Alpha impl for infinispan session manager.
...
Conflicts:
tests/test-sessions/pom.xml
Conflicts:
tests/test-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java
2015-04-02 12:20:12 +11:00
Greg Wilkins
e093041040
enabled delayed dispatch by default
2015-03-26 12:42:09 +11:00
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Greg Wilkins
5d14d0ca7a
removed extra HttpInput synchronization
2015-03-26 12:18:06 +11:00
Jesse McConnell
da4f95f3d3
[maven-release-plugin] prepare for next development iteration
2015-03-25 09:08:27 -05:00
Jesse McConnell
e92fd438fd
[maven-release-plugin] prepare release jetty-9.2.11.M0
2015-03-25 09:08:21 -05:00
Greg Wilkins
1d99c0af7b
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-03-25 14:00:23 +11:00
Greg Wilkins
8c652fd5bd
462546 - ShutdownMonitor should bind to jetty.host
...
Added STOP.HOST system property. jetty.host is specific to a connector and a server may listen to many hosts
2015-03-25 13:58:19 +11:00
Greg Wilkins
ad4854dafe
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-03-19 15:13:15 +11:00
Greg Wilkins
7acbb05060
fixed test that failed on second boundary
2015-03-19 15:12:43 +11:00
Greg Wilkins
c082848f93
462193 - Asynchronous HttpOutput.close()
...
Dispatch to handle on return from onWritePossible()
2015-03-18 10:28:14 +11:00
Simone Bordet
4f0c63734c
462162 - StackOverflowException when response commit fails.
...
Fixed HttpChannel to avoid to stack overflow in case of unusual
exceptions thrown while committing.
Now it directly calls the transport to try to send a 500.
2015-03-15 12:10:27 +01:00
Greg Wilkins
3f795da26c
459845 - Support upgrade from http1 to http2
...
Generalised Upgrade Connection Factories
2015-03-13 13:59:29 +11:00
Greg Wilkins
0dd58d2efe
459845 - Support upgrade from http1 to http2
...
Moved the sneaky direct upgrade to its own method and added support to detect a standard upgrade.
The standard upgrade now creates the h2c connection and decodes the settings header, but it does not yet process the
settings nor send a response to the request.
2015-03-12 16:52:17 +11:00
Greg Wilkins
5456de2160
debug improvements from nghttp2 testing
2015-03-11 14:23:39 +11:00
Greg Wilkins
0592ecf3e9
cleaned up PushBuilder API
2015-03-11 12:06:51 +11:00
Jesse McConnell
e3fd0056cf
[maven-release-plugin] prepare for next development iteration
2015-03-10 08:00:22 -05:00
Jesse McConnell
9d648f4000
[maven-release-plugin] prepare release jetty-9.2.10.v20150310
2015-03-10 08:00:14 -05:00
Joakim Erdfelt
130afb9535
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientUploadDuringServerShutdown.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynDataReplyDataLoadTest.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/TooFastClientTest.java
2015-03-06 15:57:52 -07:00
Joakim Erdfelt
dd88d393e4
456521 - ShutdownHandler should shut down more gracefully
...
Also-by: Johannes Brodwall <johannes@brodwall.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2015-03-06 15:47:51 -07:00
Greg Wilkins
9edd7c4b30
461070 Handle setReadListener on request with no content
2015-03-07 08:44:51 +11:00
Joakim Erdfelt
74ee154bb1
Cleaning up LeakTrackingByteBufferPool / LeakDetector
...
+ Making use of LeakTrackingByteBufferPool more consistent
+ Using MappedByteBufferPool.Tagged where appropriate in test cases
+ Adding leak count tracking to LeakDetector
+ Adding leak count tracking to LeakTrackingByteBufferPool
+ Renaming websocket LeakTrackingBufferPool to
LeakTrackingBufferPoolRule to reflect junit @Rule usage
+ Making websocket LeakTrackingBufferPoolRule always use
MappedByteBufferPool.Tagged
+ Fixed various grammar concerns
2015-03-06 14:27:58 -07:00
Greg Wilkins
9b5205ba40
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
2015-03-06 12:45:55 +11:00
Greg Wilkins
44bb8cefa5
461133 - allow stop port to reuse address
2015-03-06 12:23:58 +11:00
Greg Wilkins
48b6bec64c
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
2015-03-05 20:17:20 +11:00
Greg Wilkins
f4ad0dce98
461350 Update HttpParser IllegalCharacter handling to RFC7230
2015-03-05 19:54:25 +11:00
Greg Wilkins
9b307bc0ed
added leak detecting bufferpool to ssl tests
2015-03-05 16:55:10 +11:00
Greg Wilkins
165ae8f238
Improved LocalConnector
2015-02-26 20:13:45 +11:00
Greg Wilkins
af70c4bd48
protect event schedule race
2015-02-26 15:37:51 +11:00
Greg Wilkins
752973931e
Improved request buffer recycling
...
Added a reference count that is incremented for each content reference passed and decremented as each content is consumed.
The request buffer is only filled or recycled if the reference count is 0
2015-02-26 13:04:50 +11:00
Greg Wilkins
a24f702537
Avoid dispatch in HttpOutput
2015-02-25 19:33:43 +11:00
Greg Wilkins
f44bf8e368
460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
...
Further refactoring. Handle the initial onDataAvailable and final onAllDataRead calls
specially, as they may need to be called without scheduling read interest.
2015-02-25 10:47:09 +11:00
Jesse McConnell
1659d83978
[maven-release-plugin] prepare for next development iteration
2015-02-24 10:38:33 -06:00
Jesse McConnell
dc0c3f4c52
[maven-release-plugin] prepare release jetty-9.2.9.v20150224
2015-02-24 10:38:28 -06:00
Greg Wilkins
5d6bb9f5d0
460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
...
Additional refactoring to better handle HttpInput state. Moved the unready and read possible states into the HttpChannelState
2015-02-23 23:06:23 +11:00
Simone Bordet
f61cfb7016
Fixed construction of MetaData.Request and handling of HttpFields by MetaData.
2015-02-20 16:36:11 +01:00
Greg Wilkins
b60ea47ef4
Revert "Revert "Fixed AsyncIO double dispatch""
...
This reverts commit 8bd94ec6be
.
This is a revert of the revert to add back in the useful debug, plus some TODO comments describing the problems
2015-02-20 00:18:29 +11:00
Greg Wilkins
8bd94ec6be
Revert "Fixed AsyncIO double dispatch"
...
This reverts commit 968063c1ab
.
2015-02-20 00:03:40 +11:00
Greg Wilkins
968063c1ab
Fixed AsyncIO double dispatch
2015-02-19 18:13:31 +11:00
Greg Wilkins
e18573f4a3
460211 Fixed Idle race in ExecuteProduceRun
...
Reimplemented ExecuteProduceRun with a spin lock
2015-02-18 21:47:22 +11:00
Jesse McConnell
ce5db2ca55
[maven-release-plugin] prepare for next development iteration
2015-02-17 16:02:22 -06:00
Jesse McConnell
26b7597928
[maven-release-plugin] prepare release jetty-9.2.8.v20150217
2015-02-17 16:02:16 -06:00
Greg Wilkins
c090f179a7
459845 - Support upgrade from http1 to http2/websocket
...
Added jetty-http2c.xml and http2c.mod
2015-02-13 15:06:24 +11:00
Greg Wilkins
c3332e7d2e
459845 - Support upgrade from http1 to http2/websocket
...
Added support for unofficial "upgrade" from http/1 to h2c
2015-02-13 12:16:03 +11:00
Greg Wilkins
0f7ee8d607
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpVersion.java
jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2015-02-13 11:45:56 +11:00
Greg Wilkins
2b2a70a93a
459845 Support upgrade
...
Added the concept of UpgradeFrom and UpgradeTo connections that support
transferring a buffer with content before opening new connection.
Aded EndPoint.update method as utility
2015-02-13 11:41:18 +11:00
Simone Bordet
8ca0a86352
459655 - Remove SPDY and NPN.
...
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:21:53 +01:00
Simone Bordet
be860741d5
459655 - Remove SPDY and NPN.
...
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:18:07 +01:00
Simone Bordet
99da9ce98e
Merged branch 'jetty-9.2.x' into 'master'.
2015-02-06 21:45:22 +01:00
Greg Wilkins
b1953a6859
added private key for debugging
2015-02-06 15:51:01 +11:00
Greg Wilkins
14cd10b676
experimenting with push API
2015-02-06 13:48:34 +11:00
Greg Wilkins
ab8b7f8c8d
PushBuilder uses full URI
2015-02-06 10:44:19 +11:00
Greg Wilkins
504ff73d03
default to delayed dispatch
2015-02-05 14:39:49 +11:00
Greg Wilkins
d08fced010
handle slow arriving input
2015-02-05 14:27:05 +11:00
Greg Wilkins
7db7ef3020
Added test cases and improved isReady and isFinished handling
2015-02-05 14:26:34 +11:00
Greg Wilkins
f6cfe07a69
added direct buffer configuration
2015-02-05 10:02:01 +11:00
Greg Wilkins
47055dd2c8
added test for async IO isNotReadyAtEOF
2015-02-04 12:40:36 +11:00
Joakim Erdfelt
03121edc92
Merge branch 'jetty-9.2.x'
2015-01-22 11:51:36 -07:00
Greg Wilkins
94f0f29540
458101 added test for maxFormContentSize
2015-01-22 12:41:13 +01:00
Joakim Erdfelt
48e5157731
Merge branch 'jetty-9.2.x'
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2015-01-21 11:00:54 -07:00
Jesse McConnell
aa22842c20
[maven-release-plugin] prepare for next development iteration
2015-01-16 17:48:29 -06:00
Jesse McConnell
8c58a9abc4
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 17:48:23 -06:00
Joakim Erdfelt
3f08e54a23
457696 - JMX implementation should not be overridden by WebApp classes
...
+ Marking org.eclipse.jetty.util.annotation. for hole punching
+ Making ContextHandler parsing of "org.eclipse.jetty.server.context.ManagedAttributes"
more lenient to whitespace around delimitors
+ Making ObjectMBean take in account the .jmx.{name}MBean for
annotation influences too.
2015-01-16 15:18:01 -07:00
Jesse McConnell
81bb8411d1
[maven-release-plugin] prepare for next development iteration
2015-01-16 12:06:36 -06:00
Jesse McConnell
7865f88b81
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 12:06:30 -06:00
Jesse McConnell
db991355a2
[maven-release-plugin] prepare for next development iteration
2015-01-16 10:41:45 -06:00
Jesse McConnell
6930abb8d3
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
2015-01-16 10:41:39 -06:00
Jesse McConnell
9225b124a4
[maven-release-plugin] prepare for next development iteration
2015-01-16 08:21:35 -06:00
Jesse McConnell
ebd563e64d
[maven-release-plugin] prepare release 9.2.7.v20140116
2015-01-16 08:21:29 -06:00
Greg Wilkins
55bcd32448
fixed merge
2015-01-08 17:43:55 +01:00
Greg Wilkins
e1cc5fb487
Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
2015-01-08 15:21:01 +01:00
Greg Wilkins
c23f21c761
456956 Reduce ThreadLocal.remove() weak reference garbage
...
removed getCurrentChannel thread local
2015-01-08 15:03:05 +01:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Greg Wilkins
629035ba7a
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2015-01-07 23:42:10 +01:00
Greg Wilkins
2b530939a7
456956 Reduce ThreadLocal.remove() weak reference garbage
...
reduced calls to getCurrentConnection
2015-01-07 20:56:06 +01:00
Greg Wilkins
3270af81e8
456956 Reduce ThreadLocal.remove() weak reference garbage
2015-01-07 19:53:30 +01:00
Greg Wilkins
3d66b1d207
ensure onAllDataRead always called
2015-01-02 19:17:26 +01:00
Simone Bordet
caa579ab4b
Fixed buffer leaking in case the buffer is empty due to having read
...
zero from the network.
2015-01-02 18:19:04 +01:00
Greg Wilkins
3af9b145a3
Deprecated the AbstractConnection dispatchIO mechanism
2015-01-01 16:18:13 +01:00
Greg Wilkins
20fc880c3e
Merge branch 'master' into jetty-9.3-ewyk
2014-12-31 16:29:40 +01:00
Greg Wilkins
200b3a3e64
fixed merge
2014-12-31 16:28:35 +01:00
Greg Wilkins
2e3c223917
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-12-31 16:16:57 +01:00
Greg Wilkins
a89a6927e8
yet another refactor of HttpInput.... must read -1 before isFinished is true
2014-12-24 19:34:06 +01:00
Jan Bartel
fc2b6f0f74
455655 ensure multipart form-data parsing exception thrown to servlet
2014-12-24 18:25:27 +01:00
Greg Wilkins
26de8931a3
less verbose errors
2014-12-24 12:42:07 +01:00
Greg Wilkins
3e8969be6f
different callbacks for HTTP blocking and async reads
2014-12-24 10:31:33 +01:00
Greg Wilkins
fecc03a2f5
fixed some more tests after EWYK refactor
2014-12-23 22:20:49 +01:00
Greg Wilkins
3f59bc4c14
refactored HttpConnector for EWYK - work in progress
2014-12-23 17:15:27 +01:00
Simone Bordet
9cff4a57e7
Merged branch 'master' into 'jetty-9.3-ewyk'.
2014-12-22 21:34:10 +01:00
Simone Bordet
e8c88cfd9c
Merged branch 'jetty-9.2.x' into 'master'.
2014-12-22 21:32:09 +01:00
Simone Bordet
fc42d5d4aa
Configuring output aggregation size when configuring output buffer size.
2014-12-22 21:29:02 +01:00