Greg Wilkins
b3e1114313
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
2012-11-30 12:04:00 +11:00
Greg Wilkins
d269015c7d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-30 09:09:22 +11:00
Greg Wilkins
61a0d48df4
395394 allow logging from boot classloader
2012-11-30 08:33:56 +11:00
Jesse McConnell
12075f7196
[Bug 395168] fix unavailable attributes when return type has annotation
...
on super class
2012-11-29 15:01:48 -06:00
Greg Wilkins
cfa1c1e2e4
395394 allow logging from boot classloader
2012-11-30 07:56:38 +11:00
Jesse McConnell
61e5aba531
Merge branch 'jetty-7' into jetty-8
2012-11-29 11:31:27 -06:00
Jesse McConnell
a22f2a25eb
tweak tests and add some commenting
2012-11-29 11:30:02 -06:00
Joakim Erdfelt
62ebbbac3c
Making test more reliable on non-US machines
2012-11-29 10:23:20 -07:00
Jesse McConnell
51bb01e14b
decode the request uri and validate that
2012-11-29 11:23:16 -06:00
Joakim Erdfelt
916097f787
Validating that URIUtil.decodePath() can handle null characters
2012-11-29 10:20:41 -07:00
Jesse McConnell
a5081abc55
add license headers
2012-11-29 10:54:35 -06:00
Jesse McConnell
90b8f60e7b
[Bug 395380] add ValidUrlRule to jetty-rewrite
2012-11-29 10:53:50 -06:00
Thomas Becker
e1fb49d4d7
remove log.info in StandardSession.flush()
2012-11-29 14:22:01 +01:00
Thomas Becker
61fbc68be7
395312 log.warn if a SPDY stream gets committed twice
2012-11-29 13:37:02 +01:00
Thomas Becker
e33bc260b2
Even better, use a random port for SpringXmlConfigurationTest
2012-11-29 12:45:58 +01:00
Thomas Becker
bdce905216
Use a not so common port for SpringXmlConfigurationTest
2012-11-29 12:37:20 +01:00
Thomas Becker
1b5de5ae64
Readd unpack spdy jars in jetty-distribution
2012-11-29 12:01:06 +01:00
Thomas Becker
800ef53fef
Remove jetty-monitor execution target from jetty-distribution
2012-11-29 11:51:37 +01:00
Greg Wilkins
ad939bbdc4
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-11-29 17:57:19 +11:00
Greg Wilkins
4d823c28bf
jetty-9 added jetty-all for javadoc, reinstated static context for javadoc, made proxy to xref
2012-11-29 17:41:54 +11:00
Jan Bartel
5e7f394d44
395215 Multipart mime with just LF and no CRLF: add test for legacy filter
2012-11-29 17:31:10 +11:00
Jan Bartel
2d97e5b0ca
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2012-11-29 17:18:51 +11:00
Greg Wilkins
21f717078c
jetty-9 handle null push strategy
2012-11-29 17:03:40 +11:00
Greg Wilkins
9931ddec94
jetty-9 fixed test webapp TestServer and improved error message
2012-11-29 17:03:40 +11:00
Jan Bartel
2723c415bf
395215 Multipart mime with just LF and no CRLF
2012-11-29 16:48:21 +11:00
Jan Bartel
9f5801c3fd
395215 Multipart mime with just LF and no CRLF
2012-11-29 15:57:16 +11:00
Greg Wilkins
5ee2ea85bb
fixed path for new layout
2012-11-29 15:55:33 +11:00
Greg Wilkins
d78ec063ee
395220 New InputStream extension to allow a mix of EOL styles between headers and content
2012-11-29 13:40:25 +11:00
Greg Wilkins
16844eafc5
jetty-9 javadoc
2012-11-29 13:29:24 +11:00
Greg Wilkins
249068551f
395220 New InputStream extension to allow a mix of EOL styles between headers and content
2012-11-29 13:29:24 +11:00
Joakim Erdfelt
11cbe274af
395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x
2012-11-28 16:55:13 -07:00
Greg Wilkins
0805f131a8
jetty-9 added null constructor
2012-11-29 10:10:53 +11:00
Greg Wilkins
b06aefb6c1
jetty-9 removed old modules
2012-11-29 10:10:33 +11:00
Thomas Becker
33e951d44a
Merge branch 'SPDY_ff_fixes'
2012-11-28 17:44:22 +01:00
Thomas Becker
30091ccd89
395314 Add missing flush() call after StandardSession.complete() has been called. Some test cleanup.
2012-11-28 17:43:53 +01:00
Thomas Becker
68afcbba6c
395313 HttpTransportOverSPDY.send() does not rethrow exceptions, but call Callback.failed() only
2012-11-28 17:41:44 +01:00
Thomas Becker
0ec793bee5
395312 Avoid that streams get committed twice
2012-11-28 17:40:43 +01:00
Joakim Erdfelt
2d851212ba
Validating obtaining Local/Remote address from connection object
2012-11-27 15:23:55 -07:00
Joakim Erdfelt
d8b1444609
Changing to ClientUpgrade(Request|Response)
2012-11-27 15:00:22 -07:00
Joakim Erdfelt
acaeb7663a
Making sure websocket server tests validate Sec-WebSocket-Accept on response headers
2012-11-27 12:40:28 -07:00
Thomas Becker
0fd789216d
test-jetty-weappap - Remove wiki link and replace with documentation
2012-11-27 14:26:36 +01:00
Thomas Becker
6e70ee4211
394370 Add integration test for client resetting SPDY push SYN's
2012-11-26 15:25:47 +01:00
Greg Wilkins
7115ea5e12
jetty-9 added missing manifest (was ignored)
2012-11-26 20:48:56 +11:00
Greg Wilkins
3b935c9061
jetty-9 fixed assembly
2012-11-26 17:33:50 +11:00
Greg Wilkins
9a4e5f3301
jetty-9 Added proxy test webapp. Refined no servlet context handling
2012-11-26 16:57:37 +11:00
Jan Bartel
0eeef6ab4e
393770 Error in ContextHandler.setEventListeners(EventListener[])
2012-11-26 11:09:21 +11:00
Simone Bordet
6756cc7e75
Fixed compilation problem.
2012-11-23 14:13:07 +01:00
Simone Bordet
b7cdb29a14
Simplified connection establishment code.
2012-11-23 13:16:32 +01:00
Simone Bordet
ee893d8526
Corrected changes introduced with Promise.
...
Save creation of iterators for every append() and prepend() in StandardSession.
Removed PromisingCallback, only used by SPDY and better implemented otherwise.
2012-11-23 13:16:32 +01:00
Hugues Malphettes
e999c45bad
394294 Start web-bundles started before jetty
...
A web-bundle started before jetty-osgi should be deployed
as a webapp when jetty-osgi starts.
Thanks to Constantine Nosovsky for the patch.
2012-11-23 18:29:07 +08:00