1611 Commits

Author SHA1 Message Date
Joakim Erdfelt
38501a9e97 On alias resolution in PathResource, ignore NoSuchFileException (its a
valid and common path for 404 requested resources)
2014-08-01 14:34:21 -07:00
Simone Bordet
161bccda22 Merged branch 'master' into 'jetty-http2'. 2014-08-01 14:02:53 +02:00
Jan Bartel
75c92bf76a 438500 Odd NoClassDef errors when shutting down the jetty-maven-plugin via the stop goal 2014-08-01 12:44:30 +10:00
Greg Wilkins
97d723c516 deprecate FileResource 2014-08-01 10:45:11 +10:00
Greg Wilkins
fa9b60c77e Merge remote-tracking branch 'origin/jetty-http2' into pathresource 2014-08-01 10:17:42 +10:00
Greg Wilkins
b439549793 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-08-01 09:50:20 +10:00
Greg Wilkins
785c45d899 Merge remote-tracking branch 'origin/master' into pathresource 2014-08-01 09:49:59 +10:00
Joakim Erdfelt
3c716a72e7 Ignoring bad/canonical uri alias 2014-07-31 16:45:36 -07:00
Greg Wilkins
f970ffc0ac Misc cleanups done whilst fixing 435322 2014-08-01 09:02:44 +10:00
Joakim Erdfelt
b44a29e86b Merge branch 'pathresource' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into pathresource 2014-07-31 15:17:01 -07:00
Joakim Erdfelt
33435fad3d Making bad alias discovery more obvious (temporary) 2014-07-31 15:16:44 -07:00
Joakim Erdfelt
a0908bf9d8 Minor documentation updates 2014-07-31 13:56:02 -07:00
Joakim Erdfelt
6048343fee Enhancing NTFS Stream tests 2014-07-31 10:09:53 -07:00
Joakim Erdfelt
971e1f0aaa When test failure occurs, give more details 2014-07-31 08:41:35 -07:00
Greg Wilkins
0dbf684298 Added alias tests to FileSystemResourceTest 2014-07-31 15:22:12 +10:00
Greg Wilkins
252933891c Merge branch 'master' into pathresource
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2014-07-31 14:05:26 +10:00
Greg Wilkins
a14b2be0e6 Merge branch 'jetty-http2' into refset 2014-07-31 11:58:30 +10:00
Greg Wilkins
e415de44c6 Eat what you kill strategy avoids double dispatch 2014-07-31 08:58:19 +10:00
Greg Wilkins
489830a0b2 Prototype execution strategy 2014-07-30 18:08:54 +10:00
Greg Wilkins
c13be6d932 Merge branch 'jetty-http2' into refset
Conflicts:
	jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java
2014-07-25 18:33:10 +10:00
Greg Wilkins
30123607c6 Major refactor of metadata and HttpURI
This refactor strives to remove duplication between the Metadata class and the HttpURI class.

Both classes have been made mutable (as they partially were anyway so best not to pretend).

HttpURI now holds the decomposed strings rather than a single string with indexes. This allows it to be rebuilt after changing just parts of the URI. It is now a lot more similar to the
JVM URI class and we could consider replacing it (after checking peformance).

Next step is to refactor the Request class to prevent it duplicating these fields.
2014-07-24 15:49:52 +10:00
Joakim Erdfelt
cb42ef2167 [maven-release-plugin] prepare for next development iteration 2014-07-23 11:18:01 -07:00
Joakim Erdfelt
dc62cb5ac7 [maven-release-plugin] prepare release jetty-9.2.2.v20140723 2014-07-23 11:17:55 -07:00
Greg Wilkins
fa3d7d0f7e Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins
3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Simone Bordet
467773dbdf Merged branch 'master' into 'jetty-http2'. 2014-07-22 21:14:46 +02:00
Simone Bordet
4daba1ba79 Restored IteratingCallback APIs (in particular the completed()
method) to keep compatibility over micro versions of Jetty.

Removed getState() - can't return a private class from a protected
method, plus it was only used in a toString() with the wrong
formatting string, that was already printing the state.

Removed also final modifiers to keep compatibility.
2014-07-22 19:32:13 +02:00
Simone Bordet
987800c419 440122 - Remove usages of ForkInvoker. 2014-07-22 16:36:15 +02:00
Greg Wilkins
7f62f2600b refactored URI handling 2014-07-20 10:23:47 +10:00
Greg Wilkins
fb2a67c0f9 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-19 00:49:37 +10:00
Greg Wilkins
b38a978eac 439067 Improved graceful stop timeout handling 2014-07-19 00:46:55 +10:00
Greg Wilkins
89a816843f removed refset from hpack 2014-07-18 15:59:41 +10:00
Greg Wilkins
a537fefd6b Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-18 15:28:54 +10:00
Joakim Erdfelt
c4c8426069 439507 - Possible timing side-channel when comparing MD5-Credentials
+ Using correct digestMismatch logic
+ Fixing test cases:
  + No longer reuses / shares directories
  + Is now Windows build/test compatible
  + No longer deleteOnExit() the test data
    (let maven clean and/or test init do that)
  + Empty directories are now verified
  + Using server.getURI() instead of URL string manipulation
2014-07-17 17:55:22 -07:00
Greg Wilkins
12b522d796 439507 Avoid timing leak in MD5 compare
Also-by: Benny Baumann<BenBE@cacert.org>
2014-07-17 12:42:59 +10:00
Greg Wilkins
64e5c1e0ce Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-17 11:32:27 +10:00
Greg Wilkins
591eedcb59 [FindBugs] Include explicit typing whereever possible
+ No cleanup regarding unchecked types (yet)
2014-07-17 10:47:49 +10:00
Greg Wilkins
0c66f3a68e [FindBugs] Ensure resources are closed/freed properly
Removing dumb connector.close during server.getURI()
2014-07-17 10:00:26 +10:00
Greg Wilkins
ce63ab2290 Ensure everything is finalized properly, especially that the lock is unlocked
The issue here was that due to the method call there was no guarantee that the unlock was reached in case of an exception.
Restructuring the code like this provides this guarantee
2014-07-17 08:51:45 +10:00
Joakim Erdfelt
5be27516a4 [FindBugs] Remove unnecessary template specialization 2014-07-17 08:31:08 +10:00
Greg Wilkins
4d2a580c2c 439375 preferred rfc7231 format is mime;charset=lowercase-9 2014-07-11 17:56:08 +10:00
Greg Wilkins
5e281dd449 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
Greg Wilkins
55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Joakim Erdfelt
0c7de2e5bd 438331 - AbstractLogger.debug(String,long) infinite loop
+ Breaking infinit loop
2014-07-09 08:54:10 -07:00
Greg Wilkins
ca1a9ceb7c fixed merge issues 2014-07-04 23:22:40 +10:00
Greg Wilkins
706fe1eba3 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-03 16:01:37 +10:00
Greg Wilkins
7fbf521d4e 438204 correctly wrap IPv6 hostnames in URIs generated by jetty 2014-07-03 10:11:16 +10:00
Greg Wilkins
78b03c5b8e More debug for intermittent failures 2014-07-02 16:01:00 +10:00
Greg Wilkins
6eceb6bd99 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-06-29 08:11:41 +02:00
Greg Wilkins
9b764ef3fa 435322 Fixed Iterating Callback close 2014-06-27 20:43:12 +02:00