1263d1f3c8
[maven-release-plugin] prepare for next development iteration
2014-12-03 08:26:47 -06:00
5c7f706496
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 08:26:35 -06:00
007b7dac1c
Merged branch 'jetty-9.2.x' into branch 'master'.
2014-11-27 12:01:02 +01:00
a129b0bcd1
451634 DefaultServlet: useFileMappedBuffer javadoc is misleading
2014-11-27 14:35:49 +11:00
ab2e9c357f
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
2014-11-20 16:34:30 +11:00
46a5ef861d
447472 Clear async context timeout on async static content
2014-11-20 11:41:11 +11:00
09846e324d
[maven-release-plugin] prepare for next development iteration
2014-11-12 17:13:19 -06:00
97d2bd95a6
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
2014-11-12 17:13:14 -06:00
d9d94ec1d2
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
jetty-servlets/src/test/resources/jetty-logging.properties
2014-11-10 16:43:56 -07:00
9e8a776c3e
450855 - GZipFilter declaration order can result in MIGHT_COMPRESS
...
+ Adding testcase GzipFilterLayeredTest to demonstrate this bug
+ Some cleanup of Gzip testing behavior to be easier to follow
(less reliance on GzipTester utility class)
2014-11-10 11:22:22 -07:00
47a92e9608
minor cleanups of HttpContent
2014-11-06 16:46:47 +11:00
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
1c4a08b35b
[maven-release-plugin] prepare for next development iteration
2014-10-31 09:58:16 -05:00
a4ff7bf841
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
2014-10-31 09:58:10 -05:00
e1b73a64eb
[maven-release-plugin] prepare for next development iteration
2014-10-30 11:28:41 -05:00
5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
b314bfcc94
446944 - ServletTester and HttpTester should be in <classifier>tests</classifier>
...
Moving HttpTester to "tests" scoped jetty-http artifact.
+ HttpTester, a testing class, was used by jetty-servlets,
embedded-jetty-examples, and test-integration, all from
those testing scopes. Moved the HttpTester into the
pre-existing jetty-http "tests" classified artifact.
Moving ServletTester to "tests" scoped jetty-servlet artifact.
+ ServletTester, a testing class, was used by jetty-servlets,
test-integration, and test-jetty-webapp. This move puts
this class in the pre-existing jetty-servlet "tests" classified
artifact.
2014-10-29 09:50:32 -07:00
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
34a8da2ba2
445823 Moved RequestLog calling to HttpChannel
...
Simplified the RequestLogHandler. It no longer set's async listeners or tries to catch exeptions etc.
Instead it simply sets the RequestLog instance on the HttpChannel. The HttpChannel#onCompleted method
then uses the log (if set) as the last thing before recycling the connection. It uses the actual
bytes written (eg after compression) and the actual status sent (eg if sent from a bad message).
2014-10-26 17:30:50 +11:00
ac1b111d57
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2014-10-24 08:46:12 +11:00
738c47bc55
447515 Remove GzipFilter
...
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
2014-10-24 08:17:05 +11:00
01a1fc166e
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-23 11:20:44 +11:00
9cc3f4b206
447629 getPart()/getParts() fails on Multipart request if getParameter is called in a filter first
2014-10-23 09:58:11 +11:00
6a6c8bacda
NPE protect DefaultServlet iteration through request fields
2014-10-16 19:02:21 +11:00
ec79a6f88e
Improve HTTP header pre-encoding
...
The HttpContent class has been reworked to store HttpField instances, we may be generated on
demand or instances of PreEncodedHttpField.
The encoding of HTTP2 fields has been generalized to handle both indexed and literal fields, selected
by header enum set.
Default servlet and response classes have been cleaned up in how they set response headers.
2014-10-16 12:31:37 +11:00
dec984302a
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogHandlerTest.java
2014-10-10 16:14:06 -07:00
e7b86b99cb
445823 - RequestLogHandler at end of HandlerCollection doesn't work
...
+ Adding more varieties of server side collection vs wrapper with error
handlers
+ Adding servlet version of tests to demonstrate behavior in servlet
context, when also using the mapped error handler
2014-10-10 11:21:40 -07:00
bb2d77f00b
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-10 14:20:30 +11:00
6a0e220b9c
446506 getAsyncContext ISE before startAsync on async dispatches
2014-10-10 14:19:42 +11:00
d60a61288a
Restoring ErrorHandler / ErrorPageErrorHandler logic
2014-09-23 11:33:43 +02:00
49a32eb1b0
444124 JSP include with <servlet><jsp-file> can cause infinite recursion
2014-09-23 11:33:43 +02:00
efad046148
Restoring ErrorHandler / ErrorPageErrorHandler logic
2014-09-18 15:10:59 -07:00
2a25402de0
444124 JSP include with <servlet><jsp-file> can cause infinite recursion
2014-09-18 18:02:18 +10:00
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
c034544ab9
reset for release
2014-09-05 08:10:15 -05:00
d8e6331434
442477 Allow Symlink aliases by default
2014-08-27 17:33:27 +10:00
c23e5f4889
[maven-release-plugin] prepare for next development iteration
2014-08-21 09:13:38 -05:00
3347e11281
[maven-release-plugin] prepare release jetty-9.2.3.v20140821
2014-08-21 09:13:32 -05:00
1c71040eca
moved config plugin to profile
2014-08-15 19:53:52 +10:00
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
a14d843382
ignored osgi-spdy tests
2014-08-14 15:18:28 +10:00
98b654ba20
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-distribution/pom.xml
2014-08-14 08:38:25 +10:00
2af613a28b
improved debugging output
2014-08-13 15:56:02 +10:00
17f46665df
preencoded httpfield optimisation
2014-08-06 21:09:26 +10:00
b5971484a5
Basic push mechanism skeleton
2014-08-06 10:50:55 +10:00
eaf374fa58
refactored Dispatcher for new HttpURI
2014-07-25 17:28:35 +10:00
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
7f62f2600b
refactored URI handling
2014-07-20 10:23:47 +10:00
35ca372e30
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-19 18:56:15 +10:00
c72649e150
435653 encode async dispatched requestURI
2014-07-19 18:55:02 +10:00
a537fefd6b
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-18 15:28:54 +10:00
a2a333ba53
435653 encode async dispatched requestURI
2014-07-17 15:51:22 +10:00
64e5c1e0ce
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-17 11:32:27 +10:00
591eedcb59
[FindBugs] Include explicit typing whereever possible
...
+ No cleanup regarding unchecked types (yet)
2014-07-17 10:47:49 +10:00
937ef10718
[FindBugs] outer if statement alreayd catches max_cached_files
2014-07-17 08:31:08 +10:00
6893027ecd
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
2014-07-16 17:23:29 +10:00
50f11bea09
439663 Allow mappings to be declared before servlet/filter
2014-07-16 15:53:07 +10:00
853e020210
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-16 15:31:48 +10:00
4d2a580c2c
439375 preferred rfc7231 format is mime;charset=lowercase-9
2014-07-11 17:56:08 +10:00
d5c210f1c3
439390 Ensure jsp scratchdir is created same way for quickstart and non-quickstart
2014-07-11 16:06:40 +10:00
644eccab8b
439387 Ensure empty servlet-class never generated for quickstart
2014-07-11 14:16:24 +10:00
5e281dd449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
66f3913527
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-25 12:34:19 +02:00
3ff4195dbc
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-06-25 12:26:45 +02:00
f93a409589
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-24 17:33:51 +02:00
fead772b64
437706 ServletTester calls LocalConnector method with hardcoded timeout
2014-06-24 10:43:15 +02:00
0539b48b8a
nicer constructors
2014-06-17 15:28:40 +02:00
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
adaeeefe32
Merged branch 'master' into 'jetty-http2'.
2014-06-16 16:08:40 +02:00
fb29f56b4d
437051 Refactor Filter chain handling of Request.isAsyncSupported
2014-06-10 16:28:45 +02:00
144a460407
436894 GzipFilter code cleanup
2014-06-10 16:28:45 +02:00
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
10b6c574ae
Merge branch 'master' into release-9
2014-06-09 13:07:22 -05:00
bb4d42f139
Merge remote-tracking branch 'origin' into jetty-http2
2014-06-04 15:09:19 +02:00
8f4aeeeb8d
updated version to 10.0.0-SNAPSHOT
2014-06-04 15:08:54 +02:00
e8fcb90bc2
DefaultServlet uses cached headers
2014-06-04 15:05:34 +02:00
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
6a3cab2a2f
[maven-release-plugin] prepare for next development iteration
2014-05-15 14:44:37 -05:00
eec01cbff4
[maven-release-plugin] prepare release jetty-9.2.0.RC0
2014-05-15 14:44:28 -05:00
fb2010177c
434715 Avoid call to ServletHolder.getServlet() during handle() iff servlet is available and instantiated
2014-05-13 11:21:38 +02:00
e4d6768901
434386 - Request Dispatcher extracts args and prevents asyncIO.
...
Changed behavior of mergeQueryParameters() so that new query
parameters hide old query parameters, but they are accumulated for
getParameter() APIs.
2014-05-12 13:08:28 +02:00
ba4ed86e31
434386 - Request Dispatcher extracts args and prevents asyncIO.
...
Avoid to read the content from within include() or forward(), therefore
making possible to proxy the content as-is to an upstream server.
2014-05-12 10:57:13 +02:00
8fb9baace1
Change org.eclipse.jetty.servlet.jspPackagePrefix to a context init-param
2014-05-07 15:29:36 +02:00
7db7620c36
367680 jsp-file with load-on-startup not precompiled
2014-05-06 21:22:00 +02:00
51c5a4c833
425421 ContainerLifeCycle does not start added beans in started state
2014-05-05 14:53:53 +02:00
1e8d8b8b3e
433572 default to sending date header
2014-04-28 14:50:58 +02:00
718017af94
Minor tweak to throwable assertion to be more reliable
2014-04-25 12:36:08 -07:00
eade9a3d25
432901 ensure a single onError callback only in pending and unready states
2014-04-25 18:23:54 +02:00
87c5b30d1c
432901 ensure a single onError callback only in pending and unready states
2014-04-25 17:26:43 +02:00
8855b79be5
433431 Support ServletHandler fall through
2014-04-25 12:21:55 +02:00
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
c5e1e249e7
set version for 9.2.x
2014-03-31 11:35:06 +11:00
5c188e02b7
improved AsyncServletTest
2014-03-24 15:11:40 +11:00
0d1fca545c
424107 Abort HttpTransport if already committed on error
2014-03-21 13:51:30 +11:00
c251d5789d
Adding some getRequestURI tests to validate servlet behavior
2014-03-19 11:08:30 -07:00
b3be247423
merged quickstart changes
2014-03-14 13:07:00 +11:00
af7dd4b99e
increase large writes to try to always achieve !isReady
2014-03-13 10:53:00 +11:00
0c8bdb650c
cleaning up test
2014-03-10 12:31:44 -07:00
84fa579ec7
429616 Use UTF-8 encoding for XML
2014-03-10 15:23:08 +11:00
0ec0d452e9
[maven-release-plugin] prepare for next development iteration
2014-03-07 09:10:08 -06:00
1e555567a9
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
2014-03-07 09:10:08 -06:00
18e19260ff
Apply changes resulting from the quickstart project
2014-02-13 12:31:14 +11:00
eb0aea46ce
set versions.txt file to new version and fix mistaken developmentVersion
2014-02-10 13:48:29 -06:00
f3d38dfb15
[maven-release-plugin] prepare for next development iteration
2014-02-10 11:17:14 -06:00
8f6cbc9111
[maven-release-plugin] prepare release jetty-9.1.2.v20140210
2014-02-10 11:17:07 -06:00
5edf2799e9
Made test more robust.
...
The response may arrive on client before the server notifies the
complete listeners, so the assert on client side was spuriously
failing to check the completion on server side.
2014-02-06 11:27:22 +01:00
7725056234
426750 isReady() returns true at EOF
2014-02-05 17:34:22 +11:00
a09d05b5cb
protected ServletHandler API
2014-01-30 15:52:15 +11:00
b82ec6e668
[maven-release-plugin] prepare for next development iteration
2014-01-08 16:47:09 -06:00
b99623a21d
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
2014-01-08 16:47:01 -06:00
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
801a33d367
424303 @ServletSecurity not applied on non load-on-startup servlets
2013-12-19 15:23:42 +11:00
56b0fedf69
424398 Servlet load-on-startup ordering is not obeyed
2013-12-19 15:02:35 +11:00
9e2d0a33d6
424284 Identify conflicts in logging when error "Multiple servlets map to {pathspec}" occurs
2013-12-19 10:05:46 +11:00
2d3d912173
423361 Ensure ServletContainerInitializers called before injecting Listeners
2013-12-13 15:03:46 +11:00
1731e0c69a
423392 - GzipFilter without wrapping or blocking
...
ensure that servlets are enabled for demo
2013-12-13 12:19:38 +11:00
dfe5889bc4
423361 Make all listeners injectable irrespective of method of declaration (descriptor, api, annotation)
2013-12-12 14:44:38 +11:00
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
232ca134fc
removed debug print from test
2013-12-02 18:49:23 +11:00
f1fc661a2c
reenabled integration and RFC2616 tests
2013-11-29 17:33:05 +11:00
51e82b4c5c
422807 fragment large written byte arrays to protect from JVM OOM bug
2013-11-29 14:28:07 +11:00
152f3f85f5
422734 messages per second in ConnectorStatistics
2013-11-28 19:10:56 +11:00
a67acf16bf
changed gzip default to match webdefault.xml
2013-11-25 13:22:35 +11:00
9172d6115b
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:58:44 -07:00
6feeab6ec3
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:58:36 -07:00
7bbc0ff4df
[maven-release-plugin] rollback the release of jetty-9.1.0.v20131115
2013-11-15 16:33:52 -07:00
1126e68971
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:03:28 -07:00
d6418c73d4
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:03:20 -07:00
6c372b9440
Reverting <version> to 9.1.0-SNAPSHOT
2013-11-15 15:36:26 -07:00
b5345caed1
[maven-release-plugin] prepare for next development iteration
2013-11-14 15:27:52 -06:00
1582aa196d
[maven-release-plugin] prepare release jetty-9.1.0.v20131114
2013-11-14 15:27:37 -06:00
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
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
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
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
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
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
56fcfa45fb
420844 Connection:close on exceptional errors
2013-11-01 13:37:44 +11:00
37ea88d299
fixed bad merge
2013-11-01 08:09:26 +11:00
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
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
d6e301d7fd
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-10-24 16:02:35 +11:00
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
353357e816
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-10-23 11:28:55 +11:00
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
ffffd3938c
fixed merge
2013-10-21 14:56:23 +11:00
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
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
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
33b10efcaa
Merge remote-tracking branch 'origin/release-9'
2013-10-14 11:12:31 +11:00
7cb553557e
418636 Name anonymous filter and holders with classname-hashcode
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
2013-10-04 16:12:53 +10:00
52752ae142
418636 Name anonymous filter and holders with classname-hashcode
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
2013-10-04 16:10:47 +10:00
856a24b65a
[maven-release-plugin] prepare for next development iteration
2013-09-30 14:46:09 -05:00
f466f03c6a
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
2013-09-30 14:46:00 -05:00
0b3f431d27
set version back to 9.0.6-SNAPSHOT
2013-09-30 12:33:06 -05:00
af2e6ff911
Merge branch 'master' into release-9
2013-09-30 12:28:04 -05:00
ac40e7ab6a
Fixing various javadoc errors
2013-09-25 08:11:32 -07:00
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
43c92f8117
416812 - Don't start WebSocketClient for every context
...
turn off for all contexts in demo
2013-09-12 20:44:13 +10:00
c21ce1183e
417023 Add Default404Servlet if no default servlet set
2013-09-12 10:15:19 +10:00
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
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
c3bd5752ee
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-09-06 09:19:45 +10:00
ee52769dea
416663 Content-length set by resourcehandler
2013-09-06 09:19:05 +10:00
a3f6633385
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-09-05 13:19:12 +10:00
9b9c7ba8d1
416568 Simplified servlet exception logging
2013-09-05 11:04:11 +10:00
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
ef166c23e6
Merge branch 'release-9'
2013-08-23 18:58:01 -05:00
b8e1f42b37
414635 Modular start.d and jetty.base property
...
+ More mod cleanup
+ Adding cyclic module reference detection and reporting
2013-08-22 14:21:52 -07:00
450cdb3ef4
add servlet/s mod
2013-08-22 12:21:52 -05:00
0cdd884672
Merged branch 'master' into 'jetty-9.1'.
2013-08-21 22:20:11 +02:00
8951c4c773
Added tests for AsyncContext listeners behaviour.
2013-08-21 22:18:56 +02:00
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
7fb7fe71ec
Fixing malformed Javadoc warnings in jetty-servlet
2013-08-14 12:46:25 -07:00
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
0cc46e8beb
414891 - Errors thrown by ReadListener and WriteListener not handled correctly.
...
Now correctly catching Throwable to handle all exception cases.
2013-08-12 18:52:14 +02:00
d2c68bb4aa
412830 Error Page match ServletException then root cause
2013-08-08 12:22:28 +10:00
ca37782229
412829 Allow any mappings from web-default.xml to be overridden by web.xml
2013-07-23 12:18:18 +10:00
8645849272
398467 Servlet 3.1 Non Blocking IO
...
Added ByteBuffer write and improved test harnesses
2013-07-18 12:53:07 +10:00
bd2add0ae9
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
2013-07-12 13:53:58 +10:00
4a49a5e3f0
398467 Servlet 3.1 Non Blocking IO
...
Handle bad listeners
2013-07-08 13:08:53 +10:00
981102fda5
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
965918d8f2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-04 17:28:57 +10:00
c33db24d94
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 15:00:47 +10:00
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
31faf2fe20
Reverting failed release from friday
2013-06-25 07:42:45 -07:00
068e67a8df
Code cleanups for direct RequestDispatcher access
2013-06-24 13:13:03 +10:00
b2b2ce25fc
Revert "Code cleanups for direct RequestDispatcher access"
...
This reverts commit 1ff665f76a
2013-06-24 13:11:04 +10:00
1ff665f76a
Code cleanups for direct RequestDispatcher access
2013-06-24 13:00:21 +10:00
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -07:00
31082e1f8e
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-06-18 08:37:49 +10:00
2da8c9c306
Merge branch 'master' into javawebsocket-jsr
...
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
2013-06-17 10:54:10 -07:00
d87df5d89e
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-06-17 20:39:03 +10:00
0e4fbcb1ca
410693 ServletContextHandler.setHandler does not relink handlers - check for null
2013-06-17 20:37:06 +10:00
6b9742ff86
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-06-17 16:54:47 +10:00
d47eb462e7
410693 ServletContextHandler.setHandler does not relink handlers
2013-06-17 16:53:22 +10:00
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
d6d5c04273
410893 async support defaults to false for spec created servlets and filters
2013-06-17 14:47:55 +10:00
65a7f9f279
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-06-17 14:46:10 +10:00
2ea7843d86
Merge remote-tracking branch 'origin/jetty-8'
2013-06-17 14:39:17 +10:00
9bf7870c7c
410893 async support defaults to false for spec created servlets and filters
2013-06-17 14:21:53 +10:00
1908fff38f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-06-17 14:11:46 +10:00
59889bc149
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-06-17 13:17:14 +10:00
232eb4491a
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-06-17 13:13:59 +10:00
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
64d979a780
409449 Ensure servlets, filters and listeners added via dynamic registration, annotations or descriptors are cleaned on context restarts
2013-06-12 15:41:03 +10:00
2d661f18dd
410405 Avoid NPE for requestDispatcher(../)
...
Test double encoded dot dot
2013-06-11 15:30:40 +10:00
2b1e6bf0de
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
2013-06-11 15:11:23 +10:00
9ec1378b73
fixed merge
2013-06-11 14:57:48 +10:00
ed04753111
410405 Avoid NPE for requestDispatcher(../)
2013-06-11 14:22:54 +10:00
f8e0764fa5
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-06-11 14:07:46 +10:00
06d3fbe5aa
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java
2013-06-11 14:07:00 +10:00
d2794584e1
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
52994f336a
408662 In pax-web servlet services requests even if init() has not finished running
2013-06-07 15:39:20 +10:00
b01e6432a5
Merge branch 'master' into javawebsocket-jsr
2013-06-05 10:20:50 -07:00
e65e4e168d
409842 - Suspended request completed by a request thread does not set read interest.
...
HttpConnection.completed() now performs the right check about the current connection.
2013-06-05 11:34:12 +02:00
3db9299369
Merge branch 'jetty-7' into jetty-8
2013-06-04 11:24:44 -07:00
0c4a266d60
Fixing JDK5 test error with comparison of query string
2013-06-04 09:04:12 -07:00
020dd1022c
Merge branch 'master' into javawebsocket-jsr
2013-06-03 09:06:38 -07:00
7bb3a7be28
409556 Resource files not closed
...
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.
FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
952f8442e5
408529 Etags set in 304 response
...
Improved default servlet setting of etags
2013-06-03 14:22:24 +10:00
2d964313e8
Merge branch 'master' into javawebsocket-jsr
2013-05-31 10:54:16 -07:00
41ac4a0877
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-31 18:46:10 +10:00
0e11c82307
fixed merge
2013-05-31 18:07:01 +10:00
842309e656
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-05-31 18:06:34 +10:00
3849c893e1
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-31 11:07:40 +10:00
219be496d9
408529 Etags set in 304 response
2013-05-31 10:59:34 +10:00
af02e9b16d
Update to version to 8.1.12-SNAPSHOT after last release
2013-05-30 10:52:39 +10:00
ce662c7ddc
398467 Servlet 3.1 Non Blocking IO
...
cleaned up test harness
2013-05-28 23:29:38 +10:00
c7be106423
398467 Servlet 3.1 Non Blocking IO
...
Working async writes after HttpChannelState refactor
2013-05-25 15:45:16 +10:00
Jesse McConnell
Simone Bordet
Jan Bartel
Greg Wilkins
Joakim Erdfelt
Mikhail Mazursky