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

3362 Commits

Author SHA1 Message Date
Simone Bordet ddddc3a675 Fixes #574 - Introduce a TLS handshake completed listener. 
Introduced class SslHandshakeListener that can be registered as a
bean in both the ServerConnector and in clients such as HttpClient
and HTTP2Client.

When creating SslConnection instances, the factory will query the
connector (client or server) for SslHandshakeListener beans and, if
present, will be added to the SslConnection.
 2016-05-24 16:09:19 +02:00
Simone Bordet 5fe1ff697e Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-24 12:42:12 +02:00
Simone Bordet d73c60db14 Issue #464 - Improve reporting of SSLHandshakeException. 2016-05-24 11:15:18 +02:00
Simone Bordet f95daca8b4 Code cleanups. 2016-05-24 11:15:18 +02:00
Greg Wilkins 8684524dc8 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-20 15:54:06 +10:00
Greg Wilkins d73bf08515 cleaned up constructors 2016-05-20 15:53:46 +10:00
Jan Bartel 8dfcfd021c Refactor session tests to common base; add option to save session when created. 2016-05-20 15:47:28 +10:00
Simone Bordet fab61b9157 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-20 01:12:51 +02:00
Simone Bordet faec7259b2 Fixed dispatch to application in case of empty chunked body. 2016-05-20 01:12:24 +02:00
Simone Bordet aed6bb6d6a Code cleanups. 2016-05-20 01:12:24 +02:00
Jesse McConnell 4bf91b5ab3 Merge remote-tracking branch 'origin/release-9.3.9' into jetty-9.3.x 2016-05-19 09:55:58 -05:00
Simone Bordet 46bc204e1c Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-19 11:50:35 +02:00
Simone Bordet ff1bfa599f Issue #354 (Spin loop in case of exception thrown during accept()). 
Improved the solution by sleeping only if we are still accepting.
This avoids the sleep when the connector is stopping, speeding up tests.
 2016-05-19 11:48:51 +02:00
Greg Wilkins 79e5c31029 improved unit test, fixed deferred on chunking 2016-05-19 17:46:50 +10:00
Jan Bartel e1489340fe Flow refactor of session classnames into module and etc files 2016-05-19 16:43:30 +10:00
Jan Bartel a28a59be89 Sessions expire if now is >= calculated expiry 2016-05-19 16:30:39 +10:00
Jan Bartel 49ce555add Ensure SessionCache and SessionDataStore are managed as beans 2016-05-19 13:01:38 +10:00
Jan Bartel 7fd93f1929 Make NEVER_EVICT default session eviction policy; add more debug logging 2016-05-19 12:49:20 +10:00
Greg Wilkins f826d1365b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-19 11:27:59 +10:00
Greg Wilkins cdd73eb4da improved javadoc 2016-05-19 11:27:09 +10:00
Jan Bartel 387f433711 Refactor names of session impl classes; fix bugs; add some tests 2016-05-18 17:05:01 +10:00
Greg Wilkins 49ec41f600 Issue #525 fix blockForContent spin 
Improved test
 2016-05-18 12:54:27 +10:00
Jesse McConnell dc4574f380 [maven-release-plugin] prepare for next development iteration 2016-05-17 17:30:17 -05:00
Jesse McConnell 0bbebec1e0 [maven-release-plugin] prepare release jetty-9.3.9.v20160517 2016-05-17 17:30:13 -05:00
Jesse McConnell d5c6793e6a [maven-release-plugin] prepare for next development iteration 2016-05-17 15:33:46 -05:00
Jesse McConnell 0bab7e6616 [maven-release-plugin] prepare release jetty-9.2.17.v20160517 2016-05-17 15:33:42 -05:00
Simone Bordet f519bfaf71 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-16 15:41:02 +02:00
Simone Bordet 55e5f74889 Fixes #558 - HTTP/2 server hangs when thread pool is low on threads. 
Fixed test that was broken after changes for #557.
 2016-05-16 15:40:35 +02:00
Joakim Erdfelt 8305125df0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-13 11:59:02 -07:00
Joakim Erdfelt 97af3d663f Fixes #556 - Improve Resource.getAlias() checks on Windows 
+ Reworks PathResource and FileResource alias checking to
  use originally passed paths, before Windows JVM has a
  chance to normalize and "correct" the bad paths.
 2016-05-13 11:57:23 -07:00
Greg Wilkins 0341d09e38 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-12 14:00:44 +10:00
Greg Wilkins 298a340851 Issue #558 
The testEPCExitsLowThreadsMode has been broken, so ignored for now
 2016-05-12 13:26:14 +10:00
Simone Bordet d8961139f3 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-11 13:57:08 +02:00
Simone Bordet 9b6d42317b Improved logging. 2016-05-11 13:05:16 +02:00
Greg Wilkins 6fb095f02c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-11 16:23:06 +10:00
Greg Wilkins bdafea3e96 Issue #561 Fixed test timer 2016-05-11 09:24:02 +10:00
Simone Bordet 9a5d8f3943 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-06 17:43:49 +02:00
Simone Bordet caa45283c7 Fixes #547 (ExecuteProduceConsume (EWYK) does not exit low threads mode) 
Exposed getters/setters for ExecutionStrategy.Factory in
ServerConnector and SelectorManager, to allow explicit configuration
and testing.

Added test to verify that EPC exits low threads mode.
 2016-05-06 17:10:46 +02:00
Simone Bordet 8bb6d4d7dc Code cleanups. 2016-05-06 17:10:46 +02:00
Greg Wilkins 2a5b120fc3 Issue #525 fix blockForContent spin 
abort request in bad request handling
 2016-05-06 20:31:55 +10:00
Greg Wilkins 15480a7c94 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-05 11:37:00 +10:00
Greg Wilkins 6591137ba0 Issue #547 EWYK leaves low resource mode 
Directly implement PEC in EPC low resource mode
 2016-05-05 11:22:37 +10:00
Joakim Erdfelt bec06de61d Fixing bad javadoc references that broke the build 2016-05-04 09:16:15 -07:00
Simone Bordet 4d4ecfd5cf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-04 11:47:54 +02:00
Simone Bordet 49a19abd71 Fixes #521 (Separate usage of the Server and the ServerConnector Executors) 
Found another couple of places where we should use the Server Executor.
 2016-05-04 11:28:13 +02:00
Greg Wilkins a5d3f29f11 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-04 11:10:03 +10:00
Greg Wilkins 5b8f411ba9 Issue #539 
Made ResourceService pluggable
 2016-05-04 11:08:49 +10:00
Greg Wilkins a9a21daa8e Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-05-04 09:15:13 +10:00
Greg Wilkins e783777d1c Issue #519 Disable SSL session caching 
Made caching parameters configurable
 2016-05-04 09:14:35 +10:00
Joakim Erdfelt 932e0125d2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-02 09:51:24 -07:00
Joakim Erdfelt ff1ca8d993 Limiting versions that trigger !STABLE warning 
+ Only RC# and M# trigger warning now.
+ Warning includes URL for where to download stable version.
 2016-05-02 09:50:05 -07:00
