Greg Wilkins
30bab30d9b
Revert "Merge branch 'release-8' into jetty-8"
...
This reverts commit 463ef68dc3
, reversing
changes made to de544ddfbf
.
2013-09-16 23:28:59 +10:00
Thomas Becker
b95d6948a8
[maven-release-plugin] prepare for next development iteration
2013-09-10 20:44:44 +02:00
Thomas Becker
5692cff532
[maven-release-plugin] prepare release jetty-8.1.13.v20130910
2013-09-10 20:44:29 +02:00
Greg Wilkins
b33b5f2f5d
413684 deprecated unsafe alias checkers
2013-08-23 16:49:42 +10:00
Jesse McConnell
20bd1e0f96
[maven-release-plugin] prepare for next development iteration
2013-07-26 11:50:17 -05:00
Jesse McConnell
49c3b2c32a
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:49:58 -05:00
Jesse McConnell
6ed360c480
reset for release
2013-07-26 11:23:57 -05:00
Jesse McConnell
1a5117e9ab
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:18:24 -05:00
Jesse McConnell
de2840ca1e
[maven-release-plugin] prepare for next development iteration
2013-07-25 12:52:15 -05:00
Jesse McConnell
3e94867f7f
[maven-release-plugin] prepare release jetty-8.1.12.v20130725
2013-07-25 12:52:07 -05:00
Jesse McConnell
e0ad2c4ee1
[maven-release-plugin] prepare for next development iteration
2013-07-25 07:52:39 -05:00
Jesse McConnell
99712058ca
[maven-release-plugin] prepare release jetty-8.1.11.v20130725
2013-07-25 07:52:32 -05:00
Jan Bartel
af02e9b16d
Update to version to 8.1.12-SNAPSHOT after last release
2013-05-30 10:52:39 +10:00
Jesse McConnell
725dc261c8
Merge branch 'release-8' into jetty-8
2013-05-22 10:44:14 -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
Greg Wilkins
fbb53c2d23
added encodeRedirectURL to Dump servlet
2013-04-19 13:53:48 +10: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
Joakim Erdfelt
a23f2451cd
Merge branch 'jetty-7' into jetty-8
2013-02-19 09:41:10 -07:00
Joakim Erdfelt
e210dfbcca
401211 - Remove requirement for jetty-websocket.jar in WEB-INF/lib
...
+ Adding appropriate configuration in WebAppContext to use
WebSocketServlet from server classloader. Similar to how
the WebSocket interface and WebSocketFactory are also
defined.
+ Marking jetty-websocket as provided in test webapp
2013-02-19 09:38:32 -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
3b6cab63e2
Merge branch 'jetty-7' into jetty-8
2013-01-29 13:42:29 -06:00
Jesse McConnell
35ebe6cea3
[Bug 394541] remove continuation jar from distro, add as dep to test-jetty-webapp
2013-01-29 13:34:45 -06:00
Greg Wilkins
aba64046cf
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-21 12:13:10 +11:00
Greg Wilkins
b36411d382
381521 Only set Vary header when content could be compressed
2013-01-21 12:09:46 +11: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
2aab780eba
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
2013-01-07 23:45:38 +11:00
Greg Wilkins
ccda9bb10b
397535 Support pluggable alias checking to support symbolic links
2013-01-07 19:57:52 +11:00
Joakim Erdfelt
9fde0c56ab
Merge branch 'jetty-7' into jetty-8
2012-12-27 14:22:57 -07:00
Joakim Erdfelt
1da584003a
Moving new tests from test-jetty-webapp as a webapp to test-integration as embedded
2012-12-27 13:53:38 -07:00
Joakim Erdfelt
9009f6abbf
Adding safety checks for FileResource references with null characters.
...
* Adding testcase for Jsp + DefaultServlet w/aliasing turned on
with null characters in the request url.
* Adding validateUri() method to FileResource
2012-12-27 11:44:19 -07:00
Jan Bartel
32e1d0f29c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-12-21 13:00:14 +11:00
Jan Bartel
f9e76b1620
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-util/src/main/java/org/eclipse/jetty/util/ReadLineInputStream.java
2012-12-14 11:48:55 +11:00
Joakim Erdfelt
7488452e8a
Adding some debugging
2012-12-03 14:55:22 -07:00
Joakim Erdfelt
57849a905f
Adding -Dtest.slow.destroy support to CookieDump to aid in testing of
...
start.jar -DSTOP.WAIT=360 --stop
2012-12-03 13:04:03 -07:00
Jan Bartel
94547fb4ea
Fix link to jetty @ eclipse for test webapp
2012-11-23 10:54:47 +11:00
Jan Bartel
3587350447
Fix link to jetty @ eclipse in remote.html
2012-11-23 10:51:47 +11:00
Jan Bartel
976d6e2203
394870 Make enablement of remote access to test webapp configurable in override-web.xml
2012-11-23 10:47:39 +11:00
Greg Wilkins
3d3b035b22
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
2012-11-12 09:08:53 +11:00
Greg Wilkins
75aedbbf45
393947 implement ETags and update gzip filter to handle them
2012-11-11 09:52:26 +11:00
Jesse McConnell
bb27f561c1
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:24:06 -06:00