Joakim Erdfelt
a619abdfe7
Bumping up findbugs plugin to 2.5.2
2013-02-23 16:44:49 -07:00
Greg Wilkins
6d850146fb
jetty-9 fixed error from doco change
2013-02-24 09:27:05 +11:00
Greg Wilkins
0671514e34
jetty-9 fixed error from doco change
2013-02-24 09:15:40 +11:00
Joakim Erdfelt
dbf3662f90
Refinement of factorymethod approach in WebSocketClient (for cometd to use)
2013-02-22 10:49:49 -07:00
Joakim Erdfelt
12814b02ed
Making WebSocketClient connection stuff pluggable via factory methods
2013-02-22 10:43:47 -07:00
Jesse McConnell
d1cac944b8
Merge branch 'release-9'
2013-02-22 09:08:04 -06:00
Jesse McConnell
a2fc2247c6
set for dev
2013-02-22 09:07:41 -06:00
Jesse McConnell
a6c48312f6
[maven-release-plugin] prepare for next development iteration
2013-02-22 07:53:11 -06:00
Jesse McConnell
484162de79
[maven-release-plugin] prepare release jetty-9.0.0.RC1
2013-02-22 07:52:48 -06:00
Jesse McConnell
86b5d80628
Updating VERSION.txt top section
2013-02-22 07:12:03 -06:00
Jesse McConnell
c503742047
Merge branch 'master' into release-9
2013-02-22 07:08:58 -06:00
Jan Bartel
e95301b906
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/SafariD00.java
2013-02-22 18:37:29 +11:00
Jan Bartel
4cb0a964ef
401485 zip file closed exception
2013-02-22 18:25:40 +11:00
Greg Wilkins
9234f3ec90
refined jetty embedded examples
2013-02-22 18:14:41 +11:00
Greg Wilkins
616713fc5f
refined jetty embedded examples
2013-02-22 16:57:57 +11:00
Greg Wilkins
999db7f4d8
refined jetty embedded examples
2013-02-22 16:19:06 +11:00
Greg Wilkins
c302a404cd
refined jetty embedded examples
2013-02-22 15:51:17 +11:00
Jan Bartel
b2b888d18a
Use etc/jetty-plus.xml from start.ini by preference for test-jndi-webapp
2013-02-22 15:22:40 +11:00
Jan Bartel
1153e0455c
Use etc/jetty-plus.xml and etc/jetty-annotations.xml in start.ini for test-spec webapp
2013-02-22 13:00:07 +11:00
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