Commit Graph

6772 Commits

Author SHA1 Message Date
Greg Wilkins f9f2a2c405 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-19 13:56:34 +10:00
Greg Wilkins 22c3151ad6 added some more properties to the configuration 2013-04-18 17:05:03 +10:00
Jan Bartel 45bc7e6f5c Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-18 14:50:58 +10:00
Jan Bartel f23b15adaf Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/test/java/org/eclipse/jetty/client/SslBytesServerTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/JspPropertyGroupServlet.java
2013-04-18 14:43:05 +10:00
Jan Bartel 3812622365 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-18 14:37:38 +10:00
Jan Bartel 2e5a233cd3 405537 NPE in rendering JSP using SPDY and wrapped ServletRequest 2013-04-18 14:26:18 +10:00
Jan Bartel d34bd7aec7 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-18 12:16:24 +10:00
Jan Bartel 2dd2b78335 405925 Redeploy with jetty-maven-plugin fails 2013-04-18 11:19:03 +10:00
Jesse McConnell 21da9af8c0 Merge branch 'release-9' 2013-04-17 13:23:41 -05:00
Jesse McConnell c40761dd0b set dev 2013-04-17 13:23:21 -05:00
Jesse McConnell 7baaa14ba1 [maven-release-plugin] prepare for next development iteration 2013-04-17 11:46:39 -05:00
Jesse McConnell e390b54b25 [maven-release-plugin] prepare release jetty-9.0.2.v20140417 2013-04-17 11:46:31 -05:00
Jesse McConnell 5b50fa3855 Updating VERSION.txt top section 2013-04-17 10:57:25 -05:00
Joakim Erdfelt 119a1bb1cf Guarding ExtensionStack.toString() from NPE 2013-04-17 10:54:19 -05:00
Joakim Erdfelt 824675d072 Guarding ExtensionStack.toString() from NPE 2013-04-16 06:49:33 -07:00
Jesse McConnell 0b20467c6f [maven-release-plugin] prepare for next development iteration 2013-04-15 11:40:45 -05:00
Jesse McConnell 3aa4301711 [maven-release-plugin] prepare release jetty-9.0.2.v20140415 2013-04-15 11:40:37 -05:00
Jesse McConnell 90c44af0e1 Updating VERSION.txt top section 2013-04-15 11:09:27 -05:00
Jesse McConnell b2d44f8295 Merge branch 'master' into release-9 2013-04-15 11:08:34 -05:00
Greg Wilkins c912231d74 364921 - FIN WAIT sockets 2013-04-15 18:40:05 +10:00
Jan Bartel 6020321845 405535 Implement Request.isUserInRole(role) check security-role-refs defaulting to security-role if no matching ref 2013-04-15 18:23:32 +10:00
Jan Bartel 1092201341 405525 Throw IllegalArgumentException if filter or servlet name is null or empty string in ServletContext.addXXX() methods 2013-04-15 18:09:39 +10:00
Jan Bartel 7b2b5231ca 405531 Implement Part.getSubmittedFileName() 2013-04-15 17:59:19 +10:00
Jan Bartel db21b42b4f Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds). 2013-04-15 17:44:35 +10:00
Greg Wilkins 4b546de9c9 364921 - FIN WAIT sockets 2013-04-15 17:19:35 +10:00
Greg Wilkins 668290b77e made QoS test more travis CI friendly 2013-04-15 16:31:38 +10:00
Greg Wilkins a03a5c340b 405540 ServletContextListeners call in reverse in doStop 2013-04-15 14:31:41 +10:00
Greg Wilkins 4e3c7367af virtual host example 2013-04-15 12:29:08 +10:00
Greg Wilkins 2e5dd6b442 405679 example other server for documentation 2013-04-15 11:59:48 +10:00
Greg Wilkins 333f23bebd added magic empty line 2013-04-15 11:22:23 +10:00
Greg Wilkins 9a26992c8a 402885 reuse Deflaters in GzipFilter 2013-04-15 11:06:06 +10:00
Simone Bordet 70e6655ec5 364921 - FIN WAIT sockets.
Interim commit, as things are not working exactly right yet.
2013-04-12 23:17:24 +02:00
Thomas Becker e1fa106c19 Fix SslBytesServerTest failing on MacOS 2013-04-12 14:13:41 +02:00
Simone Bordet 9fd155d36e Marked the test with @Stress. 2013-04-12 14:07:58 +02:00
Simone Bordet de7adaf0d2 Reverted usages of ConcurrentArrayBlockingQueue until proven it's correctly implemented. 2013-04-12 13:58:31 +02:00
Simone Bordet f57a4a45a6 405551 - InputStreamResponseListener.await returns null when request fails.
Moved the success/failure logic to onComplete(), to be notified even if only the request fails.
2013-04-12 13:50:45 +02:00
Greg Wilkins 9885449bdf 364921 improved close of SSL to avoid FINWAITs 2013-04-12 20:37:13 +10:00
Thomas Becker 7ed3a343ad 405449 spdy improve handling of duplicate stream Ids 2013-04-11 12:28:33 +02:00
Jan Bartel 07b844bf85 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-04-11 15:55:04 +10:00
Jan Bartel 8a0ba267c1 Rename some jetty-osgi classes, add comments, organize imports. 2013-04-11 15:14:08 +10:00
Jan Bartel 6783975707 Prune unused code; add more comments; rename classes. 2013-04-11 15:14:08 +10:00
Greg Wilkins 9bb0260410 improved shutdown handling for travis CI 2013-04-11 12:01:01 +10:00
Greg Wilkins a0ec3b6834 removed commented out line 2013-04-11 12:00:41 +10:00
Greg Wilkins 4c04f5dd40 403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-04-11 11:46:07 +10:00
Greg Wilkins c7c3e4455f 404511 fixed poor methods in ArrayTernaryTrie 2013-04-11 11:46:07 +10:00
Jan Bartel 76df005c64 405119 Tidy up comments and code formatting for osgi 2013-04-11 10:23:20 +10:00
Greg Wilkins e8d9625dcc adjust tests to make them more travis CI compatible 2013-04-11 08:33:28 +10:00
Jan Bartel 5637db66e8 405352 Servlet init-param always overridden by WebServlet annotation 2013-04-11 06:36:44 +10:00
Greg Wilkins e4e514d10a post 9.0.1 2013-04-11 06:24:45 +10:00
Greg Wilkins 5728077faf Merge remote-tracking branch 'origin/release-9' 2013-04-11 06:24:01 +10:00