Commit Graph

2297 Commits

Author SHA1 Message Date
Greg Wilkins c6f394ab14 434009 Improved javadoc for accessing HttpChannel and HttpConnection 2014-05-05 10:04:15 +02:00
Greg Wilkins 11096e8a0d Added ASYNC_WOKEN state to HttpChannelState 2014-05-03 10:29:20 +02:00
Joakim Erdfelt 1956ceffde Setting up junit Assume on OS Alias / Alternate Filename Reference support.
+ Windows 8 no longer supports the 8.3 alternate filename reference techniques, rendering the test cases for this behavior no longer valid.
2014-05-03 10:29:20 +02:00
Simone Bordet 976d86b375 434027 - ReadListener.onError() not invoked in case of read failures. 2014-05-02 23:01:33 +02:00
Greg Wilkins d17547cf96 Added ASYNC_WOKEN state to HttpChannelState 2014-04-30 14:04:28 +02:00
Greg Wilkins 95343c3535 Added ASYNC_WOKEN state to HttpChannelState 2014-04-30 13:55:50 +02:00
Joakim Erdfelt f65e40f8e7 Fixing bad EOL assumptions based on running OS (should be based on git checkout state) 2014-04-29 15:44:00 -07:00
Greg Wilkins 2e261b75d6 433692 improved buffer resizing 2014-04-29 20:36:13 +02:00
Greg Wilkins 1e8d8b8b3e 433572 default to sending date header 2014-04-28 14:50:58 +02:00
Greg Wilkins eade9a3d25 432901 ensure a single onError callback only in pending and unready states 2014-04-25 18:23:54 +02:00
Greg Wilkins 87c5b30d1c 432901 ensure a single onError callback only in pending and unready states 2014-04-25 17:26:43 +02:00
Greg Wilkins bdecc7bd89 433479 Improved resource javadoc 2014-04-25 14:36:59 +02:00
Greg Wilkins b764a1d136 433244 Security manager lifecycle cleanup 2014-04-24 15:46:08 +02:00
Greg Wilkins 4b26faf897 433244 Session manager lifecycle cleanup 2014-04-24 13:31:00 +02:00
Simone Bordet d90e6210bb 432777 - Async Write Loses Data with HTTPS Server.
Fixed by properly flipping the aggregate buffer when copying bytes to it.
2014-04-17 13:28:17 +02:00
Greg Wilkins ef400675aa 431519 Fixed NetworkTrafficListener 2014-04-10 16:20:10 +10:00
Greg Wilkins f9e2f1d6bc 429734 Implemented the HA ProxyProtocol 2014-04-04 12:42:06 +11:00
Greg Wilkins 4dbabd72f2 429734 Implemented the HA ProxyProtocol 2014-04-04 08:47:37 +11:00
Joakim Erdfelt 28d9df1dbb Refactoring alpn stuff into jetty-alpn-server and jetty-alpn-client 2014-03-31 14:18:37 -07:00
Greg Wilkins 9975f44b84 Merge remote-tracking branch 'origin/master' into jetty-9-alpn 2014-03-31 12:18:40 +11:00
Greg Wilkins 325c4df482 431592 - do not resolved forwarded-for address 2014-03-31 12:17:53 +11:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Greg Wilkins 28445fc629 Merge remote-tracking branch 'origin/master' into jetty-9-alpn 2014-03-31 09:59:52 +11:00
Greg Wilkins c895f6dbcd organised imports 2014-03-31 09:57:59 +11:00
Simone Bordet f36700092c Don't assert on existing directories/files. 2014-03-27 16:11:11 +01:00
Simone Bordet 1089a33578 Fixed imports referencing JUnit 3 and old matcher libraries. 2014-03-27 15:34:48 +01:00
Greg Wilkins 86d13b91a5 430654 avoid dispatching failure callbacks 2014-03-27 19:08:16 +11:00
Joakim Erdfelt dfbe5c92c6 426920 - jetty-start / BaseHome.listFilesRegex() and .recurseDir() do not detect filesystem loops
+ Using java.nio.files to walk directory tree and detect filesystem
  loops
