Jan Bartel
f1daea663a
Removing accidental add
2013-02-21 20:15:26 +11:00
Jan Bartel
cec5f5e65a
Fixing build
2013-02-21 20:13:45 +11:00
Greg Wilkins
bed3ea04f8
401382 Prevent parseAvailable from parsing next chunk when previous has not been consumed. Handle no content-type in chunked request.
2013-02-21 14:57:36 +11:00
Greg Wilkins
27cad4960b
401382 Prevent parseAvailable from parsing next chunk when previous has not been consumed
2013-02-21 12:43:18 +11:00
Joakim Erdfelt
42013791cc
Merge branch 'master' into javawebsocket-jsr
2013-02-20 15:58:53 -07:00
Joakim Erdfelt
22fe9d419e
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Rounding out the Encoders / Decoders base implementation
2013-02-20 15:58:04 -07:00
Simone Bordet
a6510e83ec
Made the test more reliable.
2013-02-20 19:19:06 +01:00
Simone Bordet
3ffbb586db
388103 - Add API for tracking down upload progress.
...
Introduced Request.ContentListener, invoked after the content has been sent.
2013-02-20 17:56:21 +01:00
Simone Bordet
29d779778e
Reduced object creation by caching the conversation response listeners.
2013-02-20 15:42:01 +01:00
Joakim Erdfelt
f2723404c6
Merge branch 'master' into javawebsocket-jsr
2013-02-19 16:25:29 -07:00
Joakim Erdfelt
54a4818511
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Defining Decoders and Encoders
+ Trying to work out the Type assignment matching for Decoders
2013-02-19 16:24:34 -07:00
Jan Bartel
9be9910cde
227244 Remove import of backport-util-concurrent Arrays class
2013-02-20 09:34:30 +11:00
Jan Bartel
9af4334739
committing to save changes but does not yet compile
2013-02-20 09:26:30 +11:00
Joakim Erdfelt
a23f2451cd
Merge branch 'jetty-7' into jetty-8
2013-02-19 09:41:10 -07:00
Joakim Erdfelt
e210dfbcca
401211 - Remove requirement for jetty-websocket.jar in WEB-INF/lib
...
+ Adding appropriate configuration in WebAppContext to use
WebSocketServlet from server classloader. Similar to how
the WebSocket interface and WebSocketFactory are also
defined.
+ Marking jetty-websocket as provided in test webapp
2013-02-19 09:38:32 -07:00
Thomas Becker
60dfbffbce
Merge branch 'spdy_onPushSynApiChange'
2013-02-19 15:23:46 +01:00
Thomas Becker
88e32cb021
401183 Handle push streams in new method StreamFrameListener.onPush() instead of SessionFrameListener.syn()
2013-02-19 15:22:55 +01:00
Greg Wilkins
b82a781113
400864 Added LowResourcesMonitor
2013-02-18 20:03:36 +11:00
Joakim Erdfelt
6e5ab19c58
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Trying to noodle out the @WebSocketMessage validation with Decoders in
the mix
2013-02-15 14:33:15 -07:00
Joakim Erdfelt
7d1f774c0e
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Adding support for @WebSocketClient method scanning of
@WebSocketOpen
@WebSocketClose
@WebSocketError
2013-02-15 12:26:35 -07:00
Jesse McConnell
39c5d6c141
merge from jetty-8
2013-02-15 12:47:04 -06:00
Jesse McConnell
9c40cca59f
merge from jetty-7
2013-02-15 12:11:25 -06:00
Jesse McConnell
cf98276b32
[Bug 394064] ensure that JarFile instances are closed on JarFileResource.release()
2013-02-15 11:59:39 -06:00
Simone Bordet
94a344289b
400849 - Conversation hangs if non-first request fails when queued.
...
Taken the chance to revisit the lifecycle of HttpConversation and HttpExchange
(now they are created as soon as the request is sent, before they were created
when the exchange was associated to the connection).
This change made the conversation listeners available as soon as the request
was sent, so that it was simpler to notify the right listeners also in case of failure
of a non-first request (which fixes the bug).
2013-02-15 18:45:29 +01:00
Joakim Erdfelt
820e20f042
Fixing license headers
2013-02-15 10:03:14 -07:00
Greg Wilkins
28af8a1432
fixed merge
2013-02-15 16:12:39 +11:00
Greg Wilkins
71d70922da
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-02-15 15:00:22 +11:00
Greg Wilkins
68f3319719
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-15 12:14:48 +11:00
Greg Wilkins
2581eb130a
381521 allow compress methods to be configured
2013-02-15 12:12:12 +11:00
Greg Wilkins
c7d985fa02
400859 limit max size of writes from cached content
2013-02-15 11:20:29 +11:00
Greg Wilkins
d74a8c8281
398649 ServletContextListener.contextDestroyed() is not called on ContextHandler unregistration
2013-02-15 11:19:04 +11:00
Joakim Erdfelt
2faba0bf4b
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Start of @WebSocketClient class/method scanning with tests
2013-02-14 16:24:07 -07:00
Simone Bordet
651105c73b
400848 - Redirect fails with non-encoded location URIs.
2013-02-14 21:37:30 +01:00
Simone Bordet
df56bd3c27
400014 - Http async client DNS performance.
...
Introduced SocketAddressResolver to perform DNS resolution in a separate thread,
and updated HttpClient to make use of it.
2013-02-14 21:37:29 +01:00
Simone Bordet
dd96cc50b2
400734 - NPE for redirects with relative location.
...
Now resolving locations against original URL if it is relative.
2013-02-14 21:37:29 +01:00
Thomas Becker
12d9d77cd7
399463 add start.ini documentation for OPTIONS. Remove reference to start_config
2013-02-14 16:59:55 +01:00
Thomas Becker
330845b3ce
399463 add start.ini documentation for OPTIONS
2013-02-14 15:55:46 +01:00
Jan Bartel
246088c2ee
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/JettyOSGiBootContextAsService.java
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWebAppAsService.java
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java
2013-02-14 20:08:37 +11:00
Jan Bartel
b14db26464
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-14 17:27:51 +11:00
Jan Bartel
9c96892870
400457 Thread context classloader hierarchy not searched when finding webapp's java:comp/env
...
Reset classloaders after each test
2013-02-14 17:14:16 +11:00
Jan Bartel
ae76e07303
400457 Thread context classloader hierarchy not searched when finding webapp's java:comp/env
2013-02-14 15:58:24 +11:00
Joakim Erdfelt
e27ad8ef5c
Merge branch 'master' into javawebsocket-jsr
2013-02-13 16:10:07 -07:00
Joakim Erdfelt
f15d4c0376
400738 - ResourceHandler doesn't support range requests
...
+ Adding testcase to replicate issue.
2013-02-13 14:27:26 -07:00
Joakim Erdfelt
4fb1bc80da
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Refactoring EventDriver to be more pluggable (for jsr endpoints)
2013-02-13 13:37:26 -07:00
Joakim Erdfelt
529820d411
Merge branch 'master' into javawebsocket-jsr
2013-02-13 10:37:40 -07:00
Simone Bordet
6d0f233c80
362854 - Continuation implementations may deadlock.
...
HttpChannelState was already notifying listeners from outside synchronized blocks,
apart one case, in expired().
Also taken the chance to cleanup the class from warnings.
2013-02-13 16:00:40 +01:00
Simone Bordet
ef81982579
400631 - Calling flush() on HttpServletResponse.getOutputStream() after last byte of body causes EofException.
...
Now flush() is a no-operation if the stream is already closed, consistently with previous Jetty versions.
2013-02-13 12:03:31 +01:00
Simone Bordet
6649b890a7
400434 - Add support for an OutputStream ContentProvider.
2013-02-13 10:25:25 +01:00
Joakim Erdfelt
43231d8451
393473 - Add support for JSR-356 (javax.websocket) draft
...
+ Restarting branch, copying over work from November with new JSR-356
Draft 012 api in mind.
2013-02-12 16:19:35 -07:00
Joakim Erdfelt
9ae3c94b22
399520 - Websocket needs session idle timeouts
...
+ Integrated suggestions about AbstractConnection.onReadTimeout()
+ Enabled tests on client side
2013-02-12 13:51:06 -07:00