a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
e1a663865c
394210 spdy api rename stream.syn() to stream.push()
2012-12-21 18:14:14 +01:00
26c5eb428f
396193 spdy remove timeout parameters from api and move them to the Info* classes
2012-12-21 13:24:16 +01:00
440d4c4bf4
394211 - spdy: Expose RemoteServerAddress and LocalServerAddress in StandardSession
2012-12-12 18:48:49 +01:00
e299169ee3
StandardSession change LOG.warn in flush() back to LOG.debug
2012-12-12 18:48:49 +01:00
dc2850c898
396036 SPDY send controlFrames even if Stream is reset to avoid breaking the compression context
2012-12-07 13:22:19 +01:00
db6fdca3b9
395922: Unit test that checks if ControlFrameBytes are sent in the right order even with priorization
2012-12-07 11:39:53 +01:00
98d17bdea9
395922: Avoid that SPDY frames containing headers are sent in another order than they have been created
2012-12-06 14:18:52 +01:00
efc1a3e98f
Fix javadoc in Stream.java and logging if a Stream is committed twice
2012-11-30 13:55:09 +01:00
e1fb49d4d7
remove log.info in StandardSession.flush()
2012-11-29 14:22:01 +01:00
4d823c28bf
jetty-9 added jetty-all for javadoc, reinstated static context for javadoc, made proxy to xref
2012-11-29 17:41:54 +11:00
21f717078c
jetty-9 handle null push strategy
2012-11-29 17:03:40 +11:00
30091ccd89
395314 Add missing flush() call after StandardSession.complete() has been called. Some test cleanup.
2012-11-28 17:43:53 +01:00
ee893d8526
Corrected changes introduced with Promise.
...
Save creation of iterators for every append() and prepend() in StandardSession.
Removed PromisingCallback, only used by SPDY and better implemented otherwise.
2012-11-23 13:16:32 +01:00
9edac367c8
394854 optimised promise implementation
2012-11-23 12:18:52 +11:00
04aafcae3c
Fixed NPEs caused by guard introduced in AbstractFrameBytes's constructor for null callbacks.
2012-11-23 12:18:52 +11:00
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
b76669434f
Add messages to StreamExceptions thrown in StandardSession and StandardStream
2012-11-16 12:50:32 +01:00
bb27f561c1
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:24:06 -06:00
1d767e99a3
[maven-release-plugin] prepare release jetty-8.1.8.v20121105
2012-11-05 12:23:59 -06:00
70d591c430
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:16:03 -06:00
017826b4eb
[maven-release-plugin] prepare release jetty-7.6.8.v20121105
2012-11-05 12:15:57 -06:00
52464a5ba6
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
8723408731
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
65202e9abe
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 11:55:00 +11:00
c51cabccc1
392237 moved HttpTransport towards asynchronous solution
2012-10-25 23:28:32 +11:00
bf7a0ace22
392237 Added BlockingCallback optimisation
2012-10-25 22:36:13 +11:00
b08dd26284
392237 Added some more debugging
2012-10-21 16:51:35 +11:00
7c1039940f
392237 Added some debugging
2012-10-21 16:39:05 +11:00
3efefe37bc
Clean-up OSGi test; add spdy OSGi test; fix felix
...
Upgrade to the latest pax-exam
Support for felix-3.x and 4.x as tested
Fix the spdy MANIFEST.MF generations
Add an integration test for SPDY
Refactor the test code
Squashed commit of the following:
commit bd020ee1214992d8d21a11dc800e04dc5e9b2001
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Sat Oct 6 16:58:43 2012 +0800
Add spdy integration test for OSGi and clean-up
Refacor the pax-exam OSGi integration tests
Add an integration test for spdy.
Execute the test under 2 versions of felix and 2 versions of equinox.
commit f3151a272ab92560432f3b76f564bf06b19bc22b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Sat Oct 6 16:28:51 2012 +0800
Fix the generated MANIFEST.MF
OSGi integration test in the next commit.
commit 3152aa2b5e39cf2d3b81f8400488c0672e922b8d
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Fri Oct 5 16:58:29 2012 +0800
Fix the startup of the servlet.
setInitOrder(0) was working in jetty-7 and jetty-8 but not in jetty-9
anymore. setInitOrder(1) is fine.
commit 8038d314f4f423e8608fd09dd42b840e101a0c13
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:28 2012 +0800
Upgrade to pax-exam-2.6
commit 7136fa88e2410ac345b6ae0657d882c7e9714c0b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:07 2012 +0800
Support for felix-3.x and felix-4.x
commit 0bcc6b0d8ed5144150f90f578a90c558419349d1
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:28 2012 +0800
Upgrade to pax-exam-2.6
commit 2e17466624650df433b6c5f11abafb56539ee740
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:07 2012 +0800
Support for felix-3.x and felix-4.x
2012-10-06 17:26:14 +08:00
6cc0734a1a
jetty-9 miscillaneous optimizations: donot dispatch to HTTP and SPDY; improved executorCallback
2012-10-02 13:48:51 -07:00
29c18fc4d5
OSGi manifests generation fixes cleanup
2012-09-25 11:24:16 +08:00
1cfa277c6c
jetty-9 osgi support
2012-09-24 13:04:57 +08:00
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
857498b115
Upgrading to junit-dep-4.10.jar (banning junit.jar)
2012-09-20 11:52:59 -07:00
0915b2b0ab
jetty-9 - Refactored code that was counting the number of reentrant invocations into a common utility class, ForkInvoker.
2012-09-17 14:39:13 +02:00
a8994178f5
[maven-release-plugin] prepare for next development iteration
2012-09-10 14:18:11 -05:00
92180a9700
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 14:18:01 -05:00
10e4027579
[maven-release-plugin] prepare for next development iteration
2012-09-10 13:59:34 -05:00
57a6258f96
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
2012-09-10 13:59:10 -05:00
1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
d8ed9116f1
jetty-9 - Moved SPDY's Headers class to jetty-util module as Fields.
2012-09-06 13:22:04 +02:00
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
c3776764f4
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:24:36 +10:00
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
2339da7cc0
Jetty9 - Marked tests as @Slow.
2012-08-28 13:04:18 +02:00
cda0528625
Jetty9 - Second draft of SPDY wiring: more test cases pass, still work to do.
2012-08-24 19:36:10 +02:00
171ad66962
Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 12:20:44 +02:00
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
086e74bed8
jetty-9 merged jetty-8
...
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
2012-08-17 23:35:42 +10:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
137ccca7c5
jetty9 - Make WriteFlusher.java threadsafe
2012-08-03 01:06:41 +02:00
9c717d552f
Jetty9 - SPDY: gracefully shutting down the Session in case of read of -1 from the remote peer.
...
A special item is queued into the Session for flushing, and when it is dequeued it closes the
underlying connection.
This allows pending writes to complete before the underlying connection is closed.
2012-07-30 23:02:26 +02:00
b4b1bc814c
Jetty9 - SPDY: fixed copyright headers.
2012-07-30 23:02:26 +02:00
8d12e49988
Jetty9 - SPDY: removed System.out statements.
2012-07-30 23:02:25 +02:00
51d7404956
jetty-9: spdy replaced log4j with jetty-logging.properties
2012-07-30 16:19:24 +02:00
2dcee671e1
Jetty9 - Removed leftover debug statement.
2012-07-27 23:28:27 +02:00
369bc035fc
jetty-9: jetty-spdy refactored to match jetty-9.
2012-07-27 16:18:47 +02:00
b36a6cc9cc
jetty-9 checkout jetty-spdy from jetty-8
2012-07-27 15:51:14 +02:00
c67b2d89c0
Merge remote-tracking branch 'origin/master' into jetty-8
2012-07-27 16:05:15 +10:00
37e0b8ffe4
spdy: StandardSession format toString method
2012-07-26 13:10:08 +02:00
136514948f
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:24:49 -05:00
1bbc677a09
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
2012-07-16 13:24:42 -05:00
f755d014cd
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:23:59 -05:00
04b7e807a0
[maven-release-plugin] prepare release jetty-7.6.5.v20120716
2012-07-16 13:23:53 -05:00
c00bb2d6ca
reset for release
2012-07-16 12:55:22 -05:00
f59b2a0632
reset release
2012-07-16 12:54:36 -05:00
205e8f74f0
[maven-release-plugin] prepare for next development iteration
2012-07-13 10:20:48 -05:00
c3b5269d60
[maven-release-plugin] prepare release jetty-8.1.5.v20120713
2012-07-13 10:20:23 -05:00
12ecc10c6a
[maven-release-plugin] prepare for next development iteration
2012-07-13 09:35:08 -05:00
bf40110fb8
[maven-release-plugin] prepare release jetty-7.6.5.v20120713
2012-07-13 09:34:52 -05:00
5222459aa7
Merge branch 'master' into jetty-8
2012-07-13 09:05:05 -05:00
198f713f7d
spdy: spdy-proxy refactoring to allow multiple ProxyEngine implementations for different protocols. Header name fix to lowercase header names before creating the bytes to sent over the wire.
2012-07-13 11:53:56 +02:00
81d72052c8
merged master to jetty-8
2012-07-11 14:04:49 -05:00
aa941f5711
quick pass through to clean up missing or incorrect license blocks
2012-07-11 12:29:46 -05:00
0fa17c13b1
Merge branch 'master' into jetty-8
2012-07-11 10:10:00 -05:00
ac7c3c8f0d
spdy: move x-spdy-push header to internal request. fix StandardStream.toString()
2012-07-06 15:46:31 +02:00
091fd73c3e
spdy: add StandardSession and StandardStream toString() improvements
2012-07-04 15:43:09 +02:00
a519ecc1fb
improved SPDY dump
2012-07-03 15:31:56 +02:00
571b1da632
Merge branch 'master' into jetty-8
2012-06-14 15:46:59 -05:00
bb3fa1cd7a
Added Session.getStream(int).
2012-06-12 00:31:00 +02:00
d786bca2e5
Made getSession() return ISession.
2012-06-12 00:30:39 +02:00
d54beaa750
Added attributes to Session.
2012-06-12 00:30:15 +02:00
457fdc74e5
Modified StandardStream to not depend on SynStreamFrame.
2012-06-11 14:32:14 +02:00
af836eb4b7
As per the Future contract, throw CancellationException if the Promise has been cancelled.
2012-06-11 14:23:53 +02:00
836c647fb8
Added utility method valuesAsString().
2012-06-11 14:22:46 +02:00
4bb0a30839
Overridden allocate() to support direct buffers.
2012-06-11 14:21:03 +02:00
8894cdc31d
Reviewed handling of the last stream id.
...
Now the last stream id is updated when a SYN is received, as the spec states.
2012-06-08 10:13:18 +02:00
7f39b8b7a4
Refactored atomic updates of max and min into utility class Atomics.
2012-06-08 09:59:36 +02:00
a7b1dd5e93
Merge remote-tracking branch 'origin/master' into jetty-8
2012-06-07 00:59:37 +02:00
Jesse McConnell
Greg Wilkins
Thomas Becker
Simone Bordet
Hugues Malphettes
Joakim Erdfelt
Jan Bartel