Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,152 Commits 55 Branches 466 Tags
Commit Graph

1112 Commits

Author SHA1 Message Date
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
e6d3397c1c jetty-9 removed alias option 2013-01-11 08:50:09 +11:00
Simone Bordet
a5b46fb039 Reintroduced method deleted by mistake. 2013-01-10 10:38:22 +01:00
Simone Bordet
f096380a35 Introduced capability of configuring the daemon property on schedulers. 
Also added the name property to ScheduledExecutorScheduler.
 2013-01-10 10:26:04 +01:00
Simone Bordet
34cc0e5d82 Optimized memory usage of AttributesMap. 
Attributes are used rarely, so AttributesMap was creating a ConcurrentHashMap
that was never used.
In cases where AttributesMap is heavily used (for example CometD) this proved
to save a significant amount of memory footprint.
 2013-01-10 09:40:21 +01: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
Simone Bordet
fa412b4668 397769 - TimerScheduler does not relinquish cancelled tasks. 
Implemented ScheduledExecutorScheduler, using JDK's ScheduledExecutorService implementation and configuring it to remove tasks on cancel.
 2013-01-09 17:06:37 +01: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
Jan Bartel
8d0e776b2a Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	test-jetty-webapp/pom.xml
	tests/test-integration/pom.xml
 2013-01-07 12:47:32 +11:00
Jan Bartel
d2c2e8693f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-07 10:38:48 +11:00
Joakim Erdfelt
c23f722286 Reverting validation changes to FileResource and disabling tests 2013-01-02 10:32:16 -07:00
Jesse McConnell
c1e5b0b80c [Bug 397111] Tolerate empty or excessive whitespace preceeding MultiParts 2012-12-31 15:57:28 -03:00
Joakim Erdfelt
9fde0c56ab Merge branch 'jetty-7' into jetty-8 2012-12-27 14:22:57 -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
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
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
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
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
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
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
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
128cf0a6b4 396886 - MultiPartFilter strips bad escaping on filename="..." 2012-12-18 18:19:17 -07:00
Greg Wilkins
4d34e83c1c jetty-9 replaced Trie with indexed implementation 2012-12-17 19:21:28 +11:00
Jan Bartel
2966192aa4 395794 NullPointerException in when requesting a file without extension 2012-12-17 13:58:39 +11: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
Joakim Erdfelt
b513244395 Bug 392371 - JavaUtilLog performing expensive format for unlogged items 
* Adding isLoggable checks where format() is used
 2012-12-12 14:39:17 -07:00
Simone Bordet
0ff769e633 Introduced HttpCookieStore.Empty to disable cookies in HttpClient and in the websocket client. 2012-12-12 18:35:10 +01:00
Simone Bordet
b9b16529d5 Removed jetty-client's CookieStore to use java.net.CookieStore instead. 
This unifies the usage of CookieStores between jetty-client and jetty-websocket, and hopefully other modules as well.
 2012-12-12 10:18:18 +01:00
Simone Bordet
8e98148350 Introduced setQueue(), removed maxQueued() and renamed maxIdleTimeMs() to idleTimeout(). 
The reason for this change is that CometD needs a way to explicitly set the queue implementation
in load testing to measure latencies.
Property maxQueued was used to decide, at start time, what queue implementation to use, but
now that can be set explicitly with setQueue().
The rename was done because in all other places the idle timeout has been renamed so.
 2012-12-11 14:45:43 +01:00
Joakim Erdfelt
11d7617298 Including hashcode in BufferUtils.toDetailString() 2012-12-10 09:23:18 -07: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
979d6dbbf9 367638 throw exception for excess form keys 2012-12-08 10:05:32 +11:00
Greg Wilkins
a20d984d30 jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap 2012-12-08 01:41:00 +11:00