5be1fb6270
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-09-03 15:19:54 +10:00
0a2aeb54a1
435322 Added a idleTimeout to the SharedBlockerCallback
2014-09-03 10:46:18 +10:00
bb1d4946bc
Merged branch 'master' into 'jetty-http2'.
2014-09-02 10:25:31 +02:00
7be9f0d7a4
Fixed doStop() to call super before interrupting the reference queue thread.
2014-09-01 21:16:40 +02:00
5507e267ae
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/config/etc/jetty-https.xml
jetty-server/src/main/config/modules/ssl.mod
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
2014-08-29 15:49:25 +10:00
69390954dc
435322 acceptor and selector configuration/priority
2014-08-29 15:36:19 +10:00
edcb56ae6b
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-08-29 12:41:52 +10:00
eee2ba206e
435322 Added a idleTimeout to the SharedBlockerCallback
2014-08-29 11:55:06 +10:00
0aeebc4ec0
435988 ContainerLifeCycle: beans never stopped on remove
2014-08-27 17:13:07 +10:00
8ce96cdd2e
441475 org.eclipse.jetty.server.ResourceCache exceptions under high load
2014-08-27 14:46:22 +10:00
1c71040eca
moved config plugin to profile
2014-08-15 19:53:52 +10:00
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
015c34d865
Fixed handling of the close state in case it's already closed.
2014-08-06 15:21:33 +02:00
aaa2e5c6c1
refined PathResource alias handling
2014-08-02 12:58:24 +10:00
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
161bccda22
Merged branch 'master' into 'jetty-http2'.
2014-08-01 14:02:53 +02:00
75c92bf76a
438500 Odd NoClassDef errors when shutting down the jetty-maven-plugin via the stop goal
2014-08-01 12:44:30 +10:00
97d723c516
deprecate FileResource
2014-08-01 10:45:11 +10:00
fa9b60c77e
Merge remote-tracking branch 'origin/jetty-http2' into pathresource
2014-08-01 10:17:42 +10:00
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
785c45d899
Merge remote-tracking branch 'origin/master' into pathresource
2014-08-01 09:49:59 +10:00
3c716a72e7
Ignoring bad/canonical uri alias
2014-07-31 16:45:36 -07:00
f970ffc0ac
Misc cleanups done whilst fixing 435322
2014-08-01 09:02:44 +10:00
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
33435fad3d
Making bad alias discovery more obvious (temporary)
2014-07-31 15:16:44 -07:00
a0908bf9d8
Minor documentation updates
2014-07-31 13:56:02 -07:00
6048343fee
Enhancing NTFS Stream tests
2014-07-31 10:09:53 -07:00
971e1f0aaa
When test failure occurs, give more details
2014-07-31 08:41:35 -07:00
0dbf684298
Added alias tests to FileSystemResourceTest
2014-07-31 15:22:12 +10:00
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
a14b2be0e6
Merge branch 'jetty-http2' into refset
2014-07-31 11:58:30 +10:00
e415de44c6
Eat what you kill strategy avoids double dispatch
2014-07-31 08:58:19 +10:00
489830a0b2
Prototype execution strategy
2014-07-30 18:08:54 +10:00
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
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
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
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
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
467773dbdf
Merged branch 'master' into 'jetty-http2'.
2014-07-22 21:14:46 +02:00
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
987800c419
440122 - Remove usages of ForkInvoker.
2014-07-22 16:36:15 +02:00
7f62f2600b
refactored URI handling
2014-07-20 10:23:47 +10:00
fb2a67c0f9
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-19 00:49:37 +10:00
b38a978eac
439067 Improved graceful stop timeout handling
2014-07-19 00:46:55 +10:00
89a816843f
removed refset from hpack
2014-07-18 15:59:41 +10:00
a537fefd6b
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-18 15:28:54 +10:00
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
12b522d796
439507 Avoid timing leak in MD5 compare
...
Also-by: Benny Baumann<BenBE@cacert.org>
2014-07-17 12:42:59 +10:00
64e5c1e0ce
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-17 11:32:27 +10:00
591eedcb59
[FindBugs] Include explicit typing whereever possible
...
+ No cleanup regarding unchecked types (yet)
2014-07-17 10:47:49 +10:00
0c66f3a68e
[FindBugs] Ensure resources are closed/freed properly
...
Removing dumb connector.close during server.getURI()
2014-07-17 10:00:26 +10:00
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
5be27516a4
[FindBugs] Remove unnecessary template specialization
2014-07-17 08:31:08 +10:00
4d2a580c2c
439375 preferred rfc7231 format is mime;charset=lowercase-9
2014-07-11 17:56:08 +10:00
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
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
0c7de2e5bd
438331 - AbstractLogger.debug(String,long) infinite loop
...
+ Breaking infinit loop
2014-07-09 08:54:10 -07:00
ca1a9ceb7c
fixed merge issues
2014-07-04 23:22:40 +10:00
706fe1eba3
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-03 16:01:37 +10:00
7fbf521d4e
438204 correctly wrap IPv6 hostnames in URIs generated by jetty
2014-07-03 10:11:16 +10:00
78b03c5b8e
More debug for intermittent failures
2014-07-02 16:01:00 +10:00
6eceb6bd99
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-29 08:11:41 +02:00
9b764ef3fa
435322 Fixed Iterating Callback close
2014-06-27 20:43:12 +02:00
d49ecdf1d6
Minor tweak for windows testcase expecting IllegalArgumentException
2014-06-26 09:14:04 -07:00
56751dfa72
Merge branch 'master' into pathresource
2014-06-26 08:56:43 -07:00
2608af8f0d
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-26 11:54:50 +02:00
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
39079d4e84
Tweaking for windows test conditions
2014-06-25 15:29:18 -07:00
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
a746d78951
438079 435322 Fixed Iterating Callback fail handling and removed per send instance
2014-06-25 19:20:03 +02:00
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
e63ceabafe
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-25 17:29:36 +02:00
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
66f3913527
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-25 12:34:19 +02:00
3ff4195dbc
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-06-25 12:26:45 +02:00
f93a409589
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-24 17:33:51 +02:00
31ce7cabda
437800 Improved alias handling of different encodings
2014-06-24 11:32:56 +02:00
140e7ed0c5
encoder headers as lowercase
2014-06-18 10:22:23 +02:00
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
5883123d07
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-10 09:01:21 +02:00
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
10b6c574ae
Merge branch 'master' into release-9
2014-06-09 13:07:22 -05:00
0d64434b27
435322 Improved debug
2014-06-09 18:35:23 +02:00
3c321e9b8f
split authority field and hold results in header table
2014-06-09 15:34:09 +02:00
d7fbd89a75
working decoder that can handle D3 and D4 examples from draft
2014-06-09 01:11:04 +02:00
ae4dea3e1e
near 100% test coverage of NBitInteger, Huffman and HpackContext
2014-06-08 15:17:39 +02:00
58ed30e710
header table mostly functional
2014-06-08 11:10:34 +02:00
bb4d42f139
Merge remote-tracking branch 'origin' into jetty-http2
2014-06-04 15:09:19 +02:00
8f4aeeeb8d
updated version to 10.0.0-SNAPSHOT
2014-06-04 15:08:54 +02:00
ac4f8a26b7
435322 Protect blocker against null failed callback
2014-06-04 13:39:58 +02:00
cfe99742d9
Due to JettyAwareLogger, the Slf4j minimum requirement is version 1.6
2014-06-03 15:34:21 -07:00
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
bcf52e14f0
435206 - Can't add Cookie header on websocket ClientUpgradeRequest
...
+ Fixed competing cookie setters between WebSocketClient's use of
CookieStore and UpgradeRequest.setCookies()
+ Added some utility methods to LazyList (for lack of existence of
ListUtil or CollectionUtil in jetty-util)
2014-05-20 11:57:35 -07:00
7918a58c71
Using Callback.Adapter.INSTANCE to avoid unneeded allocations.
2014-05-19 18:49:17 +02:00
b515da6456
Import cleanup
2014-05-12 12:47:46 -07:00
707e9b5dda
434679 - Log static initialization via jetty-logging.properties fails sometimes
...
+ More cleanup of Log initialization to better use JDK7 features,
and to not use other parts of Jetty that might initialize Logging
itself. As these are the causes of the bad initialization failures.
2014-05-12 12:43:07 -07:00
8e3921b615
Setting up windows-7 specific logging for AnnotatedMaxMessageSize test failure
2014-05-12 10:38:20 -07:00
f26291f5b6
433849 FileResource string compare fix
2014-05-06 10:45:10 +02:00
894fb6bfc0
increment Version
2014-05-05 19:09:19 +02:00
943fb64176
433841 Resource.newResource() declares an exception it does not throw
2014-05-05 15:45:30 +02:00
51c5a4c833
425421 ContainerLifeCycle does not start added beans in started state
2014-05-05 14:53:53 +02:00
c4b5e3d3d7
Introduced CompletableCallback to handle asynchronous content on clients.
2014-05-04 23:14:45 +02:00
11096e8a0d
Added ASYNC_WOKEN state to HttpChannelState
2014-05-03 10:29:20 +02:00
2e261b75d6
433692 improved buffer resizing
2014-04-29 20:36:13 +02:00
bdecc7bd89
433479 Improved resource javadoc
2014-04-25 14:36:59 +02:00
15661722b3
433483 sync log initialize
2014-04-25 14:22:57 +02:00
deb7102e0e
404511 removed deprecated StringMap
2014-04-11 10:57:39 +10:00
866960d5d7
431094 Consistent handling of utf8 decoding errors
2014-04-10 15:52:15 +10:00
7adba8d033
431094 Consistent handling of utf8 decoding errors
2014-04-10 15:14:46 +10:00
4dbabd72f2
429734 Implemented the HA ProxyProtocol
2014-04-04 08:47:37 +11:00
c5e1e249e7
set version for 9.2.x
2014-03-31 11:35:06 +11:00
28445fc629
Merge remote-tracking branch 'origin/master' into jetty-9-alpn
2014-03-31 09:59:52 +11:00
c895f6dbcd
organised imports
2014-03-31 09:57:59 +11:00
8ebf4367c2
427188 - Re-enable automatic detection of logging-dependencies with logging-module
...
+ Adding lib/logging/**.jar [lib] to logging.mod
2014-03-28 09:59:16 -07:00
342c97d8ba
430654 - closing client connections can hang worker threads.
...
Prettified usage of NonBlockingThread and added Javadocs.
2014-03-27 15:37:23 +01:00
1089a33578
Fixed imports referencing JUnit 3 and old matcher libraries.
2014-03-27 15:34:48 +01:00
86d13b91a5
430654 avoid dispatching failure callbacks
2014-03-27 19:08:16 +11:00
710ea48244
430654 430242 - Closeable SharedBlockingCallback
2014-03-22 09:36:09 +11:00
5d83a43cce
430242 - added SharedBlockingCallback to support threadsafe blocking
2014-03-22 08:42:03 +11:00
138dfba560
Revert "430242 - added SharedBlockingCallback to support threadsafe blocking"
...
This reverts commit 9c30e7a303
2014-03-21 17:55:48 +11:00
367c43a7b3
423982 removed duplicate UrlResource toString
2014-03-21 12:56:53 +11:00
18fb0c8877
430824 - jetty-start / use of jetty-logging.xml prevents configuration of ThreadPool in jetty.xml
...
+ Setting <Configure> to configure itself, not Server
2014-03-20 14:13:29 -07:00
0b1c4b6d8b
426897 improved ContainerLifeCycle javadoc
2014-03-20 12:43:36 +11:00
119718d86f
added jetty-quickstart module
2014-03-19 09:56:19 +11:00
9c30e7a303
430242 - added SharedBlockingCallback to support threadsafe blocking
2014-03-13 21:12:55 +11:00
4de73d508b
430242 - added SharedBlockingCallback to support threadsafe blocking
2014-03-13 14:46:00 +11:00
0ec0d452e9
[maven-release-plugin] prepare for next development iteration
2014-03-07 09:10:08 -06:00
1e555567a9
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
2014-03-07 09:10:08 -06:00
2d8ca94a96
428859 Do not auto initialise jsr356 websocket if no annotations or EndPoints discovered
2014-02-25 11:46:11 +11:00
d349d640c0
428859 Do not auto initialise jsr356 websocket if no annotations or EndPoints discovered
2014-02-24 16:31:56 +11:00
15952aeee4
428232 - Rework batch mode / buffering in websocket.
2014-02-21 00:54:32 +11:00
18e19260ff
Apply changes resulting from the quickstart project
2014-02-13 12:31:14 +11:00
eb0aea46ce
set versions.txt file to new version and fix mistaken developmentVersion
2014-02-10 13:48:29 -06:00
f3d38dfb15
[maven-release-plugin] prepare for next development iteration
2014-02-10 11:17:14 -06:00
8f6cbc9111
[maven-release-plugin] prepare release jetty-9.1.2.v20140210
2014-02-10 11:17:07 -06:00
5cdd27b7b9
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2014-01-13 19:13:32 -07:00
1cad68b263
Windows file mod (0755 to 0655) changes
2014-01-13 19:13:19 -07:00
91429ea123
Merge branch 'release-9'
2014-01-10 09:11:25 -06:00
b82ec6e668
[maven-release-plugin] prepare for next development iteration
2014-01-08 16:47:09 -06:00
b99623a21d
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
2014-01-08 16:47:01 -06:00
36340c4898
Minor tweaks to leak detector stuff
2014-01-08 14:54:39 -07:00
8720fb213c
425043 - Track whether pools are used correctly.
...
Introduced LeakDetector and utility classes LeakTrackingConnectionPool
and LeakTrackingByteBufferPool to track resource pool leakages.
Fixed ConnectionPool to be more precise in closing connections when
release() cannot recycle the connection.
Fixed a leak in server's HttpConnection in case a request arrives with
the Connection: close header: a ByteBuffer was allocated but never
released.
2014-01-07 19:44:29 +01:00
333ac73d5e
Cleaning up some New Years leftovers
2014-01-03 08:18:24 -07:00
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
f73d8a083c
424043 - IteratingCallback Idle race.
...
Cosmetics, removed TODO.
2013-12-20 11:19:06 +01:00
5643e588e2
424307 obfuscate unicode
2013-12-19 11:01:24 +11:00
cf3acd376f
424043 - IteratingCallback Idle race.
...
restored support for the old style usage where the callback is scheduled externally without a call to iterate()
2013-12-16 11:34:19 +11:00
8d621a9331
424043 - IteratingCallback Idle race.
...
A few renamings and fixes to avoid IllegalStateExceptions.
2013-12-15 23:51:04 +01:00
41fc2b8f87
424043 - IteratingCallback Idle race.
...
Renamed Next enum to Action, and renamed some constant of the State
enum to avoid confusion with the Action enum.
Simplified succeeded() and failed(Throwable) code,
covering also cases not covered before.
Fixed case SCHEDULED in succeeded() that was returning in case the
compareAndSet failed.
Fixed race in perform(), where 2 threads may execute concurrently
after having returned from process().
Vastly improved javadocs and comments.
2013-12-15 00:47:55 +01:00
7141483356
424043 - IteratingCallback Idle race
2013-12-14 09:14:12 +11:00
8243bd60b7
423392 - GzipFilter without wrapping or blocking
...
Handle the case where a gzip flush requires multiple iterations to go from finish() to finished()
Better handling of exceptional cases
2013-12-09 18:20:04 +11:00
7e7af161bc
419309 - encode alias URIs from File.toURI
2013-11-25 13:08:34 +11:00
0a52c64d16
421697 - IteratingCallback improvements
...
Use the iteratingcallback for websocket
use gather writes for websocket
always write entire websocket payload
2013-11-21 15:11:56 +11:00
1eb2997efd
421697 - IteratingCallback improvements
...
avoid wrapping writeCallback
Idle state added to IteratingCallback for SPDY
2013-11-21 14:52:39 +11:00
9172d6115b
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:58:44 -07:00
6feeab6ec3
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:58:36 -07:00
7bbc0ff4df
[maven-release-plugin] rollback the release of jetty-9.1.0.v20131115
2013-11-15 16:33:52 -07:00
1126e68971
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:03:28 -07:00
d6418c73d4
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:03:20 -07:00
6c372b9440
Reverting <version> to 9.1.0-SNAPSHOT
2013-11-15 15:36:26 -07:00
b5345caed1
[maven-release-plugin] prepare for next development iteration
2013-11-14 15:27:52 -06:00
1582aa196d
[maven-release-plugin] prepare release jetty-9.1.0.v20131114
2013-11-14 15:27:37 -06:00
f951b8f979
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
tests/test-webapps/test-jetty-webapp/src/main/webapp/remote.html
2013-11-11 14:08:25 +11:00
16d22828fd
416477 - QueuedThreadPool does not reuse interrupted threads
2013-11-11 14:06:41 +11:00
8bda67b82d
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
2013-11-08 15:24:12 +11:00
ed1555e0c4
added QueuedThreadPool.getQueueSize()
2013-11-08 11:58:13 +11:00
b786fd74d0
Touching up logging.mod
2013-11-06 17:30:49 -07:00
36c807c2f3
417223 - removed deprecated ThreadPool.dispatch
2013-11-04 17:21:50 +11:00
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
eb3bb660b5
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
6b0269a16d
[Bug 420930] Use Charset to specify character encoding
...
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
845c08970e
417933 - logging.mod ini template should include commented log.class settings
2013-10-30 13:14:22 -07:00
f4e95be443
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-10-28 18:01:43 +11:00
c101e55c7f
[Bug 420374] Call super.close() in a finally block
...
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-10-26 12:43:06 +06:00
05cab9bfb4
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java
2013-10-26 11:01:25 +11:00
5965e695fa
Cleaning up modules
2013-10-24 14:06:50 -07:00
28566c72c8
420142 reimplemented graceful shutdown
2013-10-24 17:22:08 +11:00
d5f83a8159
420034 Removed threads/timers from Date caching
2013-10-24 11:09:17 +11:00
323572708c
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
2013-10-23 11:51:19 +11:00
d38233c52d
420048 - DefaultServlet alias checks configured resourceBase
...
Fixed false positive alias detection for ; encoded as %3B in file name
2013-10-23 11:46:58 +11:00
61dcf9895e
Removed warn logging statement from Adapter.failed(Throwable) since
...
it just clutter the logs.
2013-10-22 19:18:34 +02:00
bb7ab62c7a
419914 - QueuedThreadPool uses nanoTime
2013-10-21 15:12:07 +11:00
2d6190da59
Refactored class Fields to a better API.
2013-10-18 13:55:49 +02:00
591cf9badf
Deleted class org.eclipse.jetty.util.thread.Timeout, replacing its
...
usages with o.e.j.u.t.Scheduler.
2013-10-17 13:25:15 +02:00
c1832b29fb
Merged branch 'master' into 'jetty-9.1'.
2013-10-17 12:37:37 +02:00
7618826349
419687 - HttpClient's query parameters must be case sensitive.
...
Modified class Fields to take a boolean parameter that defines
whether it is case sensitive or not, and updated HttpRequest to use
a case sensitive Fields instance for the query parameters.
2013-10-17 12:37:01 +02:00
4da6ddc94f
403591 - improve the Blocking Q implementation.
...
Removed ConcurrentArrayBlockingQueue implementations as they were not
up to par performance wise.
2013-10-17 10:44:39 +02:00
6c2a14396e
410840 - Change SSLSession.getPeerCertificateChain() to
...
SSLSession.getPeerCertificates().
2013-10-16 17:31:40 +02:00
8eb683f9b5
fixed merge
2013-10-14 18:00:53 +11:00
1d5730d8d2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-10-14 17:19:09 +11:00
b8c8abae2e
419333 treat // as an alias in path
2013-10-14 17:16:54 +11:00
081e7d3bbd
415609 spdy replace SessionInvoker with IteratingCallback. Introduce Flusher class to separate queuing/flushing logic from StandardSession
2013-10-11 10:51:05 +02:00
33dedd15f9
Typo fix
2013-10-11 10:49:13 +02:00
646b4c929b
Fixing invalid javadoc
2013-10-10 07:31:56 -07:00
856a24b65a
[maven-release-plugin] prepare for next development iteration
2013-09-30 14:46:09 -05:00
f466f03c6a
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
2013-09-30 14:46:00 -05:00
0b3f431d27
set version back to 9.0.6-SNAPSHOT
2013-09-30 12:33:06 -05:00
af2e6ff911
Merge branch 'master' into release-9
2013-09-30 12:28:04 -05:00
0400289826
417561 Refactor annotation related code - make annotation phase able to be multithreaded
2013-09-30 13:27:05 +10:00
0fac295cd8
418014 Handle NTFS canonical exceptions during alias check
...
replaced URL returns with URI
2013-09-27 15:50:36 +10:00
080781ec0e
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-09-27 13:37:55 +10:00
458e511ce2
418014 Handle NTFS canonical exceptions during alias check
2013-09-27 13:37:00 +10:00
643b6c3c77
removed ExecutorCallback
2013-09-26 18:06:10 +10:00
ac40e7ab6a
Fixing various javadoc errors
2013-09-25 08:11:32 -07:00
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
d4c035a06f
417561 Refactor annotation related code to remove some deadwood
2013-09-19 15:43:38 +10:00
5a801d398d
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-09-16 12:10:55 +10:00
9fef8215ed
417225 added Container.addEventListener method
2013-09-16 10:48:51 +10:00
070ce9dd22
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
767faece5c
[Bug 415999] Fix some of FindBugs warnings
...
Mostly not closed streams/DB resources are fixed. But also less
important things.
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
ace43502ad
refined start.jar mechanism to align with updated documentation
2013-09-06 16:10:03 +10:00
8fdc6b05bb
Fixing logging.mod for new module format
2013-08-30 13:08:11 -07:00
cc6e2964be
Made Fields.Field constructor public.
2013-08-30 18:45:16 +02:00
c183c6fad5
Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
2013-08-29 12:59:50 +10:00
280000e88a
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/src/main/config/demo/webapps/test.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-08-29 12:59:32 +10:00
d66778ad06
415826 start.jar module --enable and --disable
...
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
ef166c23e6
Merge branch 'release-9'
2013-08-23 18:58:01 -05:00
d2ff475834
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
2013-08-23 17:17:34 +10:00
b33b5f2f5d
413684 deprecated unsafe alias checkers
2013-08-23 16:49:42 +10:00
59540abeda
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2013-08-22 22:58:58 +10:00
c4583918a3
415330 Avoid multiple callbacks at EOF
2013-08-22 21:31:29 +10:00
16191da3ac
reduced test times
2013-08-22 21:31:29 +10:00
15f3a4e7c7
reduced test times
2013-08-22 18:17:50 +10:00
48ae7ec3f6
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-22 07:56:22 +10:00
e351f04002
bug 415302
...
Patch to protect against null input's.
-=david=-
Signed-off-by: David Harrigan <dharrigan@gmail.com>
2013-08-22 07:47:10 +10:00
669f26566f
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-16 11:44:30 +10:00
2761abb658
415194 Deployer gives management of context to context collection
2013-08-16 11:40:23 +10:00
484aa94cd0
415131 Avoid autoboxing on debug
2013-08-15 22:57:43 +10:00
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
9da23cdba1
Fixing javadoc in jetty-util that JDK 1.7 complains about
2013-08-14 11:05:24 -07:00
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
d3a93a0d68
Merged branch 'master' into 'jetty-9.1'.
2013-08-13 16:13:31 +02:00
75f87a289a
414951 QueuedThreadPool fix constructor that missed to pass the idleTimeout
2013-08-13 13:35:06 +02:00
1e25778d57
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
2013-08-13 00:44:39 +10:00
43946c62e0
414449 Added HttpParser strict mode for case sensitivity
2013-08-12 23:02:08 +10:00
3eeb20f5bd
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-12 12:12:50 +10:00
c48cb240a1
414763 Added org.eclipse.jetty.util.log.stderr.ESCAPE option
2013-08-12 11:42:09 +10:00
e0382bc4ae
414740 Removed the parent peeking Loader
2013-08-09 17:53:43 +10:00
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
a779425994
414101 Do not escape special characters in cookies
2013-08-09 12:42:52 +10:00
8636c7da45
Merge branch 'master' into jetty-9.1
...
Conflicts:
jetty-maven-plugin/pom.xml
pom.xml
2013-08-05 09:53:48 -07:00
74991f90d6
Cleanup from merge
2013-08-05 09:13:32 -07:00
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
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
f3f2bce36c
414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF
2013-08-05 17:18:44 +10:00
20bd1e0f96
[maven-release-plugin] prepare for next development iteration
2013-07-26 11:50:17 -05:00
49c3b2c32a
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:49:58 -05:00
6ed360c480
reset for release
2013-07-26 11:23:57 -05:00
1a5117e9ab
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:18:24 -05:00
650e8e93ae
[maven-release-plugin] prepare for next development iteration
2013-07-26 10:57:33 -05:00
e7e2fce56e
[maven-release-plugin] prepare release jetty-7.6.12.v20130726
2013-07-26 10:57:26 -05:00
d87a3884ad
Merge branch 'jetty-8' into release-8
2013-07-26 10:38:24 -05:00
2eb3925358
Merged branch 'master' into 'jetty-9.1'.
2013-07-26 14:18:10 +02:00
bc096cace4
Moved new JSON classes to the right module.
2013-07-26 14:17:42 +02:00
9d571af7b0
Merged branch 'master' into 'jetty-9.1'.
2013-07-26 13:55:05 +02:00
cea4ac5fe3
Merged branch 'jetty-8' into 'master'.
2013-07-26 13:51:26 +02:00
b7b3ced092
Merged branch 'jetty-7' into 'jetty-8'.
2013-07-26 13:46:08 +02:00
5c7eb9e265
Reverted version to 7.6.12-SNAPSHOT.
2013-07-26 13:36:35 +02:00
a0519a9693
413371 - Default JSON.Converters for List and Set.
...
Introduced a JSONCollectionConvertor that is able to convert
Collections, and hence both List and Set.
Code cleanups.
2013-07-26 13:09:11 +02:00
4a5567433c
413372 JSON Enum uses name rather than toString()
2013-07-26 16:06:32 +10:00
49045558ef
[maven-release-plugin] prepare for next development iteration
2013-07-25 14:07:12 -05:00
9b888d5c22
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
2013-07-25 14:06:53 -05:00
de2840ca1e
[maven-release-plugin] prepare for next development iteration
2013-07-25 12:52:15 -05:00
3e94867f7f
[maven-release-plugin] prepare release jetty-8.1.12.v20130725
2013-07-25 12:52:07 -05:00
bc679809f8
[maven-release-plugin] prepare for next development iteration
2013-07-25 11:25:58 -05:00
39ec9b8051
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
2013-07-25 11:25:51 -05:00
e0ad2c4ee1
[maven-release-plugin] prepare for next development iteration
2013-07-25 07:52:39 -05:00
99712058ca
[maven-release-plugin] prepare release jetty-8.1.11.v20130725
2013-07-25 07:52:32 -05:00
767dbe6778
[maven-release-plugin] prepare for next development iteration
2013-07-25 07:48:09 -05:00
cfa6076c4f
[maven-release-plugin] prepare release jetty-7.6.11.v20130725
2013-07-25 07:48:02 -05:00
b8f7637e7d
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-22 23:32:04 +10:00
8f190476b7
413393 better logging of bad URLs in Resources
2013-07-22 23:30:43 +10:00
e4ef8ee1f4
413154 ContextHandlerCollection defers virtual host handling to ContextHandler
2013-07-22 22:10:13 +10:00
8645849272
398467 Servlet 3.1 Non Blocking IO
...
Added ByteBuffer write and improved test harnesses
2013-07-18 12:53:07 +10:00
e758e0111b
412940 minor threadsafe fixes
...
hold lock for accessing elements size
2013-07-15 17:00:51 +10:00
8d49f69aa4
412940 minor threadsafe fixes
2013-07-15 16:47:05 +10:00
5d3760b17d
simplified HttpInput lock design
2013-07-15 15:54:25 +10:00
bd2add0ae9
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
2013-07-12 13:53:58 +10:00
981102fda5
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
965918d8f2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-04 17:28:57 +10:00
091a419568
411755 MultiPartInputStreamParser fails on base64 encoded content
2013-07-04 11:11:44 +10:00
1762ab7de5
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/B64Code.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
2013-07-04 10:58:28 +10:00
c934bbe45c
411755 MultiPartInputStreamParser fails on base64 encoded content
2013-07-04 10:22:22 +10:00
32ec8255db
411538 Use Replacement character for bad parameter % encodings
2013-06-27 10:19:51 +10:00
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
31faf2fe20
Reverting failed release from friday
2013-06-25 07:42:45 -07:00
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
507cc074c6
Merge remote-tracking branch 'origin/servlet-3.1-api' into jetty-9.1
2013-06-21 13:04:54 +10:00
3ded04813d
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java
2013-06-21 11:22:58 +10:00
60828fe8a3
javadoc and branchless hilo
2013-06-20 11:36:59 +10:00
8b252ecd9f
Updating dev version to 9.1.z
2013-06-19 17:17:14 -07:00
f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -07:00
f7c9d5424d
410995 - Avoid reverse DNS lookups when creating SSLEngines.
...
Now using the host address, unless needClientAuth is true.
2013-06-18 10:58:09 +02:00
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
3ddb1d9727
Merge branch 'servlet-3.1-api' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into servlet-3.1-api
2013-06-17 11:25:45 +10:00
969b90edeb
extra test zip
2013-06-17 11:25:19 +10:00
6c44b290a9
Add constructer fo fix broken test (suspect someone hasn't pushed)
2013-06-14 14:00:41 -05:00
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
9d89bc564e
Adding StacklessLogging try-with-resources compatible convenience class
2013-06-12 11:04:00 -07:00
955e7e8d74
410559 Removed FillInterest race
2013-06-12 18:35:13 +10:00
c5bf9c3d49
Increase buffer size of BufferUtil.writeTo to 4k
2013-06-12 08:43:25 +02:00
d2794584e1
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
d3b96328f9
409953 More efficient implementation of BufferUtil.writeTo(...)
2013-06-06 12:59:18 +02:00
4a10f4296c
409953 More efficient implementation of BufferUtil.writeTo(...)
2013-06-06 11:39:22 +02:00
38a0e4f6aa
revert test in BufferUtilTest
2013-06-06 08:06:52 +02:00
100e8cbaef
improved javadoc
2013-06-06 12:12:31 +10:00
229c44b44f
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
...
backed out bad test
2013-06-06 10:43:49 +10:00
b274fdb0d6
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
2013-06-05 15:31:24 +02:00
7bb3a7be28
409556 Resource files not closed
...
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.
FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
a2732e3cf6
[Bug 401027] javadoc JMX annotations
2013-05-31 14:37:09 -05:00
af02e9b16d
Update to version to 8.1.12-SNAPSHOT after last release
2013-05-30 10:52:39 +10:00
c7be106423
398467 Servlet 3.1 Non Blocking IO
...
Working async writes after HttpChannelState refactor
2013-05-25 15:45:16 +10:00
94d1f4a020
398467 Servlet 3.1 Non Blocking IO
...
Check point progress as I dispair at the insane complexity of servlet 3.1 specification
2013-05-24 14:34:27 +10:00
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
725dc261c8
Merge branch 'release-8' into jetty-8
2013-05-22 10:44:14 -05:00
a1a6f0e5f2
Merge branch 'release-7' into jetty-7
2013-05-22 10:39:24 -05:00
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
742f6a063d
[Bug 408600] set correct jetty.url in all pom files
2013-05-21 13:16:39 -05:00
bdbd92dbc9
[Bug 408600] set correct jetty.url in all pom files
2013-05-21 13:10:07 -05:00
0858e69cb1
[maven-release-plugin] prepare for next development iteration
2013-05-20 07:19:34 -05:00
d469b77663
[maven-release-plugin] prepare release jetty-8.1.11.v20130520
2013-05-20 07:19:25 -05:00
497c2f7819
[maven-release-plugin] prepare for next development iteration
2013-05-20 07:15:00 -05:00
b32d0260c9
[maven-release-plugin] prepare release jetty-7.6.11.v20130520
2013-05-20 07:14:52 -05:00
b5f3743a22
Uncomment test for changes to MultipartInputStreamParser
2013-05-20 17:20:52 +10:00
259aac6463
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-05-20 17:18:28 +10:00
053408254e
408446 Multipart parsing issue with boundry and charset in ContentType header
2013-05-20 15:39:30 +10:00
5397f16559
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-17 14:09:17 +10:00
52444486d1
408281 - Inconsistent start/stop handling in ContainerLifeCycle
...
added stop(LifeCycle)
stop removed managed beans
always use start(LifeCycle)
2013-05-17 09:56:09 +10:00
b22d280e2a
398467 Servlet 3.1 Non Blocking IO
...
Cleaned up exceptions and HttpOutput.write
2013-05-16 19:00:00 +10:00
76d4859eda
398467 Servlet 3.1 Non Blocking IO
...
Improved sendContent API and javadoc. Added FastFileServer example
2013-05-16 09:26:37 +10:00
19d9febfbc
javadoc
2013-05-14 11:33:33 +10:00
9f3e4dc5b7
398467 Servlet 3.1 Non Blocking IO
...
Added callbacks to HttpOutput
2013-05-14 10:09:09 +10:00
418f8b9b0c
Pointing to proper resource file in the test
...
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2013-05-13 12:41:11 -05:00
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
0d181d9a75
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-03 16:59:39 +10:00
e6dc08cf97
406923 Accept CRLF or LF but not CR as line termination
...
Fixed lookahead parsing of cached fields
2013-05-02 14:49:46 +10:00
e7ecfd2b2b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
e26d8e67e5
406861 Fixed IPv6 redirect
2013-04-30 18:49:29 +10:00
87d4690462
405533 Implement special role ** for security constraints
2013-04-19 15:53:45 +10:00
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
d34bd7aec7
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-18 12:16:24 +10:00
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
e390b54b25
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
2013-04-17 11:46:31 -05:00
0b20467c6f
[maven-release-plugin] prepare for next development iteration
2013-04-15 11:40:45 -05:00
3aa4301711
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
2013-04-15 11:40:37 -05:00
7b2b5231ca
405531 Implement Part.getSubmittedFileName()
2013-04-15 17:59:19 +10:00
db21b42b4f
Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds).
2013-04-15 17:44:35 +10:00
9fd155d36e
Marked the test with @Stress.
2013-04-12 14:07:58 +02:00
de7adaf0d2
Reverted usages of ConcurrentArrayBlockingQueue until proven it's correctly implemented.
2013-04-12 13:58:31 +02:00
07b844bf85
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-04-11 15:55:04 +10:00
a0ec3b6834
removed commented out line
2013-04-11 12:00:41 +10:00
4c04f5dd40
403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-04-11 11:46:07 +10:00
c7c3e4455f
404511 fixed poor methods in ArrayTernaryTrie
2013-04-11 11:46:07 +10:00
5728077faf
Merge remote-tracking branch 'origin/release-9'
2013-04-11 06:24:01 +10:00
aa4e79efe2
Ignoring queue benchmark tests as they take too long to run.
2013-04-09 23:05:34 +02:00
45253bfb2a
Added benchmark for queues.
2013-04-09 12:13:53 +02:00
b8dd8bde14
[maven-release-plugin] prepare for next development iteration
2013-04-08 12:31:34 +10:00
bf3771904b
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
2013-04-08 12:30:59 +10:00
4be4c954a5
Merge remote-tracking branch 'origin/jetty-8'
2013-04-05 09:59:03 +11:00
6b3cb20720
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-05 09:58:33 +11:00
b58066451e
404958 Fixed Resource.newSystemResource striped / handling
2013-04-05 09:58:05 +11:00
72219d016b
404610 - Reintroduce ability to disallow TLS renegotiation.
2013-04-04 17:11:01 +02:00
fc31a16c23
404881 Allow regexs for SslContextFactory.setIncludeCipherSuites() and .setExcludeCipherSuites()
2013-04-04 15:08:15 +02:00
7523c5234c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-jsp/pom.xml
2013-04-04 13:31:33 +11:00
af5f8aac33
403122 Session replication fails with ClassNotFoundException when session attribute is Java dynamic proxy
2013-03-28 15:02:33 +11:00
fd099aa77d
404511 Replaced all StringMap usage with Tries
2013-03-28 13:20:47 +11:00
28bb68a8ae
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-26 10:57:16 +11:00
af53d94b8b
404283 org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null
2013-03-26 10:55:37 +11:00
5ebf6996c5
404283 org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null
2013-03-26 10:18:32 +11:00
b2f3a05503
403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-03-21 09:24:02 +11:00
76607e20a5
403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-03-18 16:19:58 +11:00
279dff381c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-osgi/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
2013-03-18 16:00:23 +11:00
8514e8452b
403591 use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-03-18 15:37:00 +11:00
5f1980f408
merged unsafe blocking Q, removed unsafe usage and usage of Q
2013-03-18 13:27:37 +11:00
ba9d70589a
Merge branch 'master' into unsafe
2013-03-18 12:02:37 +11:00
0d2fc88384
Fixed put() and timed offer() implementations in Unbounded.
2013-03-18 01:51:24 +01:00
e8d76ef12c
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java
jetty-server/src/main/config/etc/jetty-requestlog.xml
jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java
jetty-servlets/pom.xml
2013-03-18 11:09:13 +11:00
9535f0b599
385488 non existing resources in collection are just warnings
2013-03-15 15:07:20 +11:00
c577783fa6
inject new Q into ThreadPool
2013-03-15 12:30:49 +11:00
17e1839089
Merge branch 'master' into unsafe
2013-03-15 11:15:33 +11:00
8a96cc8c4a
Merge branch 'jetty-7' into jetty-8
2013-03-14 16:54:35 -07:00
5084a1430f
Fixing build.
...
+ Bumping jetty-test-helper to 2.0
+ Bumping jetty-version-maven-plugin to 1.0.10
+ Fixing JDK 1.5 build warts
+ Updating Stress use for new "test.stress" property introduced by upgrades
2013-03-14 16:52:52 -07:00
1cb201ef14
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-distribution/src/main/resources/bin/jetty.sh
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-03-14 12:40:29 +11:00
38d701753c
403281 jetty.sh waits for started before OK
...
Conflicts:
jetty-distribution/src/main/resources/bin/jetty.sh
2013-03-14 11:50:06 +11:00
a7238f2688
403281 jetty.sh waits for started before OK
2013-03-14 11:44:04 +11:00
f0a9f9caa0
Fixed signalling in ConcurrentArrayBlockingQueue.
2013-03-14 00:09:44 +01:00
Greg Wilkins
Simone Bordet
Jan Bartel
Joakim Erdfelt
Jesse McConnell
Mikhail Mazursky
Thomas Becker
David Harrigan
William Ferguson