+ All standard PathMatching patterns now work. ("glob:" and "regex:")
2014-03-26 19:01:05 -07:00
Joakim Erdfelt b835aab06f 430825 - jetty-start / use of jetty-jmx.xml prevents configuration of ThreadPool in jetty.xml
+ Flipped dependencies around from:
     server -(optional) -> jmx
  to:
     jmx -> server
2014-03-26 11:59:59 -07:00
Greg Wilkins 710ea48244 430654 430242 - Closeable SharedBlockingCallback 2014-03-22 09:36:09 +11:00
Greg Wilkins 5d83a43cce 430242 - added SharedBlockingCallback to support threadsafe blocking 2014-03-22 08:42:03 +11:00
Greg Wilkins 138dfba560 Revert "430242 - added SharedBlockingCallback to support threadsafe blocking"
This reverts commit 9c30e7a303.
2014-03-21 17:55:48 +11:00
Greg Wilkins bbfb5c7237 430649 test form encoding 2014-03-21 15:38:11 +11:00
Greg Wilkins 0d1fca545c 424107 Abort HttpTransport if already committed on error 2014-03-21 13:51:30 +11:00
Joakim Erdfelt 116f6bc281 430822 - jetty-start / make soLingerTime configurable via property
+ Added 'https.soLingerTime' and 'http.soLingerTime' properties
2014-03-20 17:11:35 -07:00
Joakim Erdfelt 267542b315 430823 - jetty-start / make NeedClientAuth (ssl) configurable via property
+ Added 'jetty.ssl.needClientAuth' for required client certificate auth
+ Added 'jetty.ssl.wantClientAuth' for desried client certificate auth
2014-03-20 14:41:53 -07:00
Greg Wilkins a3ae739ca3 423619 set Request timestamp on startRequest 2014-03-20 13:31:21 +11:00
Greg Wilkins d76c786803 430273 Cancel async timeout breaks volatile link to avoid race with slow expire 2014-03-14 10:27:32 +11:00
Greg Wilkins 9c30e7a303 430242 - added SharedBlockingCallback to support threadsafe blocking 2014-03-13 21:12:55 +11:00
Jan Bartel b405ad8c4f 429357 JDBCSessionManager.Session.removeAttribute don't set dirty flag if attribute already removed 2014-03-13 16:21:23 +11:00
Greg Wilkins 4de73d508b 430242 - added SharedBlockingCallback to support threadsafe blocking 2014-03-13 14:46:00 +11:00
Greg Wilkins 84fa579ec7 429616 Use UTF-8 encoding for XML 2014-03-10 15:23:08 +11:00
Jesse McConnell 0ec0d452e9 [maven-release-plugin] prepare for next development iteration 2014-03-07 09:10:08 -06:00
Jesse McConnell 1e555567a9 [maven-release-plugin] prepare release jetty-9.1.3.v20140225 2014-03-07 09:10:08 -06:00
Joakim Erdfelt e36871e566 429180 - Make requestlog filename parameterized
+ made filename and filenameDateFormat parameterized
2014-02-26 12:49:53 -07:00
Jan Bartel 4ce60a1c83 428710 - JDBCSession(Id)Manager use read committed isolation level 2014-02-24 12:50:56 +11:00
Greg Wilkins 8d979408b7 428660 Delay closing async HttpOutput until after UNREADY->READY 2014-02-21 12:31:31 +11:00
Greg Wilkins c12748a9e3 428238 Test HEAD request with async IO 2014-02-17 12:40:45 +11:00
Greg Wilkins 1f02dfc24f 428238 Test HEAD request with async IO 2014-02-17 12:32:28 +11:00
Jan Bartel 075e6a7363 428157 Methods of anonymous inner classes can't be called via xml 2014-02-14 16:03:29 +11:00
Jan Bartel b88724f23c 426490 HttpServletResponse.setBufferSize(0) results in tight loop (100% cpu hog) 2014-02-14 11:57:53 +11:00
Greg Wilkins 18e19260ff Apply changes resulting from the quickstart project 2014-02-13 12:31:14 +11:00
Jesse McConnell eb0aea46ce set versions.txt file to new version and fix mistaken developmentVersion 2014-02-10 13:48:29 -06:00
Jesse McConnell f3d38dfb15 [maven-release-plugin] prepare for next development iteration 2014-02-10 11:17:14 -06:00
Jesse McConnell 8f6cbc9111 [maven-release-plugin] prepare release jetty-9.1.2.v20140210 2014-02-10 11:17:07 -06:00
Simone Bordet 1841b3ec87 427572 - Default number of acceptors too big.
Defaulted to 1+cores/16.
2014-02-06 16:47:57 +01:00
Jesse McConnell 4d4b0c42e7 [Bug 427570] externalize common http config to start.ini 2014-02-06 09:14:28 -06:00
Simone Bordet 8e03498b0d Renamed NetworkTrafficSelectChannelConnector to
NetworkTrafficServerConnector and deprecated the old class.
2014-02-05 23:05:23 +01:00
Greg Wilkins 7725056234 426750 isReady() returns true at EOF 2014-02-05 17:34:22 +11:00
Jan Bartel 4844508c5f 427245 StackOverflowError when session cannot be de-idled from disk 2014-02-04 19:25:34 +11:00
Simone Bordet 3f5a30282d Made sure that the number of selectors cannot be zero. 2014-02-03 12:09:27 +01:00
Greg Wilkins 8cc9d71e20 426750 Handle autoclose on async writes 2014-02-03 17:59:31 +11:00
Jan Bartel d4368d1018 427068 ServletContext.getClassLoader should only check privileges if a SecurityManager exists 2014-01-31 16:24:00 +11:00
Jan Bartel 49ac6de011 425930 JDBC Session Manager constantly reloading session if save intervall expired once 2014-01-20 13:29:21 +11:00
Jan Bartel 5f7a34e590 408167 Complex object as session attribute not necessarily persisted. 2014-01-20 10:40:05 +11:00
Jan Bartel f735fe834b 425998 JDBCSessionIdManager fails to create maxinterval column 2014-01-18 08:31:43 +11:00
Simone Bordet 93013b36dd 425703 - Review [Queued]HttpInput.
Fixed synchronization.
Fixed notification of callbacks outside sync blocks.
Added isEOF() method to allow correct implementation of
blockForContent().
Remove unused callback onAllContentConsumed().
2014-01-15 13:14:19 +01:00
Simone Bordet 10dd14d34e Reorganization of the code in preview of a larger refactoring. 2014-01-14 22:51:18 +01:00
Jesse McConnell 91429ea123 Merge branch 'release-9' 2014-01-10 09:11:25 -06:00
Jan Bartel f59b3db0e4 424562 JDBCSessionManager.setNodeIdInSessionId(true) does not work 2014-01-10 16:25:38 +11:00
Jesse McConnell b82ec6e668 [maven-release-plugin] prepare for next development iteration 2014-01-08 16:47:09 -06:00
Jesse McConnell b99623a21d [maven-release-plugin] prepare release jetty-9.1.1.v20140108 2014-01-08 16:47:01 -06:00
Simone Bordet 8720fb213c 425043 - Track whether pools are used correctly.
Introduced LeakDetector and utility classes LeakTrackingConnectionPool
and LeakTrackingByteBufferPool to track resource pool leakages.

