Commit Graph

6077 Commits

Author SHA1 Message Date
Joakim Erdfelt 2bd3108657 Updating VERSION.txt top section 2012-12-26 12:29:38 -07:00
Joakim Erdfelt ef472ed01b Merge from master to release-9 2012-12-26 12:28:58 -07:00
Jesse McConnell 80dff24711 switch release profile to eclipse-release which should pick up aggregate on next release 2012-12-26 15:24:32 -03:00
Jesse McConnell 3c7b78b8f4 adjust to fit 2012-12-26 15:20:19 -03:00
Jesse McConnell 82d6388a59 Address javadoc linkages in test webapp and root context 2012-12-26 15:05:17 -03:00
Jesse McConnell 2bc4cdcd01 wire up transparent access for both xref and apidocs 2012-12-26 15:01:41 -03:00
Jesse McConnell 5f16dd756f remove jetty-all javadoc from dependencies 2012-12-26 12:58:12 -03: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 73d90623c7 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
2012-12-24 16:48:12 +11:00
Jan Bartel 23e41673bf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-24 14:45:16 +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 f0a9930693 397112 Requests with byte-range throws NPE if requested file has no mimetype (eg no file extension) 2012-12-24 13:52:28 +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 c7b6ed72e8 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-12-22 15:13:49 +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
Jan Bartel 49d7c0c87d Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-12-22 14:37:14 +11:00
Jan Bartel 3a236c6735 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-12-22 14:05:29 +11:00
Jan Bartel 0420365f82 397111 Allow multipart bodies with leading blank lines
Also trim any leading space from FIRST boundary
2012-12-22 14:00:46 +11:00
Jan Bartel c9135e34c9 397111 Allow multipart bodies with leading blank lines 2012-12-22 12:38:28 +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
Joakim Erdfelt 5b7c19e38d Reducing test logging noise by squelching stack traces in test cases where they are expected 2012-12-21 14:22:10 -07:00
Joakim Erdfelt 1936a0fc51 Fixing harmless NPE seen during testing. 2012-12-21 14:00:36 -07:00
Joakim Erdfelt f9c36c55e0 [maven-release-plugin] prepare for next development iteration 2012-12-21 11:47:06 -07:00
Joakim Erdfelt 78e14912aa [maven-release-plugin] prepare release jetty-9.0.0.M4 2012-12-21 11:46:58 -07:00
Joakim Erdfelt ea2f87f4be Disabling jetty-all 2012-12-21 11:30:06 -07:00
Joakim Erdfelt 43a248aa58 Trying to get jetty-all to be happy 2012-12-21 11:01:40 -07:00
Joakim Erdfelt f5a9849d93 Adding aggregates to main build for release 2012-12-21 10:59:10 -07:00
Joakim Erdfelt 6971a6c600 Reverting Simone's change to remove aggregates as it breaks the release 2012-12-21 10:57:44 -07:00
Joakim Erdfelt 9f85d79d97 Adding back jetty-all for this release 2012-12-21 10:53:07 -07:00
Joakim Erdfelt b15268763d Updating VERSION.txt top section 2012-12-21 10:43:20 -07:00
Thomas Becker e1a663865c 394210 spdy api rename stream.syn() to stream.push() 2012-12-21 18:14:14 +01:00
Simone Bordet 55d8088f05 Made HttpDestination to use BlockingArrayQueue (that can grow) instead of
ArrayBlockingQueue, which allocates upfront memory even if it does not use it.
2012-12-21 17:13:07 +01:00
Simone Bordet 64196c6dea Improved BlockingArrayQueue.
Removed redundant field _capacity and correctly implemented remove(int) and iterators.
2012-12-21 17:13:07 +01:00
Simone Bordet 3fb5af01f2 Code cleanup plus optimizations plus javadocs improvements.
Following the JDK optimization, the lock fields are now read into local variables.
Optimized various reads of fields into local variables.
2012-12-21 17:13:07 +01:00
Thomas Becker 26c5eb428f 396193 spdy remove timeout parameters from api and move them to the Info* classes 2012-12-21 13:24:16 +01: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
Greg Wilkins 3216a284b3 jetty-9 per parser fields cache 2012-12-20 13:50:48 +11:00
Jan Bartel 7202631515 396886 MultiPartFilter strips bad escaping on filename="..." 2012-12-20 13:48:45 +11:00
Greg Wilkins f7c2e85040 jetty-9 per parser fields cache 2012-12-20 13:13:46 +11:00
Greg Wilkins ba684637df jetty-9 minor optimisations 2012-12-20 12:03:00 +11:00
Greg Wilkins b1bd23e3cb jetty-9 minor optimisations 2012-12-20 10:46:22 +11: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
Joakim Erdfelt 0ef9b23724 Fixing end user callback failure if runtime exception occurs, renaming enque to enqueue 2012-12-19 10:06:23 -07:00
Simone Bordet 2237053819 Moved aggregates out of the main build, only included in the release build. 2012-12-19 16:27:20 +01:00