Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 08:28:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,058 Commits 55 Branches 466 Tags
Commit Graph

6058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 72cdab49349541f0a78a09ad8c765ba8bd9989f1.
 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
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
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
Simone Bordet
b6e4f98cf7 Performance improvements to HTTP client after profiling session. 
The profiling suggested to reduce the number of unneeded allocations
and this required a couple of API changes.
 2012-12-19 16:27:20 +01:00
Simone Bordet
c9f4513a89 Reworked HTTP client API, removing usage of Future. 2012-12-19 16:27:20 +01:00
Joakim Erdfelt
128cf0a6b4 396886 - MultiPartFilter strips bad escaping on filename="..." 2012-12-18 18:19:17 -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
Simone Bordet
58dff061e1 394552 - HEAD requests don't work for jetty-client. 
Added a missing call to HttpParser.setHeadResponse()
to inform the parser that it is a response to a HEAD request.
 2012-12-17 11:37:40 +01:00
Greg Wilkins
4d34e83c1c jetty-9 replaced Trie with indexed implementation 2012-12-17 19:21:28 +11:00
Jan Bartel
43c9bba86d 393158 java.lang.IllegalStateException when sending an empty InputStream 2012-12-17 18:40:50 +11: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
Jan Bartel
930f567c32 396687 missing jetty-io dependency in jetty-servlets 2012-12-17 13:26:10 +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
Joakim Erdfelt
ca1c3db642 Removing WriteResult class 2012-12-14 16:12:48 -07:00
Joakim Erdfelt
e308f843db Replacing FrameBytes tree with WriteBytesProvider class 2012-12-14 16:12:48 -07:00
Joakim Erdfelt
ecb472f30b Introducing WriteBytesProvider 2012-12-14 16:12:48 -07:00
Greg Wilkins
ecf7563a79 jetty-9 use direct buffers for generated headers 2012-12-14 14:07:42 +11:00
Jan Bartel
a9247d6617 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
 2012-12-14 12:08:03 +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
Jan Bartel
aacc8a1712 396459 Log specific message for empty request body for multipart mime requests 2012-12-14 11:02:44 +11:00
Jan Bartel
892cafd9a3 396459 Log specific message for empty request body for multipart mime requests 2012-12-14 10:42:58 +11:00