f6cfe07a69
added direct buffer configuration
2015-02-05 10:02:01 +11:00
5e95caaf29
added test for async IO isNotReadyAtEOF
2015-02-04 13:15:01 +11:00
47055dd2c8
added test for async IO isNotReadyAtEOF
2015-02-04 12:40:36 +11:00
40ffac3339
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-02-04 12:35:34 +11:00
44b3abc839
added test for async IO isNotReadyAtEOF
2015-02-04 12:35:04 +11:00
f5588c7ada
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-02-04 11:44:43 +11:00
acbffecb60
added test for async IO isNotReadyAtEOF
2015-02-04 11:43:19 +11:00
65b8872227
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-02-04 10:59:34 +11:00
be127ee0cf
added test for async IO isNotReadyAtEOF
2015-02-04 10:58:57 +11:00
8c2e82c1b6
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-01-23 14:58:39 +01:00
ae47edb8a7
458175 multipart annotation on lazily loaded servlet does not work
2015-01-23 13:59:49 +01:00
e1cc5fb487
Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
2015-01-08 15:21:01 +01:00
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
a4d2895400
removed unneeded execute for SslConnection onFillable
2015-01-02 15:24:14 +01:00
200b3a3e64
fixed merge
2014-12-31 16:28:35 +01:00
d161bdcb36
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-12-11 13:50:21 +01:00
d3763e0d1c
454157 - HttpInput.consumeAll spins if input is in async mode.
...
Added additional check to test whether consumeAll() could actually
consume the content, and if not, abort the channel.
2014-12-05 14:12:01 +01:00
0f4a4cdac6
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
2014-12-05 08:11:54 +01:00
07e87f0ecf
454157 abort to avoid spin in async HttpInput.consumeAll
2014-12-04 17:39:53 +01:00
a04a576c45
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-12-04 14:17:47 +01:00
867feedca4
453629 Fixed big write test
2014-12-04 13:34:53 +01: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
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
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
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
d8e6331434
442477 Allow Symlink aliases by default
2014-08-27 17:33:27 +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
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
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
e8fcb90bc2
DefaultServlet uses cached headers
2014-06-04 15:05:34 +02: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
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
18e19260ff
Apply changes resulting from the quickstart project
2014-02-13 12:31:14 +11: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
Greg Wilkins
Jan Bartel
Joakim Erdfelt
Simone Bordet