Greg Wilkins 42dac144ee Improved session configuration naming 2016-04-30 11:26:28 +10:00
Greg Wilkins 5bbb1da71b default directory for file-session-store 2016-04-30 10:41:43 +10:00
Greg Wilkins 66f242191c Issue #515 Alternate start modules 
Used alternate modules for new session architecture
 2016-04-30 09:19:38 +10:00
Jan Bartel 4ea5ec8cee Add factory for a SessionStore with a fronting cache. 
Not finished, initial checkin.
 2016-04-29 15:10:52 +10:00
Jan Bartel 80e020f08f Add configuration properties for JDBCSessionStore to JDBCSessionStoreFactory 2016-04-28 16:26:30 +10:00
Jan Bartel 70a665d3e7 Refactor session implementation: rename SessionStore impls. 2016-04-28 16:18:29 +10:00
Greg Wilkins 092ed57a17 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-28 08:17:45 +10:00
Greg Wilkins 5f7a32e30e warning if not stable release 2016-04-28 08:15:06 +10:00
Greg Wilkins 695b63fc78 Issue #525 Looping on malformed request 
Improved onBadMessage handling so that it better handles ISE thrown when a bad message is detected while dispatched to the servlet.
 2016-04-27 18:57:15 +10:00
Jan Bartel c99db5797f Refactor name of SesstionStore than supports cache of data. 2016-04-25 16:11:41 +10:00
Greg Wilkins 970798b879 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-23 10:54:46 +10:00
Greg Wilkins 367a807592 Issue #521 Separate executors for server and connector 
HttpChannel uses the server executor
LowResourceMonitor checks both server and connector executors.
 2016-04-23 10:50:05 +10:00
