1409 Commits

Author SHA1 Message Date
Simone Bordet
72219d016b 404610 - Reintroduce ability to disallow TLS renegotiation. 2013-04-04 17:11:01 +02:00
Jan Bartel
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
Joakim Erdfelt
3a66b3ec3f JSR-356 first working annotated @ClientEndpoint echo test 2013-03-28 10:51:45 -07:00
Joakim Erdfelt
fc7526b739 [JSR-356] Refactoring annotated callables to handle any-order rule 2013-03-26 17:30:49 -07:00
Joakim Erdfelt
3c59f15a5c Some basic @ServerEndpoint scanning tests 2013-03-25 09:56:04 -07:00
Joakim Erdfelt
725887620c Some basic @ServerEndpoint scanning tests 2013-03-25 09:56:01 -07:00
Joakim Erdfelt
a498107c42 Parameter identification refactor + Decoder and PathParam integration 2013-03-22 13:18:02 -07:00
Joakim Erdfelt
0bab7b2c6d reverting dispatched session open 2013-03-22 13:18:02 -07:00
Joakim Erdfelt
bf335f496d 403817 - Use of WebSocket Session.close() results in invalid status code
+ Fixing WebSocketSession.close() to delgate NORMAL close properly
2013-03-22 13:18:02 -07:00
Joakim Erdfelt
54fd961354 403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout 2013-03-22 13:18:02 -07:00
Joakim Erdfelt
04d86bd49e 402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request 2013-03-22 13:18:02 -07:00
Joakim Erdfelt
bfb92dc18b reverting dispatched session open 2013-03-21 07:13:16 -07:00
Joakim Erdfelt
23ce4235d8 403817 - Use of WebSocket Session.close() results in invalid status code
+ Fixing WebSocketSession.close() to delgate NORMAL close properly
2013-03-20 09:28:07 -07:00
Joakim Erdfelt
dd4394aa77 403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout 2013-03-19 12:05:29 -07:00
Joakim Erdfelt
4d52c3ca8e 402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request 2013-03-19 11:28:23 -07:00
Joakim Erdfelt
96df602e9e Initial pass at fixing build for websocket PFD 2013-03-18 16:50:07 -07:00
Joakim Erdfelt
8ec9ac4d64 Merge branch 'master' into javawebsocket-jsr 2013-03-18 13:32:08 -07:00
Jan Bartel
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
Joakim Erdfelt
8a9f1f94e8 403373 - WebSocket change timeout log level from warn -> info 2013-03-14 10:00:02 -07:00
Joakim Erdfelt
fd8f2b9753 Merge from [master] -> [javawebsocket-jsr] 2013-03-11 10:57:08 -07:00
Joakim Erdfelt
897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Simone Bordet
f01e4f0b2c 402757 - WebSocket client module can't be used with WebSocket server module in the same WAR.
Introduced a shaded artifact that relocates the websocket-common classes, so they cannot
be shared with the server.
The shaded artifact has classifier "hybrid", and users will need to exclude the websocket-common
dependency manually when using the classified artifact.
2013-03-08 19:05:48 +01:00
Joakim Erdfelt
7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00
Joakim Erdfelt
96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00
Jesse McConnell
778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00
Jesse McConnell
d916078711 [maven-release-plugin] prepare release jetty-9.0.0.v20130306 2013-03-06 10:21:38 -06:00
Joakim Erdfelt
3be67fa5d1 402008 - Websocket blocking write hangs when remote client dies (or is killed) without going thru Close handshake
+ Fixing close and callback failure notificiations to address issues
   with suddenly killed clients.
2013-03-05 13:54:23 -07:00
Joakim Erdfelt
2d74857ffa 402008 - Strange behavior when clients are suddenly killed
+ Fixing close and callback failure notificiations to address issues
   with suddenly killed clients.
2013-03-05 13:11:50 -07:00
Joakim Erdfelt
79630de1f1 402148 - Update Javadoc for WebSocketServlet for new API 2013-03-01 09:31:29 -07:00
Joakim Erdfelt
9e78529a17 402154 - WebSocket / Session.setIdleTimeout(ms) should support in-place idle timeout changes
+ Made WebSocketSession delegate idle timeouts to LogicalConnection,
   that way the EndPoint or Mux can manage the idle timeout accordingly.
2013-03-01 09:24:03 -07:00
Simone Bordet
e6fed09129 402075 - Massive old gen growth when hit by lots of non persistent connections.
Replaced usages of TimerScheduler with ScheduledExecutorScheduler.
2013-03-01 15:19:51 +01:00
Joakim Erdfelt
c4af34d4e1 Adding smaller example of the WebSocketCreator use 2013-02-27 08:54:01 -07:00
Joakim Erdfelt
370bdafc15 Reverting direct ByteBuffer commits
+ Reverting commit : 5621f87c810cb8400c620e68d0ca5215d83f3d82
  + Reverting commit : bbcf0c77b8caee71e55eaef8b4edb2f7e565037b
2013-02-26 10:41:40 -07:00
Joakim Erdfelt
29b2118870 [maven-release-plugin] prepare for next development iteration 2013-02-26 09:20:45 -07:00
Joakim Erdfelt
2b82b54f6d [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-26 09:20:45 -07:00
Jan Bartel
42475b1564 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-02-26 12:50:30 +11:00
Joakim Erdfelt
283cd58147 Merge branch 'jetty-7' into jetty-8 2013-02-25 16:54:16 -07:00
Joakim Erdfelt
2ed0dc8fff Fixing websocket testcase 2013-02-25 16:53:32 -07:00
Joakim Erdfelt
7a2b775f03 Reducing log noise 2013-02-23 16:44:49 -07:00
Joakim Erdfelt
bbcf0c77b8 Switching to direct ByteBuffers 2013-02-23 16:44:49 -07:00
Joakim Erdfelt
5621f87c81 Switching to direct ByteBuffers 2013-02-23 16:44:49 -07: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
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
Joakim Erdfelt
95f166b374 Merge branch 'jetty-7' into jetty-8 2013-02-21 17:34:19 -07: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
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
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