Commit Graph

6806 Commits

Author SHA1 Message Date
Thomas Becker 7ed3a343ad 405449 spdy improve handling of duplicate stream Ids 2013-04-11 12:28:33 +02:00
Jan Bartel 8a0ba267c1 Rename some jetty-osgi classes, add comments, organize imports. 2013-04-11 15:14:08 +10:00
Jan Bartel 6783975707 Prune unused code; add more comments; rename classes. 2013-04-11 15:14:08 +10:00
Greg Wilkins 9bb0260410 improved shutdown handling for travis CI 2013-04-11 12:01:01 +10:00
Greg Wilkins a0ec3b6834 removed commented out line 2013-04-11 12:00:41 +10:00
Greg Wilkins 4c04f5dd40 403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-04-11 11:46:07 +10:00
Greg Wilkins c7c3e4455f 404511 fixed poor methods in ArrayTernaryTrie 2013-04-11 11:46:07 +10:00
Jan Bartel 76df005c64 405119 Tidy up comments and code formatting for osgi 2013-04-11 10:23:20 +10:00
Joakim Erdfelt dc5480aafe JSR-356: adding more PathParamSpec tests and fixes 2013-04-10 16:51:47 -07:00
Greg Wilkins e8d9625dcc adjust tests to make them more travis CI compatible 2013-04-11 08:33:28 +10:00
Jan Bartel 5637db66e8 405352 Servlet init-param always overridden by WebServlet annotation 2013-04-11 06:36:44 +10:00
Greg Wilkins e4e514d10a post 9.0.1 2013-04-11 06:24:45 +10:00
Greg Wilkins 5728077faf Merge remote-tracking branch 'origin/release-9' 2013-04-11 06:24:01 +10:00
Thomas Becker 6a6660bfc6 405364 spdy imeplement MAX_CONCURRENT_STREAMS 2013-04-10 16:49:45 +02:00
Joakim Erdfelt 36f0cf41ff JSR-356 initial pass at PathParam based PathSpec 2013-04-09 16:13:54 -07:00
Simone Bordet aa4e79efe2 Ignoring queue benchmark tests as they take too long to run. 2013-04-09 23:05:34 +02: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
Greg Wilkins b8dd8bde14 [maven-release-plugin] prepare for next development iteration 2013-04-08 12:31:34 +10:00
Greg Wilkins bf3771904b [maven-release-plugin] prepare release jetty-9.0.1.v20130408 2013-04-08 12:30:59 +10:00
Greg Wilkins 1395675f21 Updating VERSION.txt top section 2013-04-08 11:23:41 +10:00
Greg Wilkins 4cb8aa3546 Merge branch 'master' into release-9 2013-04-08 11:21:39 +10: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
Greg Wilkins 4e8406f62d Updating VERSION.txt top section 2013-04-08 08:20:58 +10:00
Greg Wilkins 574ec5831a Merge branch 'master' into release-9 2013-04-08 08:18:02 +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