Mikko Tiihonen aa8597c19e Sort equal quality accept-encoding values based on server configured preference (#507) 
* Sort equal quality accept-encoding values based on server configured preference. Add fixed size cache to reduce overhead of complex header parsing. #507 

Signed-off-by: Mikko Tiihonen <mikko.tiihonen@nitorcreations.com>

* Only look at the first Accept-Encoding header value in the request. Jetty has never supported handling of multiple headers before and the worst thing that can happen is that the static content is sent uncompressed

* Rename tieBreakerFunction to secondaryOrderingFunction

* Make accept-encoding header cache size configurable

* Add back multiple accept-encoding header handling (with optimizations). Merge QuotedEncodingQualityCSV back to QuotedQualityCSV. Fix documentation on how to use precompressed servlet init parameter
 2016-04-15 20:04:01 +10:00
Jan Bartel 9212a62d74 Correct session store xml config files 2016-04-15 11:08:46 +10:00
Jan Bartel d28dffb16e Remove SessionManager; refactor names of session classes; add start modules for new session arch 2016-04-15 11:08:46 +10:00
Joakim Erdfelt 939505c342 Updating to version 9.2.17-SNAPSHOT 2016-04-14 14:03:21 -07:00
Joakim Erdfelt 778fac638d Updating to version 9.2.16.v20160414 2016-04-14 13:21:34 -07:00
Joakim Erdfelt 47bbd9364d Revert "Updating to version 9.2.16.v20160414" 
This reverts commit 29ae63855b.
 2016-04-14 13:19:59 -07:00
Joakim Erdfelt 29ae63855b Updating to version 9.2.16.v20160414 2016-04-14 13:17:21 -07:00
Joakim Erdfelt 6fb338e50d Updating to version 9.3.9-SNAPSHOT 2016-04-11 16:20:50 -07:00
Joakim Erdfelt bb4f3c4882 Updating to version 9.3.9.M1 2016-04-11 15:35:22 -07:00
Greg Wilkins 2fb9b55da2 Issue #485 Multiple compressed formats from static content 
Renamed ResourceCache as per TODO
Added javadoc and XML comments
 2016-04-07 17:33:47 +10:00
Greg Wilkins a72838162d Issue #485 Multiple compressed formats from static content 
Fixed formatting from the PR
 2016-04-07 16:47:28 +10:00
Mikko Tiihonen 3261e03edb Support for configurable set of precompressed static resources 
* Support for configurable set of precompressed static resources

Signed-off-by: Mikko Tiihonen <mikko.tiihonen@nitorcreations.com>

* Use QuotedQualityCSV to parse preferred content encodings

Signed-off-by: Mikko Tiihonen <mikko.tiihonen@nitorcreations.com>
 2016-04-07 13:57:00 +10:00
Greg Wilkins 21e4cfecfc Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-07 11:41:29 +10:00
Greg Wilkins 4b94aa2c97 Issue #491 Do not assume gzip acceptable for HTTP/2 
Removed the HTTP/2 specific code for #491
 2016-04-07 11:39:34 +10:00
Jan Bartel 6514158e6a Remove unneeded SessionManager interface. 2016-04-06 16:31:23 +10:00
Greg Wilkins 92904d2b7d Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-05 13:30:01 +10:00
Greg Wilkins 815764c279 Issue #472 Use LongAdder for statistics 
Improved JMX context names
 2016-04-05 12:53:19 +10:00
Greg Wilkins bbb7f2188c Merge branch 'jetty-9.3.x' into issue-472 2016-04-05 12:24:25 +10:00
Greg Wilkins 23ad5a2bdf Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-05 12:23:32 +10:00
Greg Wilkins b087e6db28 Issue #467 Compact // rule 
Improved the rewrite classes and modules to make it easier to compact // withing a URL.
This can now be done with --module=rewrite,rewrite-compactpath
 2016-04-05 12:13:29 +10:00
Greg Wilkins 91bef55924 Issue #472 Use LongAdder for statistics 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2016-04-01 17:22:45 +11:00
Greg Wilkins 0e16f46173 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-01 12:48:10 +11:00
Greg Wilkins 08b528e960 Issue #470 AsyncContextState NPE if called after reset 
Added a NOT_ASYNC state to the enum to avoid the null value.
 2016-03-31 18:23:18 +11:00
Greg Wilkins 3590abc534 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-30 20:05:59 +11:00
Greg Wilkins c768828703 Issue #458 Improve Quality list handling 
Added QuotedCSV and QuotedQualityCSV that are up to date with RFC7230
 2016-03-30 19:07:11 +11:00
Joakim Erdfelt 5c896d88ec Fixing javadoc build errors 2016-03-25 11:18:00 -07:00
Greg Wilkins acfa1268bc Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-24 12:58:06 +11:00
Greg Wilkins d341b0e1d6 Merge branch 'jetty-9.3.x' into jetty-9.3.x-issue-448 2016-03-24 11:38:46 +11:00
Jan Bartel 4ca9e3b149 Merge remote-tracking branch 'origin/jetty-9.3.x' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionManager.java
	tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/AttributeNormalizerTest.java
 2016-03-24 11:38:44 +11:00
Greg Wilkins 8b228073e3 Issue #448 - RFC2616 Compliance Mode should track and report RFC7230 violations 
Efficiency improvements
 2016-03-24 11:37:39 +11:00
Jan Bartel ede4c3a711 Issue #435 adjust debug log message 2016-03-24 10:55:52 +11:00
Jan Bartel 1c07172635 Issue #453 Change logging of setting session maxInactiveInterval to DEBUG from WARN 2016-03-24 10:03:39 +11:00
Jan Bartel bfeae1afa3 Remove periodic iteration over sessions 2016-03-23 16:59:36 +11:00
Greg Wilkins 4ae077f2b6 Issue #448 - RFC2616 Compliance Mode should track and report RFC7230 violations 
Improved compliance level reporting
Improved method names to make code read better
 2016-03-23 14:42:05 +11:00
Greg Wilkins 7f96db72c4 Issue #448 - RFC2616 Compliance Mode should track and report RFC7230 violations 
Empty value is not a compliance issue
removed debug
moved violation handling to end of header rather than end of message
 2016-03-23 13:13:16 +11:00
Joakim Erdfelt 7be58f9730 Issue #448 - RFC2616 Compliance Mode should track and report RFC7230 violations 
+ added Optional behavior to record violations in a Request attribute
+ added servlet testcase showing this violation recording abillity
+ currently the recorded violation doesn't report the correct compliance mode that it violates
+ there is still a problem with a quoted empty string value from Issue #451
 2016-03-22 12:20:19 -07:00
Greg Wilkins 9352d91d48 Issue #448 Log Compliance violations 
Added a ComplianceHandler to HttpParsere to log compliance violations for #448
Am cautious that this may have a performance impact.
 2016-03-22 13:58:50 +11:00
Simone Bordet 5302d1972c Merged branch 'jetty-9.3.x' into 'master'. 2016-03-18 10:49:48 +01:00
Jan Bartel add04e8fba Remove necessity for SessionIdManager specializations. 2016-03-17 12:29:42 +11:00
Greg Wilkins df9de50f96 Issue #434 RequestTest stack traces 
Added reset to ShutdownMonitor
 2016-03-17 10:34:53 +11:00
Greg Wilkins 46abbba566 fixed merge compile errors 2016-03-17 06:49:14 +11:00
Joakim Erdfelt 3624339ec6 Merge branch 'jetty-9.3.x' 2016-03-16 10:29:29 -07:00
Joakim Erdfelt 13fde643ed Merge branch 'release-9.3.8' into jetty-9.3.x 2016-03-16 10:03:29 -07:00
Greg Wilkins 1c5a1fc6a2 Issue #431 
Suppress stack traces from unit tests
 2016-03-16 18:19:40 +11:00
Jan Bartel e5981a9520 Fix NPE during session id renewal if session not found on a context 2016-03-16 14:49:07 +11:00
Jan Bartel 6261150167 Add info to IllegalStateException on check for invalid session 2016-03-16 11:45:19 +11:00
Joakim Erdfelt dcfa0b8910 Merge branch 'jetty-9.3.x' 2016-03-15 07:49:28 -07:00
Simone Bordet 26f8deddf7 Introduced Callback.Nested. 
Refactored code that was using nested callbacks and removed
unnecessary overrides now that we have default methods.
 2016-03-15 15:24:44 +01:00
Joakim Erdfelt c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt 1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Simone Bordet 42151e059a Merged branch 'jetty-9.3.x' into 'master'. 2016-03-12 00:28:18 +01:00
Simone Bordet 0b82129cd8 Issue #423 (Duplicate Content-Length header not handled correctly) 
Refactored tests into existing test class.
 2016-03-12 00:27:48 +01:00
Simone Bordet 02190278f1 Merged branch 'jetty-9.3.x' into 'master'. 2016-03-11 22:49:49 +01:00
Simone Bordet 5f2e2820f4 Issue #423 (Duplicate Content-Length header not handled correctly) 
Fixed as required by the spec, rejecting the request.
 2016-03-11 22:49:24 +01:00
Jan Bartel a936e4060c Merge remote-tracking branch 'origin/jetty-9.3.x' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionManager.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/IdleSessionTest.java
 2016-03-11 15:46:46 +11:00
Jan Bartel d82b5ad65a Issue #411 Add more debug log for mongosessionmanager and remove debug printlns 2016-03-11 15:12:07 +11:00
Jan Bartel 54a5631462 Implement session scavenge for FileSessionDataStore 2016-03-11 13:12:10 +11:00
Jan Bartel 8a24798fa4 Issue #411 ensure MongoSessionManager saves maxInactiveInterval and expiry correctly 
Issue #415 ensure setting > MAX_INT session-timeout is detected
 2016-03-11 10:47:34 +11:00
Simone Bordet 14c985802e Merged branch 'jetty-9.3.x' into 'master'. 2016-03-10 22:32:24 +01:00
Simone Bordet c0bc218202 Improved log formatting. 2016-03-10 16:10:45 +01:00
Jan Bartel ead37b1b57 Issue #411 MongoSessionManager does not save maxInactiveInterval and expiry correctly 
Issue #415 Setting big session-timeout can overflow MAXINT
 2016-03-10 18:52:34 +11:00
Greg Wilkins fa7dec8c08 Issue #412 Clarify ServletContextListener.contextDestroyed 
Suggested ordering
 2016-03-10 12:36:22 +11:00
Greg Wilkins eac3a4a439 Merge branch 'jetty-9.3.x' 2016-03-10 12:35:44 +11:00
Greg Wilkins 4c99beeaba Issue #413 HotSwapHandler null handlers 
Fixed #413
 2016-03-10 12:21:06 +11:00
Greg Wilkins 53f187571d Added Test for ServletContextListener exceptions 
See https://java.net/jira/browse/SERVLET_SPEC-152
 2016-03-10 11:29:54 +11:00
Joakim Erdfelt e7081d7b84 Merge branch 'jetty-9.3.x' 2016-03-08 15:53:50 -07:00
Joakim Erdfelt 63f9224009 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-03-08 14:32:13 -07:00
Joakim Erdfelt 862ec6f848 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-03-08 14:32:04 -07:00
Joakim Erdfelt 195a02fdaa Issue #85 - Expose TLS protocol used for connection in SecureRequestCustomizer 2016-03-08 14:27:38 -07:00
Simone Bordet f605397071 Merged branch 'jetty-9.3.x' into 'master'. 2016-03-08 22:09:41 +01:00
Simone Bordet 710949dbb7 Issue #406 (GzipHandler: allow to override the Vary response header) 
Added an overridable getVaryField() method that, if returns null,
disables the send of the Vary header.
 2016-03-08 22:05:10 +01:00
Simone Bordet 2aab9389b2 Merged branch 'jetty-9.3.x' into 'master'. 2016-03-08 14:30:18 +01:00
Simone Bordet 87f011d98b Issue #402 (Don't use Thread.isAlive() in ShutdownMonitor). 
Refactored completely ShutdownMonitor, fixing synchronization, race
conditions, cleaning up code, deleting unnecessary code, etc.
 2016-03-08 14:29:49 +01:00
Simone Bordet 6ac2c4a701 Code cleanups. 2016-03-08 12:46:10 +01:00
Simone Bordet 87ea5ac039 Fixed tests. 2016-03-08 11:55:19 +01:00
Joakim Erdfelt da6be3ed7a Fixing javadoc 2016-03-07 10:24:57 -07:00
Jan Bartel 303aea96a3 Implement uniform expiry testing for all datastores, FileDataStore still todo. 2016-03-05 16:01:18 +01:00
Simone Bordet 5fa6bf4c10 Merged branch 'jetty-9.3.x' into 'master'. 2016-03-05 14:59:21 +01:00
Greg Wilkins 10bd934476 Issue #346 HttpParser RFC2616 Compliance mode 
Empty header values returned as "" in all compliance modes
 2016-03-05 14:26:47 +01:00
Greg Wilkins 692aae0d3e Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-05 11:06:34 +01:00
Joakim Erdfelt 0f0eb569e9 Issue #124 - Don't produce text/html if the request doesn't accept it 
+ Using cleaner HttpFields access to 'Accept' header

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2016-03-04 11:28:34 -07:00
Jan Bartel 3c2f5bbcb6 Implement different intervals for scavenge and idlepassivation checks; update all tests 2016-03-04 18:06:55 +01:00
Jan Bartel 436c4835a4 Implement saving or passivating when all requests have exited session; implement separate timeout for expiry scavenge and idle timeout and periodic inspection 2016-03-04 18:06:55 +01:00
Simone Bordet bede684cac Merged branch 'jetty-9.3.x' into 'master'. 2016-03-03 08:21:26 +01:00
Joakim Erdfelt a7be6bc8ea Issue #124 - Don't produce text/html if the request doesn't accept it 
+ If request has no 'Accept' header, produce text/html as before.
+ If request has 'Accept' header, then test for 'text/html' or '*/*'
  entries before producing html output.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2016-03-02 17:16:14 -07:00
Joakim Erdfelt b357521899 Issue #107 - ResourceHandler range support testcase 2016-03-02 16:48:05 -07:00
Jan Bartel ff49714d06 Implement session idle and expiration with single periodic sweep. 2016-03-03 00:38:25 +01:00
Joakim Erdfelt eba2bffefe Merge branch 'jetty-9.3.x' 2016-03-02 09:08:30 -07:00
Joakim Erdfelt 4e426e9be3 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-03-02 09:07:33 -07:00
Joakim Erdfelt 1b310c84b0 Issue #247 improving invalid buffer manipulation exception messages 2016-03-02 09:06:21 -07:00
Greg Wilkins 3300d54b5a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-02 14:13:29 +01:00
Greg Wilkins 3963309f62 Issue #379 Insufficient information on asyncNotSupported 
Converted the boolean for asyncSupported to a String holding the source
of the async not supported.
 2016-03-02 14:09:15 +01:00
Jan Bartel b8d0ad50f8 Reimplementation of expiry and introduction of passivating unused sessions. 2016-02-29 21:03:30 +01:00
Simone Bordet 2c11372bc4 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-29 17:17:09 +01:00
Simone Bordet cec3694355 Consistently using BufferUtil, especially clearToFill() and 
flipToFlush().
 2016-02-29 16:31:38 +01:00
Jesse McConnell c74b0c23e9 Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 08:11:27 -07:00
Jesse McConnell b08f177d47 Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 08:09:12 -07:00
Jesse McConnell d8f74233a0 fix some merge issues, some example javadoc that was never right and contributing language 2016-02-26 08:13:41 -06:00
Jesse McConnell ce5a3b11d6 Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 08:03:33 -06:00
Jesse McConnell 76b34fe79a Issue #367 Resolve remaining git.eclipse.org build references 2016-02-26 07:51:05 -06:00
Simone Bordet 7938c9f86f Merged branch 'jetty-9.3.x' into 'master'. 2016-02-26 10:37:47 +01:00
Jan Bartel eb5e25ce1e Fix javadoc comments 2016-02-24 17:58:18 +01:00
Greg Wilkins ebfb45dd70 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-24 15:18:47 +01:00
Simone Bordet 83baed0bfe Reformatted code. 2016-02-24 15:06:08 +01:00
Greg Wilkins 7b6c1af4a7 Removed extra ByteBuffer duplicate 2016-02-24 13:47:35 +01:00
Greg Wilkins 1eeecdaee5 Issue #355 Improve close behaviour 
Inverted the logic of the handling of exceptions thrown in CommitCallback.
Now only if a BadMessageException is throw do we attempt to write a 500 response.
All other exceptions just abort the connection
 2016-02-24 13:36:06 +01:00
Greg Wilkins aa7fd02c5f Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-23 18:31:15 +01:00
Greg Wilkins 3c671aa8b6 Issue #346 HttpParser RFC2616 Compliance mode 
Reimplmented HTTP/0.9 support in RFC2616 compliance mode
 2016-02-23 17:33:53 +01:00
Jan Bartel 21fdaf500e Merge remote-tracking branch 'origin/jetty-9.3.x' 
Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java
 2016-02-23 14:04:06 +01:00
Jan Bartel 750b74ad49 Add comments to session implemention code 2016-02-23 13:47:56 +01:00
Simone Bordet 76689dd303 Issue #354 (Spin loop in case of exception thrown during accept()). 
Fixed by introducing an overridable method that performs an arbitrary
sleep to avoid the spin loop. Subclasses may customize.
 2016-02-23 11:37:08 +01:00
Simone Bordet 51009208d4 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-19 13:23:34 +01:00
Greg Wilkins 55eb54799f Issue #346 HttpParser RFC2616 Compliance mode 
Added HttpParser.Compliance field to HttpConnectionFactory
 2016-02-19 11:41:07 +01:00
Jan Bartel 9a554af480 Ensure infinispan timed-out sessions handled correctly 2016-02-19 10:57:04 +01:00
Joakim Erdfelt 4a6602d007 Issue #342 - Reintroducing Request to logExtended 
+ the old/bad AbstractNCSARequestLog.logExtended is now
  deprecated
+ the corrected logExtended is the appropriate one to use
 2016-02-18 11:31:55 -07:00
Greg Wilkins dd4a72ce76 479903 - improve async onError handling 
Work in progress towards clean build
 2016-02-17 14:13:21 +01:00
Greg Wilkins 92c339e669 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-17 12:09:00 +01:00
Greg Wilkins 8068aeead9 Fixed unit test race 
Test was assuming that receiving completed response on client
always happened before server processing had completed.
Added a spin test.
 2016-02-17 11:11:52 +01:00
Jan Bartel ca0193b28e Merge pull request #71 from pethers/master 
Added nullchecks and test for getters using _metadata to avoid throwing
 2016-02-17 10:02:01 +01:00
Jan Bartel 11d3448e28 Issue #81 Exception not always thrown in Jetty to application when upload part is too big 
Issue #82 Request.getPart() that results in Exception still allows other parts to be fetched
 2016-02-16 17:43:56 +01:00
Greg Wilkins 779317dc30 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-16 16:03:34 +01:00
Jan Bartel 6c1bd97ad1 Add extra getters to DatabaseAdaptor 2016-02-16 15:31:33 +01:00
Jan Bartel c965dc905c Update jdbc module for new session architecture 2016-02-16 15:12:23 +01:00
Jan Bartel 9b5aa6f90d 478918 Change javax.servlet.error,forward,include literals to RequestDispatcher constants 2016-02-16 11:52:29 +01:00
Jan Bartel f10f32c080 478918 Change javax.servlet.error,forward,include literals to RequestDispatcher constants 2016-02-16 10:48:20 +01:00
Greg Wilkins d0541e58da Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-16 10:11:47 +01:00
Greg Wilkins fd5b3a8062 487714 - Avoid NPE in close race for async write 
The race has not been solved, as with lock-free style it is difficult to prevent a
close racing with a write in progress. Instead, the code has been made more
resiliant to such state changes and exceptions thrown are converted to IOExceptions.
 2016-02-16 10:06:25 +01:00
pether.sorling@gmail.com 5f8253a8cd Added nullchecks and test for getters using _metadata to avoid throwing 
nullpointer exception.

Signed-off-by: pether.sorling@gmail.com <pether.sorling@gmail.com>
 2016-02-15 22:51:15 +01:00
Simone Bordet e91d93b85c Merged branch 'jetty-9.3.x' into 'master'. 2016-02-15 20:56:01 +01:00
Simone Bordet 261bea7bc7 Clarified Request.isPushSupported(). 
Now isPushSupported() returns true only if the request is not
a synthentic request generated by a push.
 2016-02-15 20:55:47 +01:00
Simone Bordet 26b6c848f3 Issue #80 (Spin loop in case of HTTP/2 prefaces without H2C). 
Fixed by changing the state of the parser before calling the parser
handler callbacks, and by closing the parser if the upgrade to HTTP/2
is not successful.
 2016-02-15 20:50:22 +01:00
Greg Wilkins 6a9002991a Issue #79 Parse HTTP request target starting with // 
Added a new parseRequestTarget method
 2016-02-15 19:40:10 +01:00
annorax 5167c52ab0 Add missing property configuration to jetty.xml 
Signed-off-by: Ido <ido.dovrat@gmail.com>
 2016-02-13 07:32:42 -07:00
Joakim Erdfelt 134d44cc6f Merge pull request #78 from annorax/patch-3 
Add missing property configuration to jetty.xml
 2016-02-13 07:27:08 -07:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Simone Bordet 2ac465a343 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-09 18:14:07 +01:00
Simone Bordet 6306f06e2f Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-02-09 18:12:04 +01:00
Simone Bordet cb79379b79 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-05 18:14:56 +01:00
Greg Wilkins 7b5d12b338 Added HttpInput prepend content 
Allows content to be reread
 2016-02-05 14:54:39 +01:00
Greg Wilkins 90efbe62c8 487277 - Introduce http-forwarded module for X-Forwarded support 2016-02-04 11:58:23 -07:00
Jan Bartel 980ab316ca 487198 ContextScopeListener should be called on context start and stop 2016-02-04 10:45:33 +01:00
Greg Wilkins df79ad689a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-04 07:00:13 +01:00
annorax aa6d7d6dc7 Add missing property configuration to jetty.xml 
Signed-off-by: Ido <ido.dovrat@gmail.com>
 2016-02-03 20:10:20 +02:00
Jan Bartel 459ba4ae5a Fix FileSessionManagerTest to put tmp file in target dir 2016-02-03 14:52:39 +01:00
Greg Wilkins 6c9a444b6c 486530 - Handler added to WebAppContext prevents ServletContext initialization 
Added warnings for loops and inappropriate handlers.
Used insertHandler in more XML files
 2016-02-03 10:54:39 +01:00
Joakim Erdfelt 79a7863ac8 486877 - Google Chrome flagging 'obsolete cipher suite' in Jetty and will soon issue broken padlock 
+ Rely on SslContextFactory defaults for Includes/Excludes of Cipher
  Suites
+ Reference documentation for advice on setting up custom includes
  and excludes
 2016-02-02 12:48:17 -07:00
Jan Bartel 599696bfc5 Merge branch 'master' into session-refactor 2016-02-01 16:57:35 +01:00
Jan Bartel 4f9abc279b Changes after merge 2016-02-01 13:59:51 +01:00
Jan Bartel a8c29334ca Merge branch 'master' into session-refactor 
Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/MemSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/session/FileSessionManagerTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerDeleteSessionTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerPreserveSessionTest.java
 2016-02-01 13:59:12 +01:00
Joakim Erdfelt 1aef09acc2 486604 - Add debug logging of ErrorPageErrorHandler logic 2016-01-27 11:55:00 -07:00
Joakim Erdfelt e3dd0cb83b 486511 - Server.getURI() returns wrong scheme on SSL/HTTPS 2016-01-25 13:23:41 -07:00
Simone Bordet 56c0bc768c Merged branch 'jetty9.3.x' into 'master'. 2016-01-21 17:52:37 +01:00
Joakim Erdfelt e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Greg Wilkins d41c0bba65 471171 - Support SYNC_FLUSH in GzipHandler 2016-01-15 14:27:09 +11:00
Greg Wilkins c5cbc64e77 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-01-14 11:00:06 +11:00
Joakim Erdfelt 0a1b0b2bc6 485714 - Update SSL configuration to mitigate SLOTH vulnerability 2016-01-13 15:00:16 -07:00
Joakim Erdfelt 30308f2316 Javadoc updates 2016-01-13 07:25:15 -07:00
Greg Wilkins b26a390ee1 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-01-08 11:39:43 +11:00
Greg Wilkins 35134e2d05 485376 unit test 2016-01-08 11:38:06 +11:00
Jan Bartel aa932d2b96 485064 HashSessionManager leaks ScheduledExecutorScheduler with reference to un-deployed webapp 2016-01-06 11:23:15 +11:00
Jan Bartel 913ef1a39a 485064 HashSessionManager leaks ScheduledExecutorScheduler with reference to un-deployed webapp 2016-01-06 11:22:18 +11:00
Joakim Erdfelt 4032b8579a Happy New Year 2016 (take #2) 2016-01-04 15:14:27 -07:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Greg Wilkins 460e6e2ff3 Refactored DefaultServlet and ResourceHandler to use commong ResourceService 2015-12-27 16:17:11 +11:00
Greg Wilkins 172c8f314e Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-12-24 15:17:56 +11:00
Greg Wilkins 30557429cf 484801 Avoid non-cached memory mapped files 2015-12-24 15:13:46 +11:00
Greg Wilkins 3b49ed6d0a 484657 - Support HSTS rfc6797 2015-12-24 08:42:59 +11:00
Simone Bordet 802948259e Merged branch 'jetty-9.3.x' into 'master'. 2015-12-23 11:26:11 +01:00
Simone Bordet b7ab9e0a22 484818 - Expose interesting HTTP/2 attributes and operations via JMX. 
Initial work to expose already existing attributes on the server.
 2015-12-23 11:08:25 +01:00
Greg Wilkins 50ff7ac7ce Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-12-23 18:07:08 +11:00
Greg Wilkins 19d6e36ab9 484657 - Support HSTS rfc6797 2015-12-23 17:15:24 +11:00
Greg Wilkins 2d2c321845 Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-12-23 16:38:54 +11:00
Greg Wilkins f65a7db8c5 458745 Async ISE in async Echo 
The HttpOutput class was throwing an ISE if it was dispatched when PENDING
or UNREADY.  However this can occur when it has been dispatched, but a prior call
to onDataAvailable() does output after calling isReady().

The HttpOutput now does not enforce that part of the state machine and defers to
the application correctly calling isReady()
 2015-12-23 15:09:56 +11:00
Simone Bordet 3fb354f884 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-21 13:02:04 +01:00
Joakim Erdfelt 22f9c9826d Javadoc fixes 2015-12-19 12:46:52 -07:00
Jan Bartel c122569d75 Invalidate session if load finds it is expired; ensure locks reentrant 2015-12-18 17:45:10 +11:00
Jan Bartel 163a59a18c Merge branch 'master' into session-refactor 2015-12-18 14:26:14 +11:00
Greg Wilkins 133e9e054d Merge remote-tracking branch 'origin/jetty-9.3.x' 
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
 2015-12-18 12:50:19 +11:00
Greg Wilkins 5cd676581c 484622 - Improve handling of Direct and Mapped buffers for static content 
ResourceHttpContent now applies a maxBufferSize that is passed through the call to getContent
ResourceCache now accounts for the exact memory usage of content, which may have an indirect
buffer plus either a direct or mapped buffer.  Thus content size may be 0, 1 or 2 times the
file size.

Some more limited unit tests
 2015-12-18 12:36:27 +11:00
Jan Bartel 4ce2104a70 Resolve threading issues for simultaneous session invalidate. 2015-12-18 12:10:50 +11:00
Joakim Erdfelt 31cd3fee84 Merge branch 'jetty-9.3.x' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
 2015-12-17 12:51:57 -07:00
Joakim Erdfelt 343aa066ae Merge branch 'jetty-9.2.x' into jetty-9.3.x 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/WarPluginInfo.java
	jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/Main.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
	jetty-util/src/test/java/org/eclipse/jetty/util/IncludeExcludeTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
 2015-12-16 12:56:13 -07:00
Jan Bartel 68f27bbb40 Ensure SessionData attributes are cast to ConcurrentHashMap on deserialization. 2015-12-16 12:16:05 +11:00
Jan Bartel fe5cc7a336 Merge branch 'master' into session-refactor 2015-12-16 09:04:30 +11:00
Joakim Erdfelt b6df9508c6 484350 - Allow GzipHandler path include/exclude to use regex 
+ Overhauled IncludeExclude to use java 8 predicate
+ Introduced PathSpecSet to standardize path IncludeExclude
+ GzipHandler now uses PathSpecSet for paths
 2015-12-14 14:58:12 -07:00
Jan Bartel b1707ef228 Ensure session loading runs in scope of context classloader. 2015-12-11 16:04:39 +11:00
Jan Bartel 31ea1704a1 Make calling passivate/active depend on type of session data store; fix tests 2015-12-11 11:42:29 +11:00
Greg Wilkins 3527c6a71b StringUtil.csvSplit(String) 
Conflicts:
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
 2015-12-08 14:54:33 -07:00
Jan Bartel b0b03cfa45 Merge branch 'master' into session-refactor 2015-12-03 16:59:28 +11:00
Jan Bartel 9ff55cb301 Merge branch 'master' into session-refactor 
Conflicts:
	jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java
	tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractInvalidationSessionTest.java
 2015-12-03 16:57:51 +11:00
Greg Wilkins 384caf02c1 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-03 14:20:09 +11:00
Joakim Erdfelt 3e3fd07c96 fixing imports 2015-12-02 13:04:40 -07:00
Joakim Erdfelt 1e6b940942 Merge branch 'jetty-9.3.x' 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
 2015-12-02 11:39:52 -07:00
Greg Wilkins 4bbd060ca8 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-02 16:07:59 +11:00
Greg Wilkins 6978eeb5c4 483422 - Empty chunked body in 304 Response 
test harness only
 2015-12-02 12:41:51 +11:00
Jan Bartel 82ffc4f355 Made mongo session tests work. 2015-11-27 16:01:54 +11:00
Greg Wilkins ac124094dd Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-26 07:08:06 +11:00
Greg Wilkins a2c057892e 483039 - HTTP2 Upgrade case sensitivity on Connection header 2015-11-26 07:06:38 +11:00
Simone Bordet 50041395f9 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-25 14:00:19 +01:00
Greg Wilkins 204591ce82 482855 - Content-Length omitted for POST requests with empty body 
Removed HTTP 0.9 support
A few code simplifications
Fixed clients relying on Content-Length headers being ignored
 2015-11-25 20:50:59 +11:00
Joakim Erdfelt efecc0c8cf 482056 - Compact path before using it in getRequestDispatcher() 2015-11-24 08:51:22 -07:00
Jan Bartel b249789535 Refactor api to use session id as string, and class for context id; mostly port mongo sessions. 2015-11-20 10:48:50 +11:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification 
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
 2015-11-19 12:14:05 +11:00
Simone Bordet 65d33f8b49 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-18 21:40:51 +01:00
Simone Bordet ce41b7124f 482506 - HTTP/2 load test with h2load fails. 
Returning true if the upgrade succeeds to signal to the HttpParser to
stop parsing, leaving all the work and the buffer to the new connection.
 2015-11-18 19:25:34 +01:00
Joakim Erdfelt 4e773c16e2 Merge branch 'release-9.3.6' into jetty-9.3.x 2015-11-18 11:24:04 -07:00
Greg Wilkins 0d647fc95a Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-18 15:11:17 +11:00
Greg Wilkins 12ec44894b 482272 Fixed relative symlink checking 2015-11-18 11:13:35 +11:00
Jan Bartel 070284643b Port infinispan sessions to new session model. 2015-11-13 14:43:15 +11:00
Jan Bartel 98558faffd Move newSessionData method to AbstractSessionDataStore. Organize imports. 2015-11-12 15:50:09 +11:00
Jan Bartel b1113940e6 Remove getSessions/getSessionsMax/getSessionsTotal from SessionManager. These stats can only exist on SessionStore implementations. 2015-11-12 15:21:55 +11:00
Jan Bartel b18769c1f9 Make setting of last saved time less fragile. 2015-11-12 11:17:20 +11:00
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Jan Bartel b0748c5865 Make jdbc session tests work 2015-11-11 18:31:38 +11:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Greg Wilkins 4bb63b9e03 481355 Nested Symlinks 2015-11-06 13:54:47 +11:00
Greg Wilkins 7843b7348e 480827 Implemented Unix Domain Socket Connector 
Squashed commit of the following:

commit fbb680ba7cdb73495524ea9e5b0f49caee7f68d8
Merge: ed2550b 64ea0db
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 6 10:44:00 2015 +1100

    Merge branch 'master' into unix-socket

commit ed2550b50f978e1984e19fbda642baf450dbe6a1
Merge: 88d7b35 de137ab
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 18:41:25 2015 +1100

    Merge branch 'master' into unix-socket

commit 88d7b35f885de2da7dec836e6e4ae2b522d517f0
Merge: 7d4155f 3e2658a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 17:38:27 2015 +1100

    Merge branch 'master' into unix-socket

commit 7d4155fe4a407d493683b66709bc638879b0b422
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 17:24:48 2015 +1100

    Unix socket configuration

commit 2737b19f73ad153c20e1762874558a5d62849f90
Merge: cd0cc2e 92cc44c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Nov 4 15:13:40 2015 +1100

    Merge branch 'master' into unix-socket

    Conflicts:
    	jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java

commit cd0cc2ef36a558d948bf26aff4f9e3519da2f823
Merge: 639753b 303f98e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 2 12:21:19 2015 +1100

    Merge branch 'master' into unix-socket

commit 639753b5ed37778d7231acfe9d52039aed66351e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 15:42:58 2015 +1100

    local connectors report NOIP address

commit 6d38c4195f145b99f775a06d546960b119094b0c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 12:11:13 2015 +1100

    Gentler ssl close test

commit 40b46b66a738c9187f859d522a0165bb09b113c8
Merge: b7eb082 fa53b11
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 11:09:42 2015 +1100

    Merge branch 'master' into unix-socket

commit b7eb082be44864c058b6f01b10364013596d3650
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 08:34:30 2015 +1100

    SecureRequestCustomizer for UnixSockets

commit edbb3c080200b4c6aa2836eff6c81bf31a73a8c1
Merge: 90e8cc0 de7ac72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 19:47:05 2015 +1100

    Merge branch 'master' into unix-socket

commit 90e8cc060ff6dc4b249818db38334ffa543f002f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 19:31:50 2015 +1100

    use proxy connection

commit b1772ef5dcac9ddf9bb5ecda1cda6d038ca21755
Merge: e95a932 9fe7332
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 16:46:29 2015 +1100

    Merge branch 'master' into unix-socket

commit e95a932bda5a96bf98ada4fb47664790af2aa0a2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Oct 28 15:58:25 2015 +1100

    fixed config

commit f8963b2ed6b6b4b96f1d9403194c9d50ab1f12fd
Merge: 9c56b53 8b27484
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Oct 28 15:34:28 2015 +1100

    Merge branch 'master' into unix-socket

commit 9c56b53cbec20d98e5cb05cf8d1f668fe84b95e0
Merge: 298a311 39768f8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Oct 26 13:04:34 2015 +1100

    Merge branch 'master' into unix-socket

commit 298a311af952ad3ef5d1c7635deabf47bddaa1c6
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 15:24:19 2015 +1100

    Async accepting

commit 8266753d124c04ec8bca8aa02be1ef3d826d6769
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 14:45:35 2015 +1100

    set acceptors

commit 6a56c5b9e19063fcb95cdc1228adf723c0d41362
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 11:44:54 2015 +1100

    licence

commit d80e5748e6c4327bae57de2af01983990dd2afe0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 11:24:14 2015 +1100

    unixsocket work in progress adding modules

commit cf0c1153d9966cc7182ba29411527b4341c34da6
Merge: 645b671 c39bfa2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 08:52:01 2015 +1100

    Merge branch 'master' into unix-socket

commit 645b6712d37282c26011a95c8c98e45c249b2e5f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 08:49:52 2015 +1100

    IP headers

commit 67b210b9ea81af68ce3848a114bbbd1b80a8ca52
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 23:48:57 2015 +1100

    working with haproxy

commit e4fce9cf5d896a9a29a7c6280fcaa0336dfcc0f2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 18:25:09 2015 +1100

    unixsocket working

commit 6f013788cad44e6641cd89720c5e7f3652cdc257
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 15:39:55 2015 +1100

    work in progress
 2015-11-06 11:17:46 +11:00
Greg Wilkins 56afc2b0e5 481554 DispatcherType reset race 
Cherry pick of fa53b11850

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
 2015-11-06 10:38:08 +11:00
Greg Wilkins 11b5e0edf4 format 2015-11-06 09:12:57 +11:00
Joakim Erdfelt eae38b4c28 Merge branch 'jetty-9.3.x' 2015-11-05 10:34:53 -07:00
Joakim Erdfelt c8ec399af2 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2015-11-05 10:34:30 -07:00
Joakim Erdfelt 486e890d5d 481236 - Make ShutdownMonitor java security manager friendly 
+ Limit access to specific System properties
 2015-11-05 10:33:25 -07:00
Greg Wilkins fc9f42e11a Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-05 18:39:04 +11:00
Greg Wilkins bd8f0b2dba 481418 ResourceHandler sets last modified 2015-11-05 08:52:03 +11:00
Greg Wilkins 8caef29126 481418 ResourceHandler sets last modified 2015-11-05 08:31:36 +11:00
Jan Bartel d5649e1d1b 481075 Session statistics are not accurate 2015-11-04 18:15:43 +11:00
Jan Bartel c63ef3e08b 481373 Corner cases where session may remain in JDBCSessionManager memory 2015-11-04 17:24:38 +11:00
Jan Bartel 06f3486b8d 481373 Corner cases where session may remain in JDBCSessionManager memory 2015-11-04 17:23:42 +11:00
Joakim Erdfelt 92cc44c1a3 Javadoc fix: HttpServletRequest#getPushBuilder() does not exist 
+ Fixing bad order (@throws, @param, @return) to correct order @param, @return, @throws
 2015-11-02 13:34:49 -07:00
Joakim Erdfelt 30888e134b Set what you test 2015-11-02 13:28:45 -07:00
Simone Bordet 5062756135 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-02 12:17:00 +01:00
Simone Bordet 58027a3421 481225 - Secondary resources with query parameters are not properly pushed. 
Fixed by making PushCacheFilter remember the query parameters for
secondary resources, so that the PUSH_PROMISE frame can be correctly
generated with the query parameters.
 2015-11-02 11:37:17 +01:00
Greg Wilkins fa53b11850 fixed reset of DispatcherType 2015-10-30 10:35:37 +11:00
Greg Wilkins de7ac72cf4 Proxy TLS version 2015-10-29 19:32:38 +11:00
Greg Wilkins 9fe7332413 Implemented v2 of the ProxyConnection protocol 2015-10-29 16:45:50 +11:00
Greg Wilkins 5093aa3d40 Updated PushBuilder to draft for servlet 4.0 2015-10-28 17:33:38 +11:00
Greg Wilkins 36de309e9f 480162 - Continuations behavior differences due to HttpURI behavior 
Cleaned up handling of original URI
 2015-10-28 17:33:05 +11:00
Greg Wilkins 4ffe0d375e 480162 - Continuations behavior differences due to HttpURI behavior 
Only set scheme in SecureRequestCustomizer if not already set
 2015-10-28 16:04:34 +11:00
Jan Bartel 84239bc7f2 Start making unit tests work. 2015-10-23 16:52:05 +11:00
Jan Bartel c5489bd7b2 Renaming from temporary session.x package 2015-10-23 14:10:42 +11:00
Jan Bartel 305b7bb776 Hook up scavenging; implement HashSessionManager; add delete unrestorable sessions to session data stores 2015-10-23 11:43:12 +11:00
Greg Wilkins 7415163f59 Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-10-21 17:47:58 +11:00
Greg Wilkins c156f6593c 480162 - Continuations behavior differences due to HttpURI behavior 
reverted 3e460dd219
added test clarifications
 2015-10-21 15:18:12 +11:00
Simone Bordet 5c8c590398 Merged branch 'jetty-9.3.x' into 'master'. 2015-10-20 23:23:25 +02:00
Joakim Erdfelt a01565fbc4 478757 - DebugHandler thread name is mangled 
+ Removing scheme check, now that HttpURI is sane
 2015-10-20 11:56:43 -07:00
Joakim Erdfelt 3e460dd219 480162 - Continuations behavior differences due to HttpURI behavior 
+ When fixing URI.absolute with authority, default to scheme 'http'
  (allowing things like SecureRequestCustomizer to change it again
   to 'https')
 2015-10-20 11:55:45 -07:00
Joakim Erdfelt 22573be353 Fixing format error on toString() 2015-10-20 11:28:19 -07:00
Joakim Erdfelt fae4f5d43f Merge branch 'jetty-9.3.x' 2015-10-19 11:59:44 -07:00
Joakim Erdfelt 8eda037de0 Merge branch 'jetty-9.3.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.3.x 2015-10-19 11:59:21 -07:00
Joakim Erdfelt 435ce8c3ab 478757 - DebugHandler thread name is mangled 
+ Replicating reopened bug with double-scheme https
  in testcase
+ Adding safety check for https in thread name determination
 2015-10-19 11:58:04 -07:00
Simone Bordet 964afc3020 Merged branch 'jetty-9.3.x' into 'master'. 2015-10-19 12:35:26 +02:00
Greg Wilkins 570c751ec8 479179 Fixed NPE from debug 2015-10-17 09:37:43 +11:00
Greg Wilkins cfeee5cec7 479903 - improve async onError handling 2015-10-16 14:51:57 +11:00
Joakim Erdfelt 28daeb912d Merge branch 'release-9.3.5' into jetty-9.3.x 2015-10-13 09:07:50 -07:00
Joakim Erdfelt 4dfd68b315 Merge branch 'jetty-9.3.x' 
Conflicts:
	aggregates/jetty-all-compact3/pom.xml
	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/cdi-core/pom.xml
	jetty-cdi/cdi-full-servlet/pom.xml
	jetty-cdi/cdi-servlet/pom.xml
	jetty-cdi/cdi-websocket/pom.xml
	jetty-cdi/pom.xml
	jetty-cdi/test-cdi-webapp/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-http2/http2-alpn-tests/pom.xml
	jetty-http2/http2-client/pom.xml
	jetty-http2/http2-common/pom.xml
	jetty-http2/http2-hpack/pom.xml
	jetty-http2/http2-http-client-transport/pom.xml
	jetty-http2/http2-server/pom.xml
	jetty-http2/pom.xml
	jetty-infinispan/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/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/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-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-http-client-transport/pom.xml
	tests/test-integration/pom.xml
	tests/test-jmx/jmx-webapp-it/pom.xml
	tests/test-jmx/jmx-webapp/pom.xml
	tests/test-jmx/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-infinispan-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-10-13 08:53:35 -07:00
Joakim Erdfelt 29d63b41b1 Merge branch 'jetty-9.2.x' into jetty-9.3.x 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java
 2015-10-13 08:39:45 -07:00
Joakim Erdfelt b02783220e Renaming old 'SelectChannel*' test for new naming scheme 2015-10-13 08:10:16 -07:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Jan Bartel d91fe48edc Finish scavenging impl for Hash and JDBC session mgmt. 2015-10-09 18:53:17 +11:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Greg Wilkins b1f963ae59 ForwardedFor module 2015-10-09 10:21:15 +11:00
Joakim Erdfelt 9cf0e34a1d Updating to version 9.4.0-SNAPSHOT 2015-10-07 15:41:32 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Joakim Erdfelt f2e0a46058 478752 - Clarify support for HttpServletRequest.upgrade() 
+ Indicating lack of upgrade() support with ServletException
 2015-10-07 14:40:01 -07:00
Jan Bartel e2ecf7ca14 More implementation. 2015-10-08 08:05:52 +11:00
Greg Wilkins 4d4ed7bbe2 478923 Add XML property for blockingTimeout 2015-10-06 09:14:19 +11:00
Joakim Erdfelt 5300f0c7f7 478757 - DebugHandler thread name is mangled 
+ Added testcase, and fixed handler for threadname output.
 2015-09-30 12:47:31 -07:00
Simone Bordet 90743d301a Improved toString(). 
Changes imported manually from branch 9.2.x.
 2015-09-29 12:06:01 +02:00
Simone Bordet 1f2f62cff4 Revert "Merged branch 'jetty-9.2.x' into 'master'." 
This reverts commit 701ca1aa26, reversing
changes made to 64ba5a6ef8.
 2015-09-29 11:31:56 +02:00
Simone Bordet 9549b32ea6 Revert "Merged branch 'jetty-9.2.x' into 'master'." 
This reverts commit db61fc2a47.
 2015-09-29 11:31:03 +02:00
Simone Bordet db61fc2a47 Merged branch 'jetty-9.2.x' into 'master'. 2015-09-29 09:43:12 +02:00
Simone Bordet 701ca1aa26 Merged branch 'jetty-9.2.x' into 'master'. 2015-09-29 09:42:28 +02:00
Simone Bordet fd5c5b5779 Improved toString(). 2015-09-28 19:23:50 +02:00
Joakim Erdfelt 58203893b6 Fixing javadoc 2015-09-25 09:49:29 -07:00
Greg Wilkins 007ac4a9dd 478372 - JavaUtilLog setSourceClass and setSourceMethod 
Added some additional features to configure the java.util.logging mechansim
 2015-09-25 14:08:31 +10:00
Jan Bartel 06fbf447fb 478247 WebappClassLoader pinned after redeploy 2015-09-24 14:03:37 +10:00
Simone Bordet 460673f04b 477890 - Overwhelmed HTTP/2 server discards data. 
HttpInput was using a bounded ArrayQueue with max capacity 64.
The queue was overflowing if there were more than 64 reads within the
flow control window capacity.

Fixed by replacing the ArrayQueue with ArrayDeque, which is unbounded.
 2015-09-21 09:34:15 +02:00
Greg Wilkins 269ac1a44e 477737 Improve handling of etags with dynamic and static gzip 
Fixed spin on --gzip etag
 2015-09-18 14:54:07 +10:00
Greg Wilkins 67aee72bdd 477680 Encode merged query parameters 2015-09-18 13:19:00 +10:00