a23798321f
Merge branch 'master' into javawebsocket-jsr
2013-06-05 20:10:14 -07:00
100e8cbaef
improved javadoc
2013-06-06 12:12:31 +10:00
cefe657ad4
409796 ignored failing test
2013-06-06 12:09:22 +10:00
bb8c58e315
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
...
ignore broken test
2013-06-06 11:25:46 +10:00
229c44b44f
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
...
backed out bad test
2013-06-06 10:43:49 +10:00
dc0a8a5d40
JSR-356, fixing build
2013-06-05 17:36:23 -07:00
12d414c9fc
Merge branch 'master' into javawebsocket-jsr
2013-06-05 17:16:02 -07:00
822b639829
Removing travis build
2013-06-05 14:57:23 -07:00
ffceb642c5
JSR-356 cleaning up MessageInputStream and MessageReader
2013-06-05 10:34:38 -07:00
b01e6432a5
Merge branch 'master' into javawebsocket-jsr
2013-06-05 10:20:50 -07:00
82b5acb0cf
409978 - Websocket shouldn't create HttpSession if not present
...
+ Preventing creation of HttpSession
+ Adding Local/Remote address information lookup in
ServletWebSocketRequest
2013-06-05 09:22:23 -07:00
b274fdb0d6
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
2013-06-05 15:31:24 +02:00
e65e4e168d
409842 - Suspended request completed by a request thread does not set read interest.
...
HttpConnection.completed() now performs the right check about the current connection.
2013-06-05 11:34:12 +02:00
3f3b9fda61
JSR-356 attempting to rethink the InputStream handling
2013-06-04 15:10:44 -07:00
a4d4d81580
Merge branch 'master' into javawebsocket-jsr
2013-06-04 13:23:15 -07:00
3db9299369
Merge branch 'jetty-7' into jetty-8
2013-06-04 11:24:44 -07:00
4b458792c9
JDK5 build fix with Resource caching and path lookups
2013-06-04 10:42:32 -07:00
559069cdd6
JDK5 fix for bad JarFile resource caching during deploy tests
2013-06-04 09:57:04 -07:00
0c4a266d60
Fixing JDK5 test error with comparison of query string
2013-06-04 09:04:12 -07:00
bacff75b31
Replace reponse.commit with response.closeOutput
2013-06-04 10:51:49 +10:00
6cbffcb332
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/nio/DirectNIOBuffer.java
2013-06-04 10:39:05 +10:00
f65fc71288
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-06-04 10:37:16 +10:00
26c1e5bdbc
407342 ReloadedSessionMissingClassTest uses class compiled with jdk7
2013-06-04 10:34:52 +10:00
3464f4c374
Merge branch 'master' into javawebsocket-jsr
2013-06-03 13:04:51 -07:00
0c8a3b3f52
Updating Jetty XML use in jetty-deploy tests.
2013-06-03 11:34:38 -07:00
670b6a964c
408945 XML Args ignored without DTD
...
+ Semi-reverting prior commit as it broke with DTD use
+ Fixing up logic to allow for <Arg> <Set> <Call> with and without DTD
+ Adding testcase that uses default constructor with <Set> calls to
setup a class
2013-06-03 11:34:38 -07:00
8b39cbe5bf
update proxy example
2013-06-03 12:44:19 -05:00
fc87693ba9
add proxy server example from proxy tests into the embedded examples
2013-06-03 12:21:27 -05:00
020dd1022c
Merge branch 'master' into javawebsocket-jsr
2013-06-03 09:06:38 -07:00
1bbab6d6f2
408945 XML Args ignored without DTD
2013-06-03 18:54:48 +10:00
7bb3a7be28
409556 Resource files not closed
...
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.
FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
368523de87
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-06-03 15:29:07 +10:00
10845bfd28
409556 FileInputStream not closed in DirectNIOBuffer
2013-06-03 15:13:28 +10:00
952f8442e5
408529 Etags set in 304 response
...
Improved default servlet setting of etags
2013-06-03 14:22:24 +10:00
d581dac287
409684 Ids and properties not set for execution of jetty xml config files with mvn plugin
2013-06-03 12:34:37 +10:00
a2732e3cf6
[Bug 401027] javadoc JMX annotations
2013-05-31 14:37:09 -05:00
8fda0504e6
Removing last remnants of Gzip pipelining tests resources
2013-05-31 10:58:33 -07:00
e64661ad72
Merge branch 'master' into javawebsocket-jsr
2013-05-31 10:57:20 -07:00
c708d9ce7c
Removing last remnants of Gzip pipelining tests resources
2013-05-31 10:57:05 -07:00
2d964313e8
Merge branch 'master' into javawebsocket-jsr
2013-05-31 10:54:16 -07:00
41ac4a0877
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-31 18:46:10 +10:00
8fd796a394
409012 added reference to example rewrite rules
2013-05-31 18:29:44 +10:00
0e11c82307
fixed merge
2013-05-31 18:07:01 +10:00
842309e656
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-05-31 18:06:34 +10:00
3849c893e1
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-31 11:07:40 +10:00
3094f93ed9
408642 setContentType from addHeader
2013-05-31 11:06:33 +10:00
219be496d9
408529 Etags set in 304 response
2013-05-31 10:59:34 +10:00
8cb383e065
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-31 10:12:34 +10:00
8a09c4c787
409545 Change HttpChannel contract
...
Ensure HttpParser always calls sequential callbacks by avoiding |=
2013-05-31 10:03:35 +10:00
b9014f29dc
fixed bad merge
2013-05-31 10:01:13 +10:00
Joakim Erdfelt
Greg Wilkins
Thomas Becker
Simone Bordet
Jan Bartel
Jesse McConnell