Commit Graph

6067 Commits

Author SHA1 Message Date
Jesse McConnell 67d50419f9 Merge branch 'release-9' 2012-11-19 19:05:22 -06:00
Jesse McConnell aa1dcdbc6d set for dev 2012-11-19 19:05:00 -06:00
Jesse McConnell fdc9428c6f [maven-release-plugin] prepare for next development iteration 2012-11-19 18:06:01 -06:00
Jesse McConnell d89b6f9b88 [maven-release-plugin] prepare release jetty-9.0.0.M3 2012-11-19 18:05:54 -06:00
Jesse McConnell e6b25b82ea set release version.txt 2012-11-19 17:43:55 -06:00
Jesse McConnell 36a5b50b65 Merge branch 'master' into release-9 2012-11-19 17:42:54 -06:00
Greg Wilkins 3131c67a2f jetty-9 updated start.ini to latest NPN 2012-11-20 10:19:43 +11:00
Greg Wilkins 99fbca11f2 jetty-9 turn on client OPTION for test-webapp 2012-11-20 10:04:57 +11:00
Greg Wilkins 2ad9dd5b95 jetty-9 corrected groupId after move 2012-11-20 09:53:56 +11:00
Simone Bordet e9705abf21 Updated spdy configuration. 2012-11-19 23:29:16 +01:00
Thomas Becker 4ee88c3bc0 jetty-spdy-proxy.xml fixes, still not working 2012-11-19 23:29:16 +01:00
Jesse McConnell a0c1d85094 Revert "jetty-9 cleaned up serverClasses to minimum"
This reverts commit 67b5caadbb.
2012-11-19 10:33:54 -06:00
Jesse McConnell ebd807b904 Revert "jetty-9 moved the jetty demos to webapps-demos controlled by start.d/demos.ini"
This reverts commit 4bd36e3d38.
2012-11-19 10:33:45 -06:00
Thomas Becker a99a3ae254 newline after license header 2012-11-19 16:28:24 +01:00
Thomas Becker 3edae8a52d 394370 Add unit tests for HttpTransportOverSPDY.send() 2012-11-19 15:27:20 +01:00
Jan Bartel 3642de3b8a 392237 - Port test-integration to jetty-9 2012-11-19 18:48:03 +11:00
Greg Wilkins 4bd36e3d38 jetty-9 moved the jetty demos to webapps-demos controlled by start.d/demos.ini 2012-11-19 18:35:32 +11:00
Greg Wilkins 67b5caadbb jetty-9 cleaned up serverClasses to minimum 2012-11-19 17:42:52 +11:00
Jan Bartel be816d853b 392237 Port tests/login-service to jetty-9 2012-11-19 16:31:53 +11:00
Greg Wilkins 82117bc833 jetty-9 fixed hostHeader handling in ProxyServlet and re-enabled in test webapp 2012-11-19 16:22:27 +11:00
Greg Wilkins f21b74dcb1 jetty-9 relocated test webapp 2012-11-19 15:57:38 +11:00
Greg Wilkins 97d2130a8f jetty-9 no debugging checked in 2012-11-19 15:08:53 +11:00
Jan Bartel 2a5a8e0998 JETTY-846 Support maven-war-plugin configuration for jetty-maven-plugin; fix NPE 2012-11-19 13:52:34 +11:00
Jan Bartel 0912731b89 Add test-mock-resources to plugin dependencies for test-jndi-webapp 2012-11-19 13:29:29 +11:00
Jan Bartel a9288a0eae 394541 Add continuation jar and websocket jars to test-jetty-webapp 2012-11-19 12:21:31 +11:00
Jan Bartel b000fa4f34 394545 Add jetty-jaas dependency to jetty-maven-plugin 2012-11-19 12:21:01 +11:00
Jan Bartel fe773d22e1 JETTY-846 Support maven-war-plugin overlay configuration with jetty:run 2012-11-19 12:06:26 +11:00
Jesse McConnell ccd35efd2c set packagename 2012-11-16 16:11:25 -06:00
Jesse McConnell 5e61d136d7 make user:group on install, adjust the packaging some 2012-11-16 16:08:45 -06:00
Thomas Becker b76669434f Add messages to StreamExceptions thrown in StandardSession and StandardStream 2012-11-16 12:50:32 +01:00
Thomas Becker 6bc8bab92d 394383 - add logging of the SSLEngine 2012-11-16 11:43:24 +01:00
Greg Wilkins 139de22bc0 394370 correctly handle last content and responses with no content 2012-11-16 12:42:52 +11:00
Greg Wilkins 62e033fcd0 394370 392237 reverted Improved handling of SPDY async send. Added simple NPE protection to further investigate problem 2012-11-16 10:55:10 +11:00
Greg Wilkins b5c6555a4a 392237 Improved handling of SPDY async send 2012-11-16 10:45:08 +11:00
Jesse McConnell 7317dde852 fix for maven build 2012-11-15 13:42:59 -06:00
Jesse McConnell 7975b25ae8 [Bug 394232] add jetty-ant into jetty9 2012-11-15 13:39:06 -06:00
Simone Bordet 73ecfd6755 394383 - NPNServerConnection not upgraded causes spin.
Following a discussion on spdy-dev, we close the connection
if the NextProtocol message is missing.
2012-11-15 17:15:49 +01:00
Simone Bordet eda558aaa8 Added guard in case of null next protocol. 2012-11-15 15:29:03 +01:00
Simone Bordet a736ebc062 394383 - NPNServerConnection not upgraded causes spin.
We now guard the case where fill() returns, the TLS handshake is completed,
but we have no next protocol.
If that happens, we force the default protocol.
2012-11-15 14:22:13 +01:00
Greg Wilkins 4ff9bdc54d jetty-9 alternative websocket discovery 2012-11-15 21:23:43 +11:00
Greg Wilkins 49de22ea48 jetty-9 improved javadoc 2012-11-15 17:31:43 +11:00
Jan Bartel 6aa01d4517 394357 Make JarResource constructors protected 2012-11-15 17:20:55 +11:00
Simone Bordet 2079938120 Improved Usage class to show usages. 2012-11-14 12:52:11 +01:00
Simone Bordet e4cbb94ed6 Changed the read logic.
Before, if the stream had no content, InputStreamContentProvider's iterator
hasNext() was returning true, and next() was returning an empty buffer,
because the read was performed in next() and it was not possible to know
before reading whether the stream had content or was already at EOF.

Now the reads are performed in hasNext(), so that it is possible to return
immediately whether the stream is at EOF or not.
This solves a problem with ProxyServlet, where GET requests with no
content indication were proxied to the upstream server as GET requests
with chunked content, which in most cases were not understood by servers.
2012-11-14 12:12:29 +01:00
Simone Bordet 6ef0f415f0 Centralized defaulting of the port, from -1 to 80 or 443 depending on the scheme. 2012-11-14 12:12:29 +01:00
Simone Bordet 10c90a60f9 Mangling the logger name for better configurability. 2012-11-14 12:12:29 +01:00
Joakim Erdfelt deed4e3db1 Fixing license header 2012-11-13 14:56:10 -07:00
Greg Wilkins 443a5d12f8 improved javadoc 2012-11-14 08:42:23 +11:00
Joakim Erdfelt 6f0d9e546c Merge from 'master' to 'ws-refactor' 2012-11-13 13:52:54 -07:00
Joakim Erdfelt 8d9f05a263 Attempting to get Mux sub-channel to flow thru server as well 2012-11-13 13:05:19 -07:00