Jan Bartel
cbb446f1d4
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-02-22 12:47:39 +11:00
Jan Bartel
59ada108b2
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-client/src/test/java/org/eclipse/jetty/client/ExternalSiteTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslBytesServerTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
test-jetty-webapp/pom.xml
2013-02-22 12:47:02 +11:00
Greg Wilkins
3b92286692
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-02-22 12:16:33 +11:00
Jesse McConnell
f056502aa6
Merge branch 'release-9'
2013-02-21 19:13:39 -06:00
Greg Wilkins
0664cee41d
add example from documentation
2013-02-22 12:13:25 +11:00
Joakim Erdfelt
95f166b374
Merge branch 'jetty-7' into jetty-8
2013-02-21 17:34:19 -07:00
Jan Bartel
6a48749f0c
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-02-22 11:32:57 +11:00
Joakim Erdfelt
c7dd114cb6
401317 - Make Safari 5.x websocket support minVersion level error more clear
...
+ Making error message about minVersion configurable more clear on both
the Logging on the server side, and the HTTP/1.1 400 error response
line
2013-02-21 17:23:17 -07:00
Joakim Erdfelt
3d179bc418
Making testcase JDK 1.5 compatible
2013-02-21 17:23:17 -07:00
Jan Bartel
ad6e4b37f0
401474 Performance problem in org.eclipse.jetty.annotation.AnnotationParser
2013-02-22 10:47:57 +11:00
Jesse McConnell
48e9e9c36c
[maven-release-plugin] prepare for next development iteration
2013-02-21 17:44:16 -06:00
Jesse McConnell
ca072f9c82
[maven-release-plugin] prepare release jetty-9.0.0.RC1
2013-02-21 17:43:59 -06:00
Jesse McConnell
885893f1a9
Updating VERSION.txt top section
2013-02-21 16:50:35 -06:00
Jesse McConnell
7b1739bda6
Merge branch 'master' into release-9
2013-02-21 16:47:24 -06:00
Joakim Erdfelt
61470cde2e
401427 - WebSocket messages sent from onConnect fail to be read by jetty websocket-client
...
+ Adding carryover of bytes remaining from UpgradeConnection to
AbstractWebSocketConnection.parser
2013-02-21 15:32:37 -07:00
Jesse McConnell
85a9371c2e
[maven-release-plugin] prepare for next development iteration
2013-02-21 14:37:06 -06:00
Jesse McConnell
2b5abf7ed2
[maven-release-plugin] prepare release jetty-9.0.0.RC1
2013-02-21 14:36:57 -06:00
Jesse McConnell
4d54f772c8
Updating VERSION.txt top section
2013-02-21 14:14:11 -06:00
Jesse McConnell
4dfff10389
Merge branch 'master' into release-9
2013-02-21 14:12:45 -06:00
Simone Bordet
8418acdae4
401414 - Hostname verification fails.
...
Now using host name instead of host address to create SSLEngines.
2013-02-21 21:08:59 +01:00
Jesse McConnell
95eefd5381
[maven-release-plugin] prepare for next development iteration
2013-02-21 11:10:53 -06:00
Jesse McConnell
399828d833
[maven-release-plugin] prepare release jetty-9.0.0.RC1
2013-02-21 11:10:35 -06:00
Simone Bordet
ecfd7f74e6
376273 - Early EOF because of SSL Protocol Error on https://api-3t.paypal.com/nvp .
...
This was caused by the fact that the other peer closed the raw socket after sending data.
SslConnection was reading the data, but not notifying the application of the data, then
reading the abrupt close, which was causing an exception, ending up in the application
never being notified of the data that arrived.
Now we catch and ignore the exception during SSLEngine.closeInbound(), and we properly
send an alert to the other peer (instead of hard closing the connection as well).
In this way, the application has the chance to read the data and then close the connection.
2013-02-21 17:15:19 +01:00
Jesse McConnell
2bcc21350c
Updating VERSION.txt top section
2013-02-21 10:02:04 -06:00
Jesse McConnell
cd3c840553
Merge branch 'master' into release-9
2013-02-21 10:01:11 -06:00
Joakim Erdfelt
660f6d2e85
399520 - Websocket Server Connection needs session idle timeouts
2013-02-21 08:21:01 -07:00
Joakim Erdfelt
246db2b08d
401177 - Make org.eclipse.jetty.websocket.api.WebSocketAdapter threadsafe
...
+ Making some subtle changes to address thread safety of the WebSocketAdapter
2013-02-21 07:30:28 -07:00
Jan Bartel
ea0996f63a
Removing dead and unused modules
2013-02-21 22:41:11 +11:00
Jan Bartel
07e878bda1
Removing accidental add of copy of old test-jetty-osgi
2013-02-21 22:24:18 +11:00
Jan Bartel
8dd2272bd1
Merge remote-tracking branch 'origin/master' into osgi_fix_jetty9
2013-02-21 21:44:20 +11:00
Jan Bartel
1ce132b6d3
Merge remote-tracking branch 'origin/master' into osgi_fix_jetty9
2013-02-21 21:39:07 +11:00
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
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
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
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
Greg Wilkins
28af8a1432
fixed merge
2013-02-15 16:12:39 +11:00
