Greg Wilkins
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
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
Joakim Erdfelt
ac40e7ab6a
Fixing various javadoc errors
2013-09-25 08:11:32 -07: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
43c92f8117
416812 - Don't start WebSocketClient for every context
...
turn off for all contexts in demo
2013-09-12 20:44:13 +10:00
Greg Wilkins
c21ce1183e
417023 Add Default404Servlet if no default servlet set
2013-09-12 10:15:19 +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
Greg Wilkins
c3bd5752ee
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-09-06 09:19:45 +10:00
Greg Wilkins
ee52769dea
416663 Content-length set by resourcehandler
2013-09-06 09:19:05 +10:00
Greg Wilkins
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
Greg Wilkins
9b9c7ba8d1
416568 Simplified servlet exception logging
2013-09-05 11:04:11 +10:00
Jesse McConnell
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
Jesse McConnell
ef166c23e6
Merge branch 'release-9'
2013-08-23 18:58:01 -05:00
Joakim Erdfelt
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
Jesse McConnell
450cdb3ef4
add servlet/s mod
2013-08-22 12:21:52 -05:00
Simone Bordet
0cdd884672
Merged branch 'master' into 'jetty-9.1'.
2013-08-21 22:20:11 +02:00
Simone Bordet
8951c4c773
Added tests for AsyncContext listeners behaviour.
2013-08-21 22:18:56 +02:00
Jan Bartel
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
Jan Bartel
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
Jan Bartel
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
Jan Bartel
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
Jan Bartel
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
Joakim Erdfelt
7fb7fe71ec
Fixing malformed Javadoc warnings in jetty-servlet
2013-08-14 12:46:25 -07:00
Jesse McConnell
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
Simone Bordet
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
Greg Wilkins
d2c68bb4aa
412830 Error Page match ServletException then root cause
2013-08-08 12:22:28 +10:00
Jan Bartel
ca37782229
412829 Allow any mappings from web-default.xml to be overridden by web.xml
2013-07-23 12:18:18 +10:00
Greg Wilkins
8645849272
398467 Servlet 3.1 Non Blocking IO
...
Added ByteBuffer write and improved test harnesses
2013-07-18 12:53:07 +10:00
Jan Bartel
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
Greg Wilkins
4a49a5e3f0
398467 Servlet 3.1 Non Blocking IO
...
Handle bad listeners
2013-07-08 13:08:53 +10:00
Greg Wilkins
981102fda5
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
Greg Wilkins
965918d8f2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-04 17:28:57 +10:00
Greg Wilkins
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
Joakim Erdfelt
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
Joakim Erdfelt
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
Joakim Erdfelt
31faf2fe20
Reverting failed release from friday
2013-06-25 07:42:45 -07:00
Greg Wilkins
068e67a8df
Code cleanups for direct RequestDispatcher access
2013-06-24 13:13:03 +10:00
Greg Wilkins
b2b2ce25fc
Revert "Code cleanups for direct RequestDispatcher access"
...
This reverts commit 1ff665f76a
.
2013-06-24 13:11:04 +10:00
Greg Wilkins
1ff665f76a
Code cleanups for direct RequestDispatcher access
2013-06-24 13:00:21 +10:00
Jesse McConnell
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
Jesse McConnell
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
Joakim Erdfelt
f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -07:00
Jan Bartel
31082e1f8e
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-06-18 08:37:49 +10:00
Joakim Erdfelt
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
Jan Bartel
d87df5d89e
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-06-17 20:39:03 +10:00
Jan Bartel
0e4fbcb1ca
410693 ServletContextHandler.setHandler does not relink handlers - check for null
2013-06-17 20:37:06 +10:00
Jan Bartel
6b9742ff86
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-06-17 16:54:47 +10:00
Jan Bartel
d47eb462e7
410693 ServletContextHandler.setHandler does not relink handlers
2013-06-17 16:53:22 +10:00
Greg Wilkins
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
Greg Wilkins
d6d5c04273
410893 async support defaults to false for spec created servlets and filters
2013-06-17 14:47:55 +10:00
Greg Wilkins
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
Jan Bartel
2ea7843d86
Merge remote-tracking branch 'origin/jetty-8'
2013-06-17 14:39:17 +10:00
Greg Wilkins
9bf7870c7c
410893 async support defaults to false for spec created servlets and filters
2013-06-17 14:21:53 +10:00
Jan Bartel
1908fff38f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-06-17 14:11:46 +10:00
Jan Bartel
59889bc149
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-06-17 13:17:14 +10:00
Jan Bartel
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
Jesse McConnell
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
Jan Bartel
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
Greg Wilkins
2d661f18dd
410405 Avoid NPE for requestDispatcher(../)
...
Test double encoded dot dot
2013-06-11 15:30:40 +10:00
Greg Wilkins
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
Greg Wilkins
9ec1378b73
fixed merge
2013-06-11 14:57:48 +10:00
Greg Wilkins
ed04753111
410405 Avoid NPE for requestDispatcher(../)
2013-06-11 14:22:54 +10:00
Greg Wilkins
f8e0764fa5
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-06-11 14:07:46 +10:00
Greg Wilkins
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
Greg Wilkins
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
Jan Bartel
52994f336a
408662 In pax-web servlet services requests even if init() has not finished running
2013-06-07 15:39:20 +10:00
Joakim Erdfelt
b01e6432a5
Merge branch 'master' into javawebsocket-jsr
2013-06-05 10:20:50 -07:00
Simone Bordet
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
Joakim Erdfelt
3db9299369
Merge branch 'jetty-7' into jetty-8
2013-06-04 11:24:44 -07:00
Joakim Erdfelt
0c4a266d60
Fixing JDK5 test error with comparison of query string
2013-06-04 09:04:12 -07:00
Joakim Erdfelt
020dd1022c
Merge branch 'master' into javawebsocket-jsr
2013-06-03 09:06:38 -07:00
Greg Wilkins
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
Greg Wilkins
952f8442e5
408529 Etags set in 304 response
...
Improved default servlet setting of etags
2013-06-03 14:22:24 +10:00
Joakim Erdfelt
2d964313e8
Merge branch 'master' into javawebsocket-jsr
2013-05-31 10:54:16 -07:00
Greg Wilkins
41ac4a0877
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-31 18:46:10 +10:00
Greg Wilkins
0e11c82307
fixed merge
2013-05-31 18:07:01 +10:00
Greg Wilkins
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
Greg Wilkins
3849c893e1
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-31 11:07:40 +10:00
Greg Wilkins
219be496d9
408529 Etags set in 304 response
2013-05-31 10:59:34 +10:00
Jan Bartel
af02e9b16d
Update to version to 8.1.12-SNAPSHOT after last release
2013-05-30 10:52:39 +10:00
Greg Wilkins
ce662c7ddc
398467 Servlet 3.1 Non Blocking IO
...
cleaned up test harness
2013-05-28 23:29:38 +10:00
Greg Wilkins
c7be106423
398467 Servlet 3.1 Non Blocking IO
...
Working async writes after HttpChannelState refactor
2013-05-25 15:45:16 +10:00
Greg Wilkins
94d1f4a020
398467 Servlet 3.1 Non Blocking IO
...
Check point progress as I dispair at the insane complexity of servlet 3.1 specification
2013-05-24 14:34:27 +10:00
Greg Wilkins
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
Joakim Erdfelt
598ecd7d7f
Merge branch 'master' into javawebsocket-jsr
2013-05-22 09:25:06 -07:00
Jesse McConnell
725dc261c8
Merge branch 'release-8' into jetty-8
2013-05-22 10:44:14 -05:00
Jesse McConnell
a1a6f0e5f2
Merge branch 'release-7' into jetty-7
2013-05-22 10:39:24 -05:00
Jesse McConnell
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
Jesse McConnell
742f6a063d
[Bug 408600] set correct jetty.url in all pom files
2013-05-21 13:16:39 -05:00
Jesse McConnell
bdbd92dbc9
[Bug 408600] set correct jetty.url in all pom files
2013-05-21 13:10:07 -05:00
Jesse McConnell
0858e69cb1
[maven-release-plugin] prepare for next development iteration
2013-05-20 07:19:34 -05:00
Jesse McConnell
d469b77663
[maven-release-plugin] prepare release jetty-8.1.11.v20130520
2013-05-20 07:19:25 -05:00
Jesse McConnell
497c2f7819
[maven-release-plugin] prepare for next development iteration
2013-05-20 07:15:00 -05:00
Jesse McConnell
b32d0260c9
[maven-release-plugin] prepare release jetty-7.6.11.v20130520
2013-05-20 07:14:52 -05:00
Greg Wilkins
5397f16559
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-17 14:09:17 +10:00
Jan Bartel
9c168866ff
407931 Add toggle for failing on servlet availability
2013-05-16 10:27:04 +10:00
Jan Bartel
3f4a05fde3
407931 Add toggle for failing on servlet availability
2013-05-16 08:25:46 +10:00
Jan Bartel
cbac0ea5fa
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-16 07:24:49 +10:00
Greg Wilkins
0116f45ff0
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous default servlet
2013-05-14 10:09:09 +10:00
Jan Bartel
73bee3af4b
407708 - HttpUpgradeHandler must support injection
2013-05-13 17:47:53 +10:00
Jan Bartel
215d2e2095
405526 Deployment must fail if more than 1 servlet maps to same url pattern
2013-05-10 15:33:57 +10:00
Joakim Erdfelt
9f82849900
Merge from [master] to [javawebsocket-jsr]
2013-05-09 12:10:57 -07:00
Greg Wilkins
4dcc9b39fc
407614 added excludedMimeTypes to gzipFilter
2013-05-09 14:16:54 +10:00
Jesse McConnell
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
Jesse McConnell
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
Jan Bartel
0d181d9a75
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-03 16:59:39 +10:00
Jan Bartel
dfbef2db05
Merge remote-tracking branch 'origin/jetty-8'
2013-05-03 16:20:51 +10:00
Jan Bartel
f4ee8ba48d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-03 16:18:24 +10:00
Jan Bartel
e2c217d405
407136 @PreDestroy called after Servlet.destroy()
2013-05-03 16:17:16 +10:00
Jan Bartel
e7ecfd2b2b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
Greg Wilkins
e781393258
406768 Improved handling of static content resources
2013-04-30 15:52:11 +10:00
Greg Wilkins
7955548d10
406390 Close if at END and content remaining
2013-04-29 14:01:11 +10:00
Joakim Erdfelt
a4644dc780
JSR-356 working out server endpoint creation
2013-04-23 11:06:01 -07:00
Jan Bartel
2360f5dcd5
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-23 15:08:56 +10:00
Jan Bartel
3df03e18d7
405437 Implement section 13.8.4 Uncovered HTTP methods
2013-04-23 13:52:41 +10:00
Greg Wilkins
03fd068ebc
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
2013-04-22 14:20:03 +10:00
Greg Wilkins
a275c8fb37
Merge branch 'master' into servlet-3.1-api
2013-04-22 12:10:13 +10:00
Greg Wilkins
c3325e8b04
405530 Wrap AsyncContext to throw ISE after complete
2013-04-22 11:33:44 +10:00
Greg Wilkins
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
Jan Bartel
45bc7e6f5c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-18 14:50:58 +10:00
Jan Bartel
f23b15adaf
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-client/src/test/java/org/eclipse/jetty/client/SslBytesServerTest.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/JspPropertyGroupServlet.java
2013-04-18 14:43:05 +10:00
Jan Bartel
3812622365
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-18 14:37:38 +10:00
Jan Bartel
2e5a233cd3
405537 NPE in rendering JSP using SPDY and wrapped ServletRequest
2013-04-18 14:26:18 +10:00
Jan Bartel
d34bd7aec7
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-18 12:16:24 +10:00
Jan Bartel
2dd2b78335
405925 Redeploy with jetty-maven-plugin fails
2013-04-18 11:19:03 +10:00
Jesse McConnell
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
Jesse McConnell
e390b54b25
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
2013-04-17 11:46:31 -05:00
Jesse McConnell
0b20467c6f
[maven-release-plugin] prepare for next development iteration
2013-04-15 11:40:45 -05:00
Jesse McConnell
3aa4301711
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
2013-04-15 11:40:37 -05:00
Jan Bartel
1092201341
405525 Throw IllegalArgumentException if filter or servlet name is null or empty string in ServletContext.addXXX() methods
2013-04-15 18:09:39 +10:00
Greg Wilkins
b8dd8bde14
[maven-release-plugin] prepare for next development iteration
2013-04-08 12:31:34 +10:00
Greg Wilkins
bf3771904b
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
2013-04-08 12:30:59 +10:00
Jan Bartel
0965ca62e2
404906 servlets with load-on-startup = 0 are not fired up on jetty 9 startup
2013-04-08 09:58:46 +10:00
Greg Wilkins
1191142c97
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
2013-04-05 08:31:31 +11:00
Greg Wilkins
e9185aa062
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-04 16:09:19 +11:00
Greg Wilkins
060389147b
404128 Add Vary headers rather than set them
2013-04-04 16:05:27 +11:00
Joakim Erdfelt
4d52c3ca8e
402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request
2013-03-19 11:28:23 -07:00
Jan Bartel
cd47727ce4
402982 Premature initialization of Servlets
2013-03-14 15:28:41 +11:00
Jesse McConnell
acb5919844
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:10:50 -05:00
Jesse McConnell
d6ebdc0a4a
[maven-release-plugin] prepare release jetty-7.6.10.v20130312
2013-03-12 09:10:42 -05:00
Jesse McConnell
0405c8ded6
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:05:25 -05:00
Jesse McConnell
852178cd01
[maven-release-plugin] prepare release jetty-8.1.10.v20130312
2013-03-12 09:05:14 -05:00
Greg Wilkins
11442814fa
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-03-11 17:23:54 +11:00
Greg Wilkins
97eec14651
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-11 12:47:10 +11:00
Greg Wilkins
59f8d375b9
402833 Test harness for global error page and hide exception message from reason string
2013-03-11 12:12:07 +11:00
Joakim Erdfelt
bbf44a5d32
Merge branch 'release-9'
2013-03-09 06:16:25 -07:00
Joakim Erdfelt
897c35c2cb
[maven-release-plugin] prepare for next development iteration
2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
2013-03-08 11:33:15 -07:00
Jan Bartel
f1cd726ba2
Merge remote-tracking branch 'origin/jetty-8'
2013-03-08 14:27:24 +11:00
Joakim Erdfelt
7fc38f6c0f
[maven-release-plugin] prepare for next development iteration
2013-03-07 19:14:19 -07:00
Joakim Erdfelt
96d045442f
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
2013-03-07 19:14:11 -07:00
Greg Wilkins
b7aded6e55
392129 fixed merged of handling of timeouts after startAsync
2013-03-08 11:22:07 +11:00
Greg Wilkins
ae7248b6d2
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/AsyncContinuation.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
2013-03-08 11:21:05 +11:00
Greg Wilkins
face3b3584
392129 fixed handling of timeouts after startAsync
2013-03-08 09:35:08 +11:00
Jesse McConnell
778ee1411b
[maven-release-plugin] prepare for next development iteration
2013-03-06 10:21:46 -06:00
Jesse McConnell
d916078711
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
2013-03-06 10:21:38 -06:00
Joakim Erdfelt
94756a42c3
[maven-release-plugin] prepare for next development iteration
2013-03-01 16:08:32 -07:00
Joakim Erdfelt
96dabe7e62
[maven-release-plugin] prepare release jetty-9.0.0.RC3
2013-03-01 16:08:24 -07:00
Joakim Erdfelt
c267c1a9d0
[maven-release-plugin] prepare for next development iteration
2013-03-01 10:26:43 -07:00
Joakim Erdfelt
ba15fe04e2
[maven-release-plugin] prepare release jetty-9.0.0.RC3
2013-03-01 10:26:34 -07:00
Joakim Erdfelt
29b2118870
[maven-release-plugin] prepare for next development iteration
2013-02-26 09:20:45 -07:00
Joakim Erdfelt
2b82b54f6d
[maven-release-plugin] prepare release jetty-9.0.0.RC2
2013-02-26 09:20:45 -07:00
Jan Bartel
42475b1564
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-02-26 12:50:30 +11:00
Jan Bartel
1627b6eaf7
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-26 12:41:54 +11:00
Jan Bartel
0e9f74ad29
401531 StringIndexOutOfBoundsException for "/*" <url-pattern> of <jsp-property-group> fix for multiple mappings to *.jsp
2013-02-26 12:38:07 +11:00
Jan Bartel
8f4b569076
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-02-26 10:44:58 +11:00
Jan Bartel
a65adcdd38
401531 StringIndexOutOfBoundsException for "/*" <url-pattern> of <jsp-property-group>
2013-02-25 17:45:22 +11:00
Greg Wilkins
859710c2c5
401643 Improved Authentication exception messages and provided quiet servlet exception
2013-02-25 13:59:56 +11:00
Joakim Erdfelt
4dc3ed38c2
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Joakim Erdfelt
ed24f78498
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:36 -07:00
Jesse McConnell
e073ceb06d
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Jesse McConnell
2f2ad287af
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:35 -07:00
Jesse McConnell
5c58878c3c
[maven-release-plugin] prepare for next development iteration
2013-01-31 11:34:38 -06:00
Jesse McConnell
ebbe37294f
[maven-release-plugin] prepare release jetty-8.1.9.v20130131
2013-01-31 11:34:30 -06:00
Jesse McConnell
a5e1e04af1
[maven-release-plugin] prepare for next development iteration
2013-01-31 08:42:20 -06:00
Jesse McConnell
b7fb18fd65
[maven-release-plugin] prepare release jetty-7.6.9.v20130131
2013-01-31 08:42:12 -06:00
Jesse McConnell
54fab80d01
Merging from jetty-8 to master
2013-01-29 16:24:51 -06:00
Jesse McConnell
f0c6b9bc82
Merge branch 'jetty-7' into jetty-8
2013-01-29 15:51:56 -06:00
Jesse McConnell
c87cc4d4f0
resolve compilation issues with statistics servlet post patch application
2013-01-29 15:48:33 -06:00
KARASZI István
dd4a80288b
[Bug 391249] fix for invalid XML node dispatchedTimeMean in statistics servlet
...
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2013-01-29 15:43:02 -06:00
KARASZI István
840f147019
[Bug 391248] fixing localhost checking in statistics servlet
...
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2013-01-29 15:41:39 -06:00
Jesse McConnell
1910fb8ce4
[Bug 391345] fix missing br tag in statistics servlet
2013-01-29 14:55:22 -06:00
Jan Bartel
9934cd707a
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
2013-01-15 20:35:46 +11:00
Jan Bartel
284d950eee
Update date on copyright header for ServletHandlerTest class
2013-01-14 13:47:07 +11:00
Jan Bartel
1689aa8143
396253 FilterRegistration wrong order
2013-01-14 12:56:43 +11:00
Jesse McConnell
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
Jesse McConnell
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
Jesse McConnell
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
Greg Wilkins
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
Greg Wilkins
e6d3397c1c
jetty-9 removed alias option
2013-01-11 08:50:09 +11:00
Greg Wilkins
25324b666c
jetty-9 made Trie abstract and added TreeTrie for the HttpParser cache to save space
2013-01-10 17:31:57 +11:00
Greg Wilkins
3efcc2af41
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-10 16:24:41 +11:00
Greg Wilkins
74edf1867c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspAndDefaultWithoutAliasesTest.java
2013-01-10 12:06:55 +11:00
Greg Wilkins
a17a290eb5
381521 Only set Vary header when content could be compressed
2013-01-10 12:02:11 +11:00