Fixed ConnectionPool to be more precise in closing connections when
release() cannot recycle the connection.

Fixed a leak in server's HttpConnection in case a request arrives with
the Connection: close header: a ByteBuffer was allocated but never
released.
2014-01-07 19:44:29 +01:00
Joakim Erdfelt b3947ea0b8 424762 - ShutdownHandler hardcodes "127.0.0.1" and cannot be used with IPv6
+ Adding Request.getRemoteInetSocketAddress() to allow for better use
  of java built-ins for localhost / loopback checks.
2014-01-03 11:20:52 -07:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Joakim Erdfelt f8e44a1ae7 424168 - Module [ext] should load libraries recursively from lib/ext/
+ Added support for [LIB] definitions that use regex.
+ Using new expression for [LIB] sections in ext.mod
    regex:lib/ext/.*\.jar$
2013-12-27 10:31:38 -07:00
Greg Wilkins dafbad5d1a 423692 use UrlEncoded.ENCODING for merging forwarded query strings 2013-12-19 16:57:02 +11:00
Greg Wilkins 892127ca62 424180 extensible bad message content 2013-12-19 11:47:48 +11:00
Jan Bartel dd0f50fc72 423255 MBeans of SessionIdManager can leak memory on redeploy 2013-12-16 14:01:56 +11:00
Simone Bordet 8d621a9331 424043 - IteratingCallback Idle race.
A few renamings and fixes to avoid IllegalStateExceptions.
2013-12-15 23:51:04 +01:00
Simone Bordet 41fc2b8f87 424043 - IteratingCallback Idle race.
Renamed Next enum to Action, and renamed some constant of the State
enum to avoid confusion with the Action enum.

Simplified succeeded() and failed(Throwable) code,
covering also cases not covered before.

Fixed case SCHEDULED in succeeded() that was returning in case the
compareAndSet failed.

Fixed race in perform(), where 2 threads may execute concurrently
after having returned from process().

Vastly improved javadocs and comments.
2013-12-15 00:47:55 +01:00
Greg Wilkins 7141483356 424043 - IteratingCallback Idle race 2013-12-14 09:14:12 +11:00
Jan Bartel dfe5889bc4 423361 Make all listeners injectable irrespective of method of declaration (descriptor, api, annotation) 2013-12-12 14:44:38 +11:00
Greg Wilkins cd05751ff7 423392 - GzipFilter without wrapping or blocking
I Added AsyncGzipFilter, which uses a modified HttpOutput instance to provide gzip compression without wrapping or blocking.
Does not currently handle deflate.
2013-12-06 22:53:41 +11:00
Greg Wilkins 9c39b2e631 422723 - Dispatch failed callbacks to avoid blocking selector
Handled rejected execution exception
2013-12-05 10:14:52 +11:00
Greg Wilkins 13b07c10aa removed invalid check from test 2013-12-02 19:18:22 +11:00
Greg Wilkins f1fc661a2c reenabled integration and RFC2616 tests 2013-11-29 17:33:05 +11:00
Greg Wilkins 51e82b4c5c 422807 fragment large written byte arrays to protect from JVM OOM bug 2013-11-29 14:28:07 +11:00
Greg Wilkins cb412d8a0d 422807 fragment large written byte arrays to protect from JVM OOM bug 2013-11-29 13:36:16 +11:00
Greg Wilkins 3238ddf3c8 422703 Support reentrant HttpChannel and HttpConnection
use last in HttpChannel
2013-11-29 12:00:04 +11:00
Greg Wilkins 4e0c1cbcf9 422723 - Dispatch failed callbacks to avoid blocking selector
Call direct if dispatch rejected
2013-11-28 19:02:33 +11:00
Greg Wilkins 6848186bfa 422734 messages per second in ConnectorStatistics 2013-11-28 18:40:46 +11:00
Greg Wilkins 9c013b723b 422703 Support reentrant HttpChannel and HttpConnection 2013-11-28 12:25:04 +11:00
Greg Wilkins 1b30b0f9a8 422723 - Dispatch failed callbacks to avoid blocking selector 2013-11-28 10:04:08 +11:00
Jan Bartel b6c0fe2cd6 408912 JDBCSessionIdManager should allow configuration of schema 2013-11-25 17:26:38 +11:00
Greg Wilkins 1f368ee7e4 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-11-25 09:29:12 +11:00
Greg Wilkins 8adf552c80 418888 Added strict mode to HttpGenerator 2013-11-22 22:54:09 +11:00
Jan Bartel 44416abb1f 422308 Change all session/sessionid managers to use shared Scheduler 2013-11-22 19:22:44 +11:00
Greg Wilkins 29fdeba061 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-11-21 15:36:31 +11:00
Greg Wilkins 1eb2997efd 421697 - IteratingCallback improvements
avoid wrapping writeCallback
Idle state added to IteratingCallback for SPDY
2013-11-21 14:52:39 +11:00
Jan Bartel 092c53b335 410750 Mongo clustered sessions persisted across stops 2013-11-21 12:11:24 +11:00
Joakim Erdfelt 9172d6115b [maven-release-plugin] prepare for next development iteration 2013-11-15 16:58:44 -07:00
Joakim Erdfelt 6feeab6ec3 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:58:36 -07:00
Joakim Erdfelt 7bbc0ff4df [maven-release-plugin] rollback the release of jetty-9.1.0.v20131115 2013-11-15 16:33:52 -07:00
Joakim Erdfelt 1126e68971 [maven-release-plugin] prepare for next development iteration 2013-11-15 16:03:28 -07:00
Joakim Erdfelt d6418c73d4 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:03:20 -07:00
Joakim Erdfelt 6c372b9440 Reverting <version> to 9.1.0-SNAPSHOT 2013-11-15 15:36:26 -07:00
Jesse McConnell b5345caed1 [maven-release-plugin] prepare for next development iteration 2013-11-14 15:27:52 -06:00
Jesse McConnell 1582aa196d [maven-release-plugin] prepare release jetty-9.1.0.v20131114 2013-11-14 15:27:37 -06:00
Greg Wilkins 8bda67b82d Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
2013-11-08 15:24:12 +11:00
Greg Wilkins cbd6c11ab3 added IdleTimeoutHandler 2013-11-08 15:09:05 +11:00
Greg Wilkins 1d5635c76c 420776 complete error pages after startAsync
handle complete and dispatch calls before the thrown exception

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
2013-11-08 15:08:01 +11:00
Simone Bordet d9f818bee9 Restored default values in XML as failsafe values for idle timeouts,
since "0" means the connection will never timeout.
2013-11-07 16:21:59 +01:00
Greg Wilkins 72696ba030 420359 - fixed thread warnings 2013-11-07 22:35:49 +11:00
Greg Wilkins 42f82e1e3c Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2013-11-07 17:18:01 +11:00
Greg Wilkins 1db4f4e431 allow for HttpConnection extensions 2013-11-07 16:13:48 +11:00
Simone Bordet 4024708bbc Connection and NetworkConnector now implements Closeable,
rather than AutoCloseable, since they deal with I/O.
2013-11-05 09:41:49 +01:00
Joakim Erdfelt 4bd1a041f7 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-11-04 15:00:17 -07:00
Joakim Erdfelt 2c9ea8d4b7 Windows build fixes 2013-11-04 14:59:47 -07:00
Greg Wilkins 3bb17e5029 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-11-04 17:41:13 +11:00
Jan Bartel cafb13ea89 HashedSession deIdles itself via getMaxInactiveInterval every time scavenger is run 2013-11-04 17:36:37 +11:00
Jan Bartel 4073e772c4 Use File.createTempFile for test output directory for RequestTest 2013-11-04 17:36:37 +11:00
Greg Wilkins 36c807c2f3 417223 - removed deprecated ThreadPool.dispatch 2013-11-04 17:21:50 +11:00
Greg Wilkins 55fafc4c3a 418741 - Threadlocal cookie buffer in response 2013-11-04 16:39:24 +11:00
Greg Wilkins 74272663e6 420359 - Support 0 acceptors for ServerConnector 2013-11-04 16:16:54 +11:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Greg Wilkins eb3bb660b5 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
Mikhail Mazursky 6b0269a16d [Bug 420930] Use Charset to specify character encoding
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
Greg Wilkins 8d9e6dbd64 420692 set soTimeout to try to avoid hang 2013-11-01 16:54:58 +11:00
Greg Wilkins 852be79a3c Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-11-01 14:45:16 +11:00
Greg Wilkins 56fcfa45fb 420844 Connection:close on exceptional errors 2013-11-01 13:37:44 +11:00
Greg Wilkins c64dad6066 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-10-31 14:40:54 +11:00
Greg Wilkins 466725e343 420776 complete error pages after startAsync
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
2013-10-31 14:16:34 +11:00
Joakim Erdfelt 1705825346 417932 - resources.mod should make ${jetty.base}/resources/ directory 2013-10-30 13:11:27 -07:00
Joakim Erdfelt 035d839534 418922 - Missing parameterization of etc/jetty-xinetd.xml 2013-10-30 09:29:57 -07:00
Joakim Erdfelt 12ec4e74ed enabling pipeline tests 2013-10-30 09:29:57 -07:00
Simone Bordet 00867b094b Making classes implement Closeable, rather than AutoCloseable,
since it is more semantically correct.
2013-10-29 10:03:31 +01:00
Greg Wilkins 4b87c4683d Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-10-28 10:22:16 +11:00
Greg Wilkins 979ddd958b fixed merge 2013-10-28 10:17:55 +11:00
Greg Wilkins 960c03b8ac 419350 Do not borrow space from passed arrays 2013-10-28 10:14:12 +11:00
Greg Wilkins 121e725740 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-28 09:59:47 +11:00
Greg Wilkins de75b82f99 419350 Do not borrow space from passed arrays 2013-10-28 09:59:05 +11:00
Greg Wilkins 05cab9bfb4 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java
2013-10-26 11:01:25 +11:00
Joakim Erdfelt 5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Greg Wilkins 28566c72c8 420142 reimplemented graceful shutdown 2013-10-24 17:22:08 +11:00
Greg Wilkins d6e301d7fd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-24 16:02:35 +11:00
Greg Wilkins ac3787b167 420033 AsyncContext.onTimeout exceptions passed to onError
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
2013-10-24 15:33:08 +11:00
Greg Wilkins d5f83a8159 420034 Removed threads/timers from Date caching 2013-10-24 11:09:17 +11:00
Joakim Erdfelt ebf11ebfb8 Fixing javadoc 2013-10-23 16:59:30 -07:00
Greg Wilkins 353357e816 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-23 11:28:55 +11:00
Greg Wilkins 55b279cc3d 420048 - DefaultServlet alias checks configured resourceBase
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-10-23 08:00:30 +11:00
Jan Bartel c5fe3bcfd3 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenAnnotationConfiguration.java
2013-10-21 17:27:45 +11:00
Greg Wilkins cd1035d1d6 minor code cleanups 2013-10-21 16:30:22 +11:00
Greg Wilkins 33e2055468 minor code cleanups 2013-10-21 15:50:22 +11:00
Greg Wilkins ffffd3938c fixed merge 2013-10-21 14:56:23 +11:00
Greg Wilkins 565bd3b331 419937 - Request isSecure cleared on recycle 2013-10-21 13:25:47 +11:00
Greg Wilkins 82a991dd07 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-21 12:32:54 +11:00
Greg Wilkins 24c1b30495 418732 - Add whiteListByPath mode to IPAccessHandler
Fixed the contribution.

The PathMap changes were not correct as "" is the pattern for "/" path only.
Also removed the use of the lazy list
2013-10-21 12:20:34 +11:00
Jan Bartel ad64ca831a 419846 JDBCSessionManager doesn't determine dirty state correctly 2013-10-21 12:16:04 +11:00
Joakim Erdfelt d6d54e048b Merge branch 'master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/AnnotatedMaxMessageSizeTest.java
2013-10-18 16:12:00 -07:00
Constantine Linnick f451a14e04 [Bug 418732] Add whiteListByPath mode to IPAccessHandler
Signed-off-by: Constantine Linnick <theaspect@gmail.com>
2013-10-18 01:10:35 -04:00
Constantine Linnick b4052a2b53 [Bug 418732] Swap PathMap with IPAddressMap, also fix PathMap initialization bug
Signed-off-by: Constantine Linnick <theaspect@gmail.com>
2013-10-18 01:05:44 -04:00
Greg Wilkins b31466839a 419799 Async timeout dispatches to error page
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
2013-10-18 14:50:01 +11:00
Greg Wilkins f3b393aa5d Refactored complexity out of HttpFields
In preparation of merging Fields class and supporting HTTP/2.0 HPACK
2013-10-17 21:35:11 +11:00
Greg Wilkins 1d5730d8d2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-14 17:19:09 +11:00
Greg Wilkins b8c8abae2e 419333 treat // as an alias in path 2013-10-14 17:16:54 +11:00
Greg Wilkins defa3a04cf Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	VERSION.txt
	aggregates/jetty-all/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-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/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-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-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/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-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-server/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/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
	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-loginservice/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-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-jetty-webapp/src/main/config/demo-base/webapps/test.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
2013-10-14 13:10:02 +11:00
Greg Wilkins ad124b6888 419309 Added symlink checker to test webapp 2013-10-14 11:59:18 +11:00
Joakim Erdfelt 8f4a403d4e 419146 - Parameterize etc/jetty-requestlog.xml values 2013-10-10 08:42:29 -07:00
Greg Wilkins d535cb9c92 continuations is an optional module 2013-10-04 08:22:27 +10:00
Greg Wilkins 2d53fe8744 cleaned up demo 2013-10-03 18:43:06 +10:00
Joakim Erdfelt c829d7dbaa Fixing test failure on testAttributes because of Executors assumption 2013-09-30 14:09:49 -07:00
Jesse McConnell 856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell 0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05:00
Greg Wilkins 6146f0cc9c cleanup threadpool usage 2013-09-30 14:07:17 +10:00
Greg Wilkins 5f02620603 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
2013-09-30 13:20:13 +10:00
Greg Wilkins f07722909f reduced routine exception verbosity 2013-09-30 12:45:16 +10:00
Greg Wilkins 0fac295cd8 418014 Handle NTFS canonical exceptions during alias check
replaced URL returns with URI
2013-09-27 15:50:36 +10:00
Greg Wilkins 857d534d8d 417239 re-implemented Request.getContentRead() 2013-09-23 15:10:46 +10:00
Greg Wilkins f2f8ec54c6 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	aggregates/jetty-all/pom.xml
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
2013-09-23 13:38:43 +10:00
Greg Wilkins d96df5d1c7 improved low resources messages 2013-09-23 13:30:09 +10:00
Jesse McConnell 0525498ad3 [maven-release-plugin] prepare for next development iteration 2013-09-19 15:06:31 -05:00
Jesse McConnell c05a725db6 [maven-release-plugin] prepare release jetty-9.0.6.v20130919 2013-09-19 15:06:17 -05:00
Greg Wilkins 3acda280a8 416577 enhanced shutdown handler to send shutdown at startup 2013-09-19 12:28:07 +10:00
Greg Wilkins ba5a709245 416577 enhanced shutdown handler to send shutdown at startup 2013-09-19 09:19:55 +10:00
Greg Wilkins c6a29339ab 417475 Do not null context Trie during dynamic deploy 2013-09-19 09:00:57 +10:00
Greg Wilkins 5a801d398d Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-16 12:10:55 +10:00
Greg Wilkins 9113767907 417260 Protected targets matched as true URI path segments 2013-09-16 10:07:59 +10:00
Greg Wilkins 9b94ab34ba 417022 Request attribute access to Server,HttpChannel & HttpConnection 2013-09-12 10:17:01 +10:00
Jan Bartel c0f5c5a659 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
2013-09-10 10:18:12 +10:00
Jan Bartel f85acc7437 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-09-10 09:48:09 +10:00
Jan Bartel ab9ecd277d 416266 HttpServletResponse.encodeURL() encodes on first request when only SessionTrackingMode.COOKIE is used 2013-09-10 08:57:59 +10:00
Greg Wilkins 6ff664baf2 416015 Handle null Accept-Language and other headers 2013-09-09 17:47:25 +10:00
Greg Wilkins 843e94e4e0 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
2013-09-09 17:11:38 +10:00
Greg Wilkins e2e1b47edf 416015 Handle null Accept-Language and other headers 2013-09-09 16:51:37 +10:00
Greg Wilkins 070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky 767faece5c [Bug 415999] Fix some of FindBugs warnings
Mostly not closed streams/DB resources are fixed. But also less
important things.

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Thomas Becker 9008210c2e setuid.mod, ext.mod fix module errors 2013-09-06 17:34:28 +02:00