Joakim Erdfelt
36f0cf41ff
JSR-356 initial pass at PathParam based PathSpec
2013-04-09 16:13:54 -07:00
Joakim Erdfelt
540a41bdc5
Merge branch 'master' into javawebsocket-jsr
2013-04-09 11:28:46 -07:00
Joakim Erdfelt
e0d353629f
JSR-356 - updates to Session tracking and start of PathMappings
...
+ Refactored websocket-commons Session creation to be factory based
+ Introduced new org.eclipse.jetty.websocket.common.SessionFactory
+ Made websocket-client and websocket-server use new SessionFactory
+ Introduced JsrSessionFactory to allow for consistent Session creation
even in the Jsr (no more duplciate Session creation)
+ Using JsrSessionFactory in javax-websocket-client-impl
+ Introducing PathMappings to hopefully replace jetty-util's PathMap
+ Using standard ClientEndpointConfig when appropriate.
+ Introducing JettyClientEndpointConfig for annotation based
configurations
+ Renaming EchoSocket used in javax.websocket client testing to
JettyEchoSocket to better indicate that its the Jetty server side
implementation and not the javax.websocket client side socket.
+ Changed IncomingFrames.incomingError() parameter from
WebSocketException to Throwable to match behavior on the JSR
2013-04-09 11:21:59 -07:00
Simone Bordet
ff08b1c2e5
Setting the heap size to 1 GiB for tests.
2013-04-09 18:36:09 +02:00
Simone Bordet
45253bfb2a
Added benchmark for queues.
2013-04-09 12:13:53 +02:00
Simone Bordet
e004ce0017
Merged branch 'jetty-8' into 'master'.
2013-04-08 16:48:02 +02:00
Simone Bordet
e6fb9adeda
Merge branch 'jetty-7' into jetty-8
2013-04-08 16:42:58 +02:00
Simone Bordet
87b1003641
Removed module jetty-npn, it now lives in its own repository at http://git.eclipse.org/c/jetty/org.eclipse.jetty.npn.git .
2013-04-08 16:41:50 +02:00
Jan Bartel
0965ca62e2
404906 servlets with load-on-startup = 0 are not fired up on jetty 9 startup
2013-04-08 09:58:46 +10:00
Greg Wilkins
44ec0b3f49
403360 Named connectors
2013-04-08 09:25:54 +10:00
Simone Bordet
120b8c9839
405044 - Query parameters lost for non GET or POST.
2013-04-05 23:20:19 +02:00
Greg Wilkins
01c2322615
404325 data constraint redirection does send default port
2013-04-05 17:24:00 +11:00
Greg Wilkins
533cd57b53
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
2013-04-05 16:46:20 +11:00
Greg Wilkins
abcb4f163b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-05 16:35:37 +11:00
Greg Wilkins
cada28e8cf
404325 data constraint redirection does send default port
2013-04-05 16:32:51 +11:00
Greg Wilkins
39d690ed2a
404889 SelectorManager accepts attachments with sockets
2013-04-05 15:36:23 +11:00
Simone Bordet
c5931ad56f
404610 - Reintroduce ability to disallow TLS renegotiation.
...
After review with Greg, avoid to clear the encrypted buffer after detection of reconnection denied.
2013-04-05 01:26:51 +02:00
Greg Wilkins
4be4c954a5
Merge remote-tracking branch 'origin/jetty-8'
2013-04-05 09:59:03 +11:00
Greg Wilkins
6b3cb20720
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-05 09:58:33 +11:00
Greg Wilkins
b58066451e
404958 Fixed Resource.newSystemResource striped / handling
2013-04-05 09:58:05 +11:00
Greg Wilkins
36c41d6a5f
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
2013-04-05 09:52:06 +11:00
Greg Wilkins
c7b671d49d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-05 09:49:56 +11:00
Greg Wilkins
7d068ddb01
removed debug println - DOH!
2013-04-05 09:41:58 +11:00
Greg Wilkins
5d451e5fec
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-04-05 08:31:48 +11:00
Greg Wilkins
1191142c97
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
2013-04-05 08:31:31 +11:00
Joakim Erdfelt
4dea484853
Merge branch 'master' into javawebsocket-jsr
2013-04-04 12:03:30 -07:00
Joakim Erdfelt
d1692733f5
JSR-356: MessageHandler(s) layer
2013-04-04 12:03:11 -07:00
Simone Bordet
024936c2de
Temporarily ignoring this test that fails spuriously (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=404911 ).
2013-04-04 17:11:01 +02:00
Simone Bordet
72219d016b
404610 - Reintroduce ability to disallow TLS renegotiation.
2013-04-04 17:11:01 +02:00
Thomas Becker
fc31a16c23
404881 Allow regexs for SslContextFactory.setIncludeCipherSuites() and .setExcludeCipherSuites()
2013-04-04 15:08:15 +02:00
Greg Wilkins
e9185aa062
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-04-04 16:09:19 +11:00
Greg Wilkins
060389147b
404128 Add Vary headers rather than set them
2013-04-04 16:05:27 +11:00
Greg Wilkins
df6e18cc00
404517 Close connection if request received after half close
2013-04-04 15:38:15 +11:00
Greg Wilkins
3cd6d90e9f
removed verbose output
2013-04-04 15:38:15 +11:00
Jesse McConnell
6f80105d74
merge
2013-04-03 09:10:32 -05:00
Jesse McConnell
05b2d988b0
add travis ci linkage
2013-04-03 09:07:13 -05:00
Simone Bordet
2bd6a703f9
Merge branch 'jetty-8'
2013-04-03 11:26:11 +02:00
Simone Bordet
ce7629c663
Merge branch 'jetty-7' into jetty-8
2013-04-03 11:24:02 +02:00
Simone Bordet
5df26a6a57
404789 - Support IPv6 addresses in DoSFilter white list.
2013-04-03 11:21:33 +02:00
Simone Bordet
f7eb78d849
404757 - SPDY can only be built with the latest JDK version.
2013-04-02 22:27:55 +02:00
Jesse McConnell
91b3ee638d
empty
2013-04-02 11:33:09 -05:00
Jesse McConnell
24cd5aef80
testing out travis as ci
2013-04-02 11:23:50 -05:00
Simone Bordet
b312fffd7e
402666 - Improve handling of TLS exceptions due to raw socket close.
2013-03-29 16:57:05 +01:00
Simone Bordet
b921ed13c0
400689 - Add support for Proxy authentication.
2013-03-29 13:21:27 +01:00
Joakim Erdfelt
0232216e65
Merge branch 'master' into javawebsocket-jsr
2013-03-28 10:52:06 -07:00
Joakim Erdfelt
3a66b3ec3f
JSR-356 first working annotated @ClientEndpoint echo test
2013-03-28 10:51:45 -07:00
Jan Bartel
4951b1ccc4
404176 Jetty's AnnotationConfiguration class does not scan non-jar resources on the container classpath
2013-03-28 19:33:52 +11:00
Greg Wilkins
ea60965803
404323 Improved parameterization of https and SPDY
2013-03-28 17:09:29 +11:00
Greg Wilkins
5b3d866a27
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-03-28 16:03:34 +11:00
Greg Wilkins
7db1b36be9
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java
2013-03-28 15:04:42 +11:00