27cad4960b
401382 Prevent parseAvailable from parsing next chunk when previous has not been consumed
2013-02-21 12:43:18 +11:00
a23f2451cd
Merge branch 'jetty-7' into jetty-8
2013-02-19 09:41:10 -07:00
e210dfbcca
401211 - Remove requirement for jetty-websocket.jar in WEB-INF/lib
...
+ Adding appropriate configuration in WebAppContext to use
WebSocketServlet from server classloader. Similar to how
the WebSocket interface and WebSocketFactory are also
defined.
+ Marking jetty-websocket as provided in test webapp
2013-02-19 09:38:32 -07:00
9c40cca59f
merge from jetty-7
2013-02-15 12:11:25 -06:00
cf98276b32
[Bug 394064] ensure that JarFile instances are closed on JarFileResource.release()
2013-02-15 11:59:39 -06:00
68f3319719
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-15 12:14:48 +11:00
2581eb130a
381521 allow compress methods to be configured
2013-02-15 12:12:12 +11:00
c7d985fa02
400859 limit max size of writes from cached content
2013-02-15 11:20:29 +11:00
d74a8c8281
398649 ServletContextListener.contextDestroyed() is not called on ContextHandler unregistration
2013-02-15 11:19:04 +11:00
b14db26464
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-14 17:27:51 +11:00
9c96892870
400457 Thread context classloader hierarchy not searched when finding webapp's java:comp/env
...
Reset classloaders after each test
2013-02-14 17:14:16 +11:00
ae76e07303
400457 Thread context classloader hierarchy not searched when finding webapp's java:comp/env
2013-02-14 15:58:24 +11:00
a9f6f30242
Merge branch 'jetty-7' into jetty-8
2013-02-05 18:08:15 -07:00
14e24c97aa
400040 - NullPointerException in HttpGenerator.prepareBuffers
...
+ Adding safety check on _header use
2013-02-05 18:07:23 -07:00
65c2112964
Making Jsp tests work on JDK's less than 7
2013-02-05 18:00:58 -07:00
0569957e3a
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-02-01 22:23:04 +11:00
d7920f236f
398649 ServletContextListener.contextDestroyed() is not called on ContextHandler unregistration
2013-02-01 18:58:46 +11:00
e8de7bd905
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-02-01 18:22:04 +11:00
1610329d3e
399703 made encoding error handling consistent
2013-02-01 15:31:55 +11:00
64051768c5
Merge branch 'release-8' into jetty-8
2013-01-31 13:20:58 -06:00
1101aec2d1
set for dev
2013-01-31 13:20:34 -06:00
5c58878c3c
[maven-release-plugin] prepare for next development iteration
2013-01-31 11:34:38 -06:00
ebbe37294f
[maven-release-plugin] prepare release jetty-8.1.9.v20130131
2013-01-31 11:34:30 -06:00
0a1fbc7ea0
set for release
2013-01-31 11:08:08 -06:00
ac145f0296
Merge branch 'jetty-8' into release-8
2013-01-31 11:07:03 -06:00
b679565178
Merge branch 'release-7' into jetty-7
2013-01-31 10:41:20 -06:00
81d3c76780
prep for dev
2013-01-31 10:41:05 -06:00
a5e1e04af1
[maven-release-plugin] prepare for next development iteration
2013-01-31 08:42:20 -06:00
b7fb18fd65
[maven-release-plugin] prepare release jetty-7.6.9.v20130131
2013-01-31 08:42:12 -06:00
ade2e15318
Set for release
2013-01-31 08:03:42 -06:00
2e2c07dad9
Set for release
2013-01-31 08:02:54 -06:00
50f5fe6716
Merge branch 'jetty-7' into release-7
2013-01-31 08:01:58 -06:00
f0c6b9bc82
Merge branch 'jetty-7' into jetty-8
2013-01-29 15:51:56 -06:00
c87cc4d4f0
resolve compilation issues with statistics servlet post patch application
2013-01-29 15:48:33 -06:00
dd4a80288b
[Bug 391249] fix for invalid XML node dispatchedTimeMean in statistics servlet
...
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2013-01-29 15:43:02 -06:00
840f147019
[Bug 391248] fixing localhost checking in statistics servlet
...
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2013-01-29 15:41:39 -06:00
1910fb8ce4
[Bug 391345] fix missing br tag in statistics servlet
2013-01-29 14:55:22 -06:00
ddce31a323
[Bug 396574] add JETTY_HOME as a location for pid to be found
2013-01-29 14:48:25 -06:00
01f7bc1e12
Merge branch 'jetty-7' into jetty-8
2013-01-29 14:08:25 -06:00
b9b7e76b7c
[Bug 396574] add /Users/jesse/installs/jetty as a location for pid to be found
2013-01-29 14:07:27 -06:00
3b6cab63e2
Merge branch 'jetty-7' into jetty-8
2013-01-29 13:42:29 -06:00
35ebe6cea3
[Bug 394541] remove continuation jar from distro, add as dep to test-jetty-webapp
2013-01-29 13:34:45 -06:00
988206c36a
393968 fix typo in javadoc
2013-01-28 16:11:33 +01:00
9b383c5780
381521 Only set Vary header when content could be compressed
2013-01-26 11:03:46 +11:00
f16fc7e7b7
Merge branch 'jetty-7' into jetty-8
2013-01-25 16:53:18 -06:00
1a31067369
Add note about getCanonicalFile check and fix IdleSession test in test hash sessions
2013-01-25 16:25:59 -06:00
b3043276bc
add corresponding correct file removal check
2013-01-25 16:12:08 -06:00
4bed164462
Merge branch 'jetty-7' into jetty-8
2013-01-25 15:31:13 -06:00
111bd19634
doh, header
2013-01-25 15:30:59 -06:00
d8a3b76862
Merge branch 'jetty-7' into jetty-8
2013-01-25 15:24:41 -06:00
Greg Wilkins
Joakim Erdfelt
Jesse McConnell
Jan Bartel
KARASZI István
Thomas Becker