Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,431 Commits 72 Branches 465 Tags 358 MiB
Commit Graph

2750 Commits

Author SHA1 Message Date
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