4595 Commits

Author SHA1 Message Date
Greg Wilkins
60a6340f8f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-07 08:36:23 +11:00
Greg Wilkins
1e0b9d4d97 402485 reseed secure random 2013-03-07 08:34:42 +11:00
Greg Wilkins
0c941a878d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-05 14:42:55 +11:00
Greg Wilkins
777817dd0f 399799 do not hold lock while calling invalidation listeners 2013-03-05 14:32:17 +11:00
Greg Wilkins
7abbc44474 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-05 10:40:45 +11:00
Greg Wilkins
cf54341ae6 399967 Shutdown hook calls destroy 2013-03-05 10:36:37 +11:00
Jan Bartel
095e66db33 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-02 10:17:35 +11:00
Jan Bartel
3ed3dfc7a1 402048 org.eclipse.jetty.server.ShutdownMonitor doesn't stop after the jetty server is stopped 2013-03-02 10:12:24 +11:00
Jan Bartel
bf154404fe 402048 org.eclipse.jetty.server.ShutdownMonitor thread doesn't stop after the jetty server is stopped 2013-03-01 19:58:44 +11:00
Jan Bartel
caa0199efe 400312 ServletContextListener.contextInitialized() is not called when added in ServletContainerInitializer.onStartup 2013-03-01 18:09:19 +11:00
Simone Bordet
a3400f0092 Fixed merge error. 2013-02-27 19:50:46 +01:00
Simone Bordet
f28bd1d010 Merged branch jetty-7. 2013-02-27 17:30:22 +01:00
Simone Bordet
90bab0eb66 401908 - Enhance DosFilter to allow dynamic configuration of attributes. 2013-02-27 16:23:17 +01:00
Jan Bartel
1627b6eaf7 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-02-26 12:41:54 +11:00
Jan Bartel
0e9f74ad29 401531 StringIndexOutOfBoundsException for "/*" <url-pattern> of <jsp-property-group> fix for multiple mappings to *.jsp 2013-02-26 12:38:07 +11:00
Joakim Erdfelt
283cd58147 Merge branch 'jetty-7' into jetty-8 2013-02-25 16:54:16 -07:00
Joakim Erdfelt
2ed0dc8fff Fixing websocket testcase 2013-02-25 16:53:32 -07:00
Jan Bartel
8f4b569076 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-02-26 10:44:58 +11:00
Jan Bartel
a65adcdd38 401531 StringIndexOutOfBoundsException for "/*" <url-pattern> of <jsp-property-group> 2013-02-25 17:45:22 +11:00
Jan Bartel
4cb0a964ef 401485 zip file closed exception 2013-02-22 18:25:40 +11:00
Joakim Erdfelt
95f166b374 Merge branch 'jetty-7' into jetty-8 2013-02-21 17:34:19 -07:00
Jan Bartel
6a48749f0c Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-02-22 11:32:57 +11:00
Joakim Erdfelt
c7dd114cb6 401317 - Make Safari 5.x websocket support minVersion level error more clear
+ Making error message about minVersion configurable more clear on both
   the Logging on the server side, and the HTTP/1.1 400 error response
   line
2013-02-21 17:23:17 -07:00
Joakim Erdfelt
3d179bc418 Making testcase JDK 1.5 compatible 2013-02-21 17:23:17 -07:00
Jan Bartel
ad6e4b37f0 401474 Performance problem in org.eclipse.jetty.annotation.AnnotationParser 2013-02-22 10:47:57 +11:00
Simone Bordet
ecfd7f74e6 376273 - Early EOF because of SSL Protocol Error on https://api-3t.paypal.com/nvp.
This was caused by the fact that the other peer closed the raw socket after sending data.
SslConnection was reading the data, but not notifying the application of the data, then
reading the abrupt close, which was causing an exception, ending up in the application
never being notified of the data that arrived.
Now we catch and ignore the exception during SSLEngine.closeInbound(), and we properly
send an alert to the other peer (instead of hard closing the connection as well).
In this way, the application has the chance to read the data and then close the connection.
2013-02-21 17:15:19 +01:00
Greg Wilkins
bed3ea04f8 401382 Prevent parseAvailable from parsing next chunk when previous has not been consumed. Handle no content-type in chunked request. 2013-02-21 14:57:36 +11:00
Greg Wilkins
27cad4960b 401382 Prevent parseAvailable from parsing next chunk when previous has not been consumed 2013-02-21 12:43:18 +11:00
Joakim Erdfelt
a23f2451cd Merge branch 'jetty-7' into jetty-8 2013-02-19 09:41:10 -07:00
Joakim Erdfelt
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
Jesse McConnell
9c40cca59f merge from jetty-7 2013-02-15 12:11:25 -06:00
Jesse McConnell
cf98276b32 [Bug 394064] ensure that JarFile instances are closed on JarFileResource.release() 2013-02-15 11:59:39 -06:00
Greg Wilkins
68f3319719 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-02-15 12:14:48 +11:00
Greg Wilkins
2581eb130a 381521 allow compress methods to be configured 2013-02-15 12:12:12 +11:00
Greg Wilkins
c7d985fa02 400859 limit max size of writes from cached content 2013-02-15 11:20:29 +11:00
Greg Wilkins
d74a8c8281 398649 ServletContextListener.contextDestroyed() is not called on ContextHandler unregistration 2013-02-15 11:19:04 +11:00
Jan Bartel
b14db26464 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-02-14 17:27:51 +11:00
Jan Bartel
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
Jan Bartel
ae76e07303 400457 Thread context classloader hierarchy not searched when finding webapp's java:comp/env 2013-02-14 15:58:24 +11:00
Joakim Erdfelt
a9f6f30242 Merge branch 'jetty-7' into jetty-8 2013-02-05 18:08:15 -07:00
Joakim Erdfelt
14e24c97aa 400040 - NullPointerException in HttpGenerator.prepareBuffers
+ Adding safety check on _header use
2013-02-05 18:07:23 -07:00
Joakim Erdfelt
65c2112964 Making Jsp tests work on JDK's less than 7 2013-02-05 18:00:58 -07:00
Jan Bartel
0569957e3a Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-02-01 22:23:04 +11:00
Jan Bartel
d7920f236f 398649 ServletContextListener.contextDestroyed() is not called on ContextHandler unregistration 2013-02-01 18:58:46 +11:00
Greg Wilkins
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
Greg Wilkins
1610329d3e 399703 made encoding error handling consistent 2013-02-01 15:31:55 +11:00
Jesse McConnell
64051768c5 Merge branch 'release-8' into jetty-8 2013-01-31 13:20:58 -06:00
Jesse McConnell
1101aec2d1 set for dev 2013-01-31 13:20:34 -06:00
Jesse McConnell
5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell
ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00