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
Joakim Erdfelt
d49ecdf1d6
Minor tweak for windows testcase expecting IllegalArgumentException
2014-06-26 09:14:04 -07:00
Joakim Erdfelt
56751dfa72
Merge branch 'master' into pathresource
2014-06-26 08:56:43 -07:00
Simone Bordet
2608af8f0d
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-26 11:54:50 +02:00
Simone Bordet
02271b29f5
Removed Action.FAILED, since it was never used and cluttered the
...
implementation. Subclasses should just either throw an exception or
directly call failed(Throwable).
2014-06-26 09:41:15 +02:00
Joakim Erdfelt
39079d4e84
Tweaking for windows test conditions
2014-06-25 15:29:18 -07:00
Joakim Erdfelt
9f844383cd
Making PathResource the default for "file://" resources
...
+ Making ResourceTest a proper @Parameterized test case
+ Moving jar tests out of ResourceTest into JarResourceTest
+ Moving classpath tests out of ResourceTest into ClassPathResourceTest
+ Making more improvements to PathResource to satisfy expecations in
the rest of the codebase.
+ Requests for resource subpaths that use "//" in their strings will
now work correctly (it used to result in null requests in
FileResource)
2014-06-25 14:11:44 -07:00
Greg Wilkins
a746d78951
438079 435322 Fixed Iterating Callback fail handling and removed per send instance
2014-06-25 19:20:03 +02:00
Joakim Erdfelt
45a0690ba7
More PathResource updates.
...
+ Fixing up PathResource.list() per recommendations by @ash2k (on github)
+ Adding PathResource.getAlias() to conform to expectations
2014-06-25 10:07:41 -07:00
Simone Bordet
e63ceabafe
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-25 17:29:36 +02:00
Joakim Erdfelt
2a943887b6
437800 - URLs with single quote and spaces return 404
...
+ Expanded FileResourceTest
+ Added PathResource + PathResourceTest to show java.nio.file
alternative approach (currently POC)
2014-06-25 06:53:22 -07:00
Simone Bordet
66f3913527
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-25 12:34:19 +02:00
Simone Bordet
3ff4195dbc
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-06-25 12:26:45 +02:00
