Greg Wilkins
663b45770a
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-03-02 12:56:06 +11:00
Jan Bartel
afbf98bd88
Merge remote-tracking branch 'origin/jetty-8'
2013-03-02 10:29:15 +11:00
Jan Bartel
3ed3dfc7a1
402048 org.eclipse.jetty.server.ShutdownMonitor doesn't stop after the jetty server is stopped
2013-03-02 10:12:24 +11:00
Greg Wilkins
6478306812
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
...
Conflicts:
jetty-server/src/main/config/etc/jetty.xml
2013-03-02 09:32:57 +11:00
Simone Bordet
e6fed09129
402075 - Massive old gen growth when hit by lots of non persistent connections.
...
Replaced usages of TimerScheduler with ScheduledExecutorScheduler.
2013-03-01 15:19:51 +01:00
Greg Wilkins
41952ebf1d
402075 Dont allocate the parser trie unless needed
2013-03-01 22:16:54 +11:00
Jan Bartel
bf154404fe
402048 org.eclipse.jetty.server.ShutdownMonitor thread doesn't stop after the jetty server is stopped
2013-03-01 19:58:44 +11:00
Jan Bartel
90b5ea2c5e
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-03-01 19:08:09 +11:00
Jan Bartel
caa0199efe
400312 ServletContextListener.contextInitialized() is not called when added in ServletContainerInitializer.onStartup
2013-03-01 18:09:19 +11: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
Greg Wilkins
859710c2c5
401643 Improved Authentication exception messages and provided quiet servlet exception
2013-02-25 13:59:56 +11:00
Greg Wilkins
6d850146fb
jetty-9 fixed error from doco change
2013-02-24 09:27:05 +11:00
Greg Wilkins
0671514e34
jetty-9 fixed error from doco change
2013-02-24 09:15:40 +11:00
Greg Wilkins
999db7f4d8
refined jetty embedded examples
2013-02-22 16:19:06 +11:00
Greg Wilkins
c302a404cd
refined jetty embedded examples
2013-02-22 15:51:17 +11:00
Greg Wilkins
b82a781113
400864 Added LowResourcesMonitor
2013-02-18 20:03:36 +11:00
Joakim Erdfelt
f15d4c0376
400738 - ResourceHandler doesn't support range requests
...
+ Adding testcase to replicate issue.
2013-02-13 14:27:26 -07:00
Simone Bordet
6d0f233c80
362854 - Continuation implementations may deadlock.
...
HttpChannelState was already notifying listeners from outside synchronized blocks,
apart one case, in expired().
Also taken the chance to cleanup the class from warnings.
2013-02-13 16:00:40 +01:00
Simone Bordet
ef81982579
400631 - Calling flush() on HttpServletResponse.getOutputStream() after last byte of body causes EofException.
...
Now flush() is a no-operation if the stream is already closed, consistently with previous Jetty versions.
2013-02-13 12:03:31 +01:00
Jesse McConnell
e09d401fd2
add configuration option to not send server version
2013-02-12 10:08:56 -06: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
Simone Bordet
209d5bc12f
399721 - Change <Ref id= ...> to <Ref refid= ...>
2013-02-01 13:03:11 +01: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
Jan Bartel
9194fe1b7b
399566 Running org.eclipse.jetty.server.session.MaxInactiveMigrationTest produces stack trace
2013-01-31 15:42:27 +11:00
Greg Wilkins
b132663c2b
jetty-9 made WebAppContext configuration additive
2013-01-31 12:21:04 +11:00
Jesse McConnell
3b6cab63e2
Merge branch 'jetty-7' into jetty-8
2013-01-29 13:42:29 -06:00
Jesse McConnell
a086451bc7
[Bug 393933] remove deprecated classes/methods and consolidate some static methods to SslContextFactory
2013-01-28 16:15:34 -06:00
Thomas Becker
988206c36a
393968 fix typo in javadoc
2013-01-28 16:11:33 +01:00
Jesse McConnell
2cbb630f8e
Merge branch 'jetty-8'
2013-01-25 16:53:46 -06:00
Jesse McConnell
f16fc7e7b7
Merge branch 'jetty-7' into jetty-8
2013-01-25 16:53:18 -06:00
Jesse McConnell
1a31067369
Add note about getCanonicalFile check and fix IdleSession test in test hash sessions
2013-01-25 16:25:59 -06:00
Jesse McConnell
b3043276bc
add corresponding correct file removal check
2013-01-25 16:12:08 -06:00
Jesse McConnell
a7c074a86c
merge from jetty-8
2013-01-25 15:32:08 -06:00
Jesse McConnell
4bed164462
Merge branch 'jetty-7' into jetty-8
2013-01-25 15:31:13 -06:00
Jesse McConnell
111bd19634
doh, header
2013-01-25 15:30:59 -06:00
Jesse McConnell
d8a3b76862
Merge branch 'jetty-7' into jetty-8
2013-01-25 15:24:41 -06:00
Jesse McConnell
d4568feba6
[Bug 399132] check parent dir of session store against file to be removed
2013-01-25 15:22:16 -06:00
Greg Wilkins
5435cd3365
385306 added getURI method
2013-01-25 13:52:32 +11:00
Greg Wilkins
ff350c3740
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/BlockingHttpConnection.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-01-25 11:46:03 +11:00
Greg Wilkins
3c6deaf83c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-01-25 09:43:57 +11:00
Greg Wilkins
c9d026703f
removed System.outs
2013-01-25 09:42:51 +11:00
Greg Wilkins
fd25e3a742
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-01-24 14:30:45 +11:00
Greg Wilkins
161a14d9d0
381521 Only set Vary header when content could be compressed
2013-01-24 14:07:25 +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
3a0291929c
removed some TODOs
2013-01-11 23:53:26 +11: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
3cba027390
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerAliasTest.java
2013-01-08 09:13:39 +11:00
Greg Wilkins
64ed66db8b
Remove test needing java 7
2013-01-08 09:12:08 +11:00
Joakim Erdfelt
83aa65415b
Fixing for JDK 6
2013-01-07 09:37:13 -07: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
Jan Bartel
96fd7dc562
Merge branch 'jetty-7' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-7
2013-01-07 20:12:49 +11:00
Jan Bartel
3265c334cb
397130 maxFormContentSize set in jetty.xml is ignored
2013-01-07 20:10:54 +11:00
Greg Wilkins
ccda9bb10b
397535 Support pluggable alias checking to support symbolic links
2013-01-07 19:57:52 +11:00
Joakim Erdfelt
4037e6111f
395885 - ResourceCache should honor useFileMappedBuffer if set
2013-01-02 14:47:02 -07:00
Greg Wilkins
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
Jan Bartel
aa3b829fb1
Revert "395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions"
...
This reverts commit 72cdab4934
.
2012-12-24 14:11:15 +11:00
Jan Bartel
37ac5e7b16
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
2012-12-22 16:42:33 +11:00
Jan Bartel
346918577f
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
test-jetty-webapp/src/main/java/com/acme/CookieDump.java
test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
2012-12-22 15:12:17 +11:00
Greg Wilkins
d4c4637f4d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-12-22 12:30:20 +11:00
Greg Wilkins
810ff3802f
397110 Accept %uXXXX encodings in URIs
2012-12-22 12:00:54 +11:00
Jan Bartel
191040b736
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-12-21 14:00:13 +11: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
Joakim Erdfelt
5e4711fdb0
Fixing confusing output
2012-12-20 17:32:34 -07:00
Joakim Erdfelt
a371a8963d
Fixing NPE
2012-12-20 17:30:46 -07:00
Joakim Erdfelt
b65973afdd
Bug 391623 - Add option to --stop to wait for target jetty to stop
...
* Reworked ShutdownMonitor to better support multiple servers +
jetty-maven-plugin requirements.
2012-12-20 15:32:36 -07:00
Joakim Erdfelt
69b9856998
Squashing JMX warnings on jetty startup
2012-12-19 13:50:51 -07:00
Joakim Erdfelt
a5c1ced201
Merge branch 'jetty-7' into jetty-7-graceful-stop
2012-12-19 12:40:46 -07:00
Thomas Becker
72cdab4934
395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions
2012-12-18 13:09:21 +01:00
Greg Wilkins
3ce8c2ba58
jetty-9 recycle response print writers
2012-12-17 16:02:06 +11:00
Jan Bartel
2966192aa4
395794 NullPointerException in when requesting a file without extension
2012-12-17 13:58:39 +11:00
Greg Wilkins
c87ebcb4a5
jetty-9 avoid additional dispatch for pipelined requests to optimize pipeline handling
2012-12-17 11:35:26 +11:00
Greg Wilkins
ecf7563a79
jetty-9 use direct buffers for generated headers
2012-12-14 14:07:42 +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
Greg Wilkins
6bfc19be1b
jetty-9 optimisation to dispatch before parsing so that handling is done in same thread
2012-12-14 09:50:22 +11:00
Greg Wilkins
5b8a9bb95e
jetty-9 use spare space in content buffer for header
2012-12-14 08:30:46 +11:00
Greg Wilkins
e5679d42c0
jetty-9 use spare space in content buffer for header
2012-12-14 07:41:22 +11:00
Jan Bartel
08a7cd86e3
Revert "jetty-9 added null constructor"
2012-12-13 20:17:25 +11:00
Greg Wilkins
0c16c774ca
jetty-9 use spare space in content buffer for header
2012-12-13 18:49:54 +11:00
Greg Wilkins
a478271828
JETTY-1533 handle URL with no path
2012-12-13 07:59:21 +11:00
Greg Wilkins
6f098dd69c
jetty-9 use DateCache timer to set Date header once per second
2012-12-10 12:58:14 +11:00
Greg Wilkins
f01da31a0a
jetty-9 some optimizations
2012-12-08 01:41:01 +11:00
Greg Wilkins
620d051087
jetty-9 recycle content-type
2012-12-08 01:41:01 +11:00
Greg Wilkins
3e151901bf
jetty-9 Use public HttpField
2012-12-08 01:41:01 +11:00
Joakim Erdfelt
7abd512b32
391623 - Making --stop with STOP.WAIT perform graceful shutdown
...
+ Moving jetty-start Monitor to jetty-server ShutdownMonitor and
using ShutdownThread to perform a graceful shutdown instead.
2012-12-04 10:18:54 -07:00
Greg Wilkins
9931ddec94
jetty-9 fixed test webapp TestServer and improved error message
2012-11-29 17:03:40 +11:00
Jan Bartel
9f5801c3fd
395215 Multipart mime with just LF and no CRLF
2012-11-29 15:57:16 +11:00
Greg Wilkins
16844eafc5
jetty-9 javadoc
2012-11-29 13:29:24 +11:00
Greg Wilkins
0805f131a8
jetty-9 added null constructor
2012-11-29 10:10:53 +11:00