Commit Graph

11313 Commits

Author SHA1 Message Date
Joakim Erdfelt 9ca235beca Revert "474618 - AsyncListener.onComplete not called when error occurs"
This reverts commit 60f409e4ff.
2015-08-10 09:38:40 -07:00
Joakim Erdfelt 60f409e4ff 474618 - AsyncListener.onComplete not called when error occurs 2015-08-10 07:56:14 -07:00
Joakim Erdfelt b522dd7fe2 474617 - AsyncListener.onError not called for errors
+ Making onError call correctly
2015-08-10 07:53:56 -07:00
Joakim Erdfelt 25b692046f Merge branch 'jetty-9.2.x' 2015-08-07 09:40:11 -07:00
Joakim Erdfelt 55862e229e 471055 - Restore legacy/experimental WebSocket extensions (deflate-frame) 2015-08-07 09:39:12 -07:00
Joakim Erdfelt a71c543a7e Revert "Removing old websocket extensions x-webkit-deflate-frame and deflate-frame"
This reverts commit ec9504aab8.
2015-08-07 07:37:06 -07:00
Joakim Erdfelt 1b33ded784 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-cdi/cdi-servlet/src/test/java/org/eclipse/jetty/cdi/servlet/LocaleTimeFormatter.java
2015-08-06 15:56:53 -07:00
Joakim Erdfelt 5c0906ed6c 474454 - Backport permessage-deflate from Jetty 9.3.x to 9.2.x
+ post cherry-pick merge cleanup
2015-08-06 15:55:24 -07:00
Joakim Erdfelt c424b58153 474453 - Tiny buffers (under 7 bytes) fail to compress in permessage-deflate
+ Ensure compress() is sanely using Deflater.deflate()
+ Ensure output buffer in .deflate() is always a minimum
  of 256 bytes
2015-08-06 15:16:32 -07:00
Joakim Erdfelt ffcedde60a 474068 - Update WebSocket Extension for permessage-deflate draft-22
+ Copying inflated byte buffers
+ Simplifying Accumulator of buffer/chunks
+ Removing references to frame compression extensions
2015-08-06 15:16:32 -07:00
Joakim Erdfelt aac9568a30 Work on permessage-deflate continues
Conflicts:
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/FrameCompressionExtensionTest.java
2015-08-06 15:16:30 -07:00
Joakim Erdfelt 39f9f3ad44 Removing old websocket extensions x-webkit-deflate-frame and deflate-frame
Conflicts:
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
2015-08-06 15:16:11 -07:00
Joakim Erdfelt 2a1e0659d1 474453 - Tiny buffers (under 7 bytes) fail to compress in permessage-deflate
+ Ensure compress() is sanely using Deflater.deflate()
+ Ensure output buffer in .deflate() is always a minimum
  of 256 bytes
2015-08-06 15:10:55 -07:00
Joakim Erdfelt 47d81db015 474455 - Enable permessage-deflate WebSocket extension 2015-08-06 15:10:55 -07:00
Simone Bordet 5324d367c5 Merged branch 'jetty-9.2.x' into 'master'. 2015-08-06 17:33:30 +02:00
Simone Bordet 020cbe1172 Removed redundant logging statement. 2015-08-06 17:31:23 +02:00
Joakim Erdfelt d02a5c3c8b 474361 - Handle JVM version extensions like -internal
+ Refreshed Version.java to handle parsing alternate syntaxes
+ Introduced Version.toShortString() for the non-suffixed versions
+ Using updated Version obj in StartArgs.setProperty("java.version")
  to allow both normal System property access and arbitrary property
  setting on command line to work in a consistent fashion.
2015-08-05 17:08:40 -07:00
Jan Bartel 7fd7c914e5 474344 apache-jstl includes test dependencies 2015-08-06 08:44:15 +10:00
Simone Bordet 542ef22ba8 Merged branch 'jetty-9.2.x' into 'master'. 2015-08-05 17:50:25 +02:00
Simone Bordet e0039a95e8 474321 - Allow synchronous address resolution.
Refactored SocketAddressResolver into interface and one sync and one
async implementations. Added getter/setter methods to HttpClient.
2015-08-05 16:51:16 +02:00
Simone Bordet 7149eace17 474319 - Reintroduce blocking connect(). 2015-08-05 14:39:27 +02:00
Greg Wilkins 98f8852b51 more robust testharness for graceful stop 2015-08-05 15:44:46 +10:00
Greg Wilkins 1cf0e0e500 removed duplicate 2015-08-05 15:26:08 +10:00
Greg Wilkins 4939854893 473321 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType 2015-08-05 14:58:08 +10:00
Greg Wilkins a0a2c64f6a 474025 - SslContextFactory does not work with JCEKS Keystore 2015-08-05 12:03:38 +10:00
Joakim Erdfelt b3718bbfd8 Updating VERSION.txt for SNAPSHOT 2015-08-03 12:51:41 -07:00
Joakim Erdfelt f95b41fa7c Updating VERSION.txt description 2015-08-03 10:44:55 -07:00
Joakim Erdfelt 9e4fdb10bf Updating VERSION.txt for SNAPSHOT 2015-08-03 10:36:14 -07:00
Joakim Erdfelt 3c99c9c9b9 Merge branch 'release-9.3.2' 2015-08-03 10:27:52 -07:00
Joakim Erdfelt bf81ac9d50 474068 - Update WebSocket Extension for permessage-deflate draft-22
+ Copying inflated byte buffers
+ Simplifying Accumulator of buffer/chunks
+ Removing references to frame compression extensions
2015-07-31 14:05:50 -07:00
Simone Bordet 2a4095590d 473955 - NPE in PushCacheFilter.
Fixed by normalizing to "/" the missing path of a referrer URI.
2015-07-30 19:48:38 +02:00
Simone Bordet 0753d1ce3c Enabling PushCacheFilter only for HTTP/2. 2015-07-30 19:47:51 +02:00
Joakim Erdfelt a3684f7fb8 [maven-release-plugin] prepare for next development iteration 2015-07-30 09:47:57 -07:00
Joakim Erdfelt 798fc8118b [maven-release-plugin] prepare release jetty-9.2.13.v20150730 2015-07-30 09:47:48 -07:00
Joakim Erdfelt b4cbf0dfca Updating VERSION.txt top section 2015-07-30 09:13:35 -07:00
Joakim Erdfelt 4b3879845d [maven-release-plugin] prepare for next development iteration 2015-07-30 07:02:10 -07:00
Joakim Erdfelt 6b7e9ac4b0 [maven-release-plugin] prepare release jetty-9.3.2.v20150730 2015-07-30 07:02:02 -07:00
Joakim Erdfelt e36af707e2 9.3.2, not 9.3.3 2015-07-30 06:33:03 -07:00
Joakim Erdfelt 4a7a577d75 Updating VERSION.txt top section 2015-07-30 06:31:39 -07:00
Simone Bordet 5abc1388f7 Merged branch 'jetty-9.2.x' into 'master'. 2015-07-30 15:14:21 +02:00
Simone Bordet f54a85dac2 Removed settings.xml and updated README.md. 2015-07-30 12:55:14 +02:00
Greg Wilkins 5aa5a4e525 fixed accidental NPE on Context logger 2015-07-30 18:50:04 +10:00
Greg Wilkins 370abc9df1 473832 SslConnection flips back buffers on handshake exception 2015-07-30 12:09:11 +10:00
Greg Wilkins a568ee6f17 473832 SslConnection flips back buffers on handshake exception 2015-07-30 11:52:31 +10:00
Greg Wilkins 4a727a7f08 472974 Improved StatisticsHandler 503 generation 2015-07-30 11:24:30 +10:00
Jan Bartel 3909f45893 Ensure auth protected page in test-jaas webapp is not cached by browser 2015-07-29 14:42:16 +10:00
Joakim Erdfelt 675e71645b Squelching debugging 2015-07-28 08:27:38 -07:00
Joakim Erdfelt aec63955eb Using parent classloader as expected value 2015-07-28 08:26:59 -07:00
Simone Bordet 67f155bcf9 Merged branch 'jetty-9.2.x' into 'master'. 2015-07-28 16:48:54 +02:00
Simone Bordet 837d1a74bb 473624 - ProxyServlet.Transparent / TransparentDelegate add trailing slash before query when using prefix. 2015-07-28 16:39:49 +02:00