Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,011 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

3011 Commits

Author SHA1 Message Date
Joakim Erdfelt 6b54650046 365932 - Produce jetty-websocket aggregate jar for android use 
+ Adding maven-shade-plugin default configuration (no bytecode
  manipulation) to produce an aggregate classifier jar for
  jetty-websocket use.
 2011-12-07 10:17:20 -07:00
Simone Bordet 0689e05e9b 365750 - Support WebSocket over SSL, aka wss:// 
This is now implemented, using the new architecture of wrapping the connection with
SslConnection.
The only refactoring was to avoid that the HTTP handshake was sent from the
HandshakeConnection constructor, because at that point the SSL wiring is not ready yet.
Now the handshake is sent from handle(), guarded by a boolean variable to sent it once.
 2011-12-06 16:25:15 +01:00
Jan Bartel ba95a9ba3a Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-05 08:43:21 +11:00
Jesse McConnell 4c6112d7a9 Merge branch 'release' 2011-12-04 15:33:35 -06:00
Jesse McConnell 8ef68e1e0e Updating VERSION.txt top section 2011-12-04 15:33:07 -06:00
Jan Bartel 15ab626410 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-05 08:31:49 +11:00
Jesse McConnell 41c746abee [maven-release-plugin] prepare for next development iteration 2011-12-04 14:18:52 -06:00
Jesse McConnell 0c90133252 [maven-release-plugin] prepare release jetty-7.6.0.RC1 2011-12-04 14:18:45 -06:00
Jesse McConnell 56cd2df556 Updating VERSION.txt top section 2011-12-04 12:11:35 -06:00
Jesse McConnell 0b83f2c82d Merge branch 'master' into release 2011-12-04 12:10:59 -06:00
Jan Bartel c6480fc659 365375 ResourceHandler should be a HandlerWrapper 2011-12-02 15:32:33 +11:00
Greg Wilkins 050afb8d57 365370 ServletHandler can fall through to nested handler 2011-12-02 11:09:11 +11:00
Jan Bartel 468e6c284d 365267 NullPointerException in bad Address 2011-12-02 10:04:03 +11:00
Greg Wilkins 7e9fbc7493 handle no jetty-dir css 2011-12-02 09:43:15 +11:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'" 
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
 2011-11-30 16:27:30 +11:00
Greg Wilkins 9e72457941 Merge branch 'release-8' 2011-11-30 15:51:12 +11:00
Greg Wilkins 24ccaec3da Updating VERSION.txt top section 2011-11-30 15:50:25 +11:00
Greg Wilkins 631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins 9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Greg Wilkins 46c10b2b8a Updating VERSION.txt top section 2011-11-30 12:46:36 +11:00
Greg Wilkins dc92728c00 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	VERSION.txt
 2011-11-30 12:21:02 +11:00
Greg Wilkins df12605f0e Merge branch 'release' 2011-11-30 07:30:02 +11:00
Greg Wilkins 0b066d3d8e Updating VERSION.txt top section 2011-11-30 07:29:32 +11:00
Greg Wilkins 11e06e55b1 [maven-release-plugin] prepare for next development iteration 2011-11-29 23:56:11 +11:00
Greg Wilkins fcf5f3beb2 [maven-release-plugin] prepare release jetty-7.6.0.RC0 2011-11-29 23:55:58 +11:00
Greg Wilkins a47e07445a Upating VERSION.txt top section 2011-11-29 13:08:26 +11:00
Greg Wilkins 05784d5081 Merge branch 'master' into release 2011-11-29 13:06:38 +11:00
Greg Wilkins f3b2289527 release version 2011-11-29 13:06:05 +11:00
Greg Wilkins a420df6bf1 Merge branch 'master' into release 2011-11-29 13:03:23 +11:00
Greg Wilkins c4b19d8262 safer test 2011-11-29 10:15:36 +11:00
Greg Wilkins dcf7ef2335 fixes after merge 2011-11-29 10:15:20 +11:00
Greg Wilkins 55d5020980 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2011-11-29 09:06:25 +11:00
Greg Wilkins 4ce72ee549 improved test timing 2011-11-29 08:36:56 +11:00
Greg Wilkins b969de1788 organized imports 2011-11-28 15:32:14 +11:00
Greg Wilkins 3b2d3e5754 websocket not supported on blocking connectors 2011-11-28 15:31:07 +11:00
Greg Wilkins 9fb6e9b43a 363943 ignore null attribute values 2011-11-28 14:08:09 +11:00
Greg Wilkins c229a55ad9 362742 improved UTF8 exception reason 2011-11-28 14:00:35 +11:00
Greg Wilkins 11a79f7dee check nonce count 2011-11-28 12:06:43 +11:00
Greg Wilkins 06b66f31f5 test NIO assumptions 2011-11-28 11:54:08 +11:00
Greg Wilkins ddce35a2e6 364638 SCEP does idle timestamp checking. New setCheckForIdle method controls onIdleExpired callback. 
364921 a second onIdleExpired callback will result in close rather than a shutdown output.
 2011-11-28 11:51:01 +11:00
Greg Wilkins a9223fe208 ready for next release 2011-11-28 08:48:34 +11:00
Simone Bordet cfef7c631b Made SslBytesClientTest more robust by avoiding a race in establishing connection with the proxy. 2011-11-24 23:08:57 +01:00
Simone Bordet ccfbb3e623 Bumped number of parses to avoid test failures. 2011-11-24 22:34:30 +01:00
Simone Bordet b3ae06888e First pass at implementing SSL bytes tests for the client. 2011-11-24 21:15:11 +01:00
Simone Bordet 8e913fe7c0 Fixed bug in AsyncEndPoint.hasProgressed() handling: the progressing status 
must be remembered until a call to hasProgressed() is made.
Additional code cleanups.
 2011-11-24 20:58:59 +01:00
Simone Bordet c6103f2d53 Removed usages of ThreadDeath. 2011-11-24 20:39:04 +01:00
Simone Bordet 59c111bde1 Rewritten toString() methods using String.format(). 2011-11-24 15:20:06 +01:00
Simone Bordet 0b85184722 Added dump() code in case the test hangs, to understand why (still not clear). 2011-11-24 10:19:23 +01:00
Simone Bordet 7c0445f425 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-11-24 10:16:49 +01:00
Simone Bordet 8f1fff78c0 Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format(). 2011-11-24 10:16:19 +01:00