Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-19 13:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,781 Commits 78 Branches 466 Tags
Commit Graph

7781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Wilkins
e0382bc4ae 414740 Removed the parent peeking Loader 2013-08-09 17:53:43 +10:00
Greg Wilkins
009113aacb 414640 HTTP header value encoding 
fixed issues with merge
 2013-08-09 16:31:11 +10:00
Greg Wilkins
8ce87ffafc Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-09 16:12:55 +10:00
Greg Wilkins
7c2095725f 414640 HTTP header value encoding 
Allow URL to be any encoding (pass the bytes and by default assume UTF-8), the header values are in ISO_8859_1 and everything else
must be US_ASCII
 2013-08-09 16:11:59 +10:00
Jan Bartel
06ef5b7930 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
 2013-08-09 15:59:29 +10:00
Jan Bartel
b17696325b Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
 2013-08-09 15:14:09 +10:00
Jan Bartel
6a22a9f5b9 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-09 14:46:25 +10:00
Greg Wilkins
3e79877bcc 414727 Ensure asynchronously flushed resources are closed 2013-08-09 14:42:10 +10:00
Jan Bartel
66620b77b8 414507 Ensure AnnotationParser ignores parent dir hierarchy when checking for hidden dirnames 2013-08-09 14:19:04 +10:00
Greg Wilkins
dbbc43edb1 414640 Improved Bad Message handling for non US_ASCII headers 2013-08-09 14:16:21 +10:00
Greg Wilkins
34cfc3ed10 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
 2013-08-09 13:50:49 +10:00
Greg Wilkins
12f1d0f16e 414625 final static version fields 2013-08-09 12:45:39 +10:00
Greg Wilkins
a779425994 414101 Do not escape special characters in cookies 2013-08-09 12:42:52 +10:00
Joakim Erdfelt
012804bdd9 414725 - Annotation Scanning should exclude webapp basedir from path validation checks 
+ Checking in @Ignore'd test demonstrating the bug
 2013-08-08 15:05:31 -07:00
Joakim Erdfelt
d3d4f7abed WebSocket - quick fix to prevent jenkins test hang 2013-08-08 09:46:31 -07:00
Joakim Erdfelt
5500f161d7 WebSocket - refining javadoc 2013-08-08 09:46:16 -07:00
Joakim Erdfelt
baeda84402 WebSocket - fixing Frame.getPayloadLength() 2013-08-08 09:45:46 -07:00
Simone Bordet
4fe155997f Merged branch 'master' into 'jetty-9.1'. 2013-08-08 12:13:18 +02:00
Simone Bordet
914392e80d Merged branch 'jetty-8' into 'master'. 2013-08-08 12:12:34 +02:00
Simone Bordet
59a070a9fe Merged branch 'jetty-7' into 'jetty-8'. 2013-08-08 12:10:19 +02:00
Simone Bordet
4ce4615597 414652 - WebSocket's sendMessage() may hang on congested connections. 
Fixed by using Locks instead of the synchronized keyword, and by using tryLock()
in flushBuffer() and flush(), that are called by WebSocketConnection.handle().

It is quite a hack, but the real fix is in Jetty 9 where the architecture is different
and there are two different paths for reading and writing, so that this problem
could not even happen.
 2013-08-08 12:09:11 +02:00
Greg Wilkins
dcf98fd675 414635 Modular start.d and jetty.base property 
Made https and spdy mutually exclusive
 2013-08-08 18:07:42 +10:00
Greg Wilkins
21e7b67cc7 414635 Modular start.d and jetty.base property 2013-08-08 17:53:52 +10:00
Jan Bartel
1f3ec4b538 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-08 14:31:33 +10:00
Jan Bartel
bd1b19b45c Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
 2013-08-08 14:24:19 +10:00
Jan Bartel
f22217392b Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
 2013-08-08 12:28:51 +10:00
Greg Wilkins
6941dcb8c8 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-08 12:23:50 +10:00
Greg Wilkins
d2c68bb4aa 412830 Error Page match ServletException then root cause 2013-08-08 12:22:28 +10:00
Jan Bartel
f983629434 414507 AnnotationParser should skip classes in hidden dirs or with . name prefix 2013-08-08 12:09:29 +10:00
Greg Wilkins
a719418990 413568 Made AJP worker name generic 2013-08-08 12:05:24 +10:00
Greg Wilkins
89acff6bdf Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-08 11:06:14 +10:00
Greg Wilkins
95416bce76 413568 Made AJP worker name generic 2013-08-08 10:51:43 +10:00
Joakim Erdfelt
eb0d7da7f2 JSR-356 Making PongMessage work with @OnMessage annotation 2013-08-06 13:15:13 -07:00
Joakim Erdfelt
3e070f929e JSR-356 addMessageHandler with Reader or InputStream should not NPE 2013-08-06 12:55:02 -07:00
Joakim Erdfelt
6278f8eb30 JSR-356 - making the JSR happy enough to start 2013-08-06 09:32:49 -07:00
Joakim Erdfelt
12f6853900 WebSocket - enabling WebSocket on distribution 2013-08-06 09:20:02 -07:00
Joakim Erdfelt
2354ad4c3d Cleaning up javadoc 2013-08-06 09:19:49 -07:00
Jan Bartel
7c292c1799 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-06 09:21:40 +10:00
Jan Bartel
a900010f81 414235 RequestLogHandler configured on a context fails to handle forwarded requests 2013-08-06 09:14:28 +10:00
Simone Bordet
d86ceaf790 HttpClient optimizations. 
HttpConnectionPool now puts "hot" idle connection in the front of a deque,
rather than at the end of a queue, so that the hotter they are the more they
are used.

HttpRequest is now initialized with better defaults so that
HttpConnection.normalizeRequest() has less work to do.
This reduced the number of branches to be executed for each request.

HttpDestination now produces less garbage by using Jetty's BlockingArrayQueue
instead of Java's LinkedBlockingQueue.

HttpClient has now a bigger response buffer, 16 KiB, by default.
 2013-08-05 19:36:19 +02:00
Joakim Erdfelt
8636c7da45 Merge branch 'master' into jetty-9.1 
Conflicts:
	jetty-maven-plugin/pom.xml
	pom.xml
 2013-08-05 09:53:48 -07:00
Joakim Erdfelt
74991f90d6 Cleanup from merge 2013-08-05 09:13:32 -07:00
Joakim Erdfelt
e2d872fcc7 Merge branch 'jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	pom.xml
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
 2013-08-05 08:47:24 -07:00
Jan Bartel
432964cf5f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
 2013-08-05 18:03:11 +10:00
Jan Bartel
f3f2bce36c 414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF 2013-08-05 17:18:44 +10:00
Jan Bartel
446820071b Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-05 12:35:16 +10:00
Jan Bartel
f5fb412eba 414235 - RequestLogHandler configured on a context fails to handle forwarded requests 2013-08-05 12:32:21 +10:00
Joakim Erdfelt
01786aa0c2 Merge branch 'jetty-7' into jetty-8 2013-08-02 15:11:05 -07:00
Joakim Erdfelt
79ac8ad22d Fixing License Header to conform with standard with rest of project 2013-08-02 14:34:03 -07:00
Joakim Erdfelt
2057c4c17b Upgrading Junit + Hamcrest 2013-08-02 14:25:53 -07:00