Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,460 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

7460 Commits

Author SHA1 Message Date
Jan Bartel cdd95bb551 Merge remote-tracking branch 'origin/jetty-8' 2013-09-09 12:42:56 +10:00
Jan Bartel 11085742c8 416787 StringIndexOutOfBounds with a pathMap of "" 2013-09-09 12:41:28 +10:00
Thomas Becker 1f765bf9ae Merge branch 'XmlConfiguration' 2013-09-06 12:24:05 +02:00
Thomas Becker 77889089a9 415401 Add initalizeDefaults call to SpringConfigurationProcessor 2013-09-06 12:23:42 +02:00
Jan Bartel 27b977f57d 416679 Change warning to debug if no transaction manager present 2013-09-06 15:32:38 +10:00
Greg Wilkins 9e90e1267f fixed bad merge 2013-09-06 09:47:36 +10:00
Greg Wilkins ee52769dea 416663 Content-length set by resourcehandler 2013-09-06 09:19:05 +10:00
Greg Wilkins fefab2af96 Merge branch 'jetty-7' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-7 2013-09-06 07:04:44 +10:00
Thomas Becker 178c38cc35 415401 Add XmlConfiguration.initializeDefaults that allows to set default values for any XmlConfiguration that may be overridden in the config file 2013-09-05 18:40:59 +02:00
Thomas Becker 28f3c1ac01 Merge commit '9e0e173de813c3dd825becb9c3f67739f25e936b' into jetty-8 2013-09-05 17:34:39 +02:00
Thomas Becker 9e0e173de8 415401 Add XmlConfiguration.initializeDefaults that allows to set default values for any XmlConfiguration that may be overridden in the config file 2013-09-05 17:30:59 +02:00
Jan Bartel b8a4bf37e6 416597 Allow classes and jars on the webappcontext extraclasspath to be scanned for annotations 2013-09-05 18:24:12 +10:00
Jan Bartel edaa23b21e 416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars 2013-09-05 13:03:45 +10:00
Jan Bartel 2ab4757450 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-05 12:55:19 +10:00
Jan Bartel e764a0f2e7 416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars 2013-09-05 12:47:39 +10:00
Greg Wilkins 236f5d57bf 414431 Avoid debug NPE race 2013-09-05 12:24:28 +10:00
Greg Wilkins ce098c67de 416477 Improved consumeAll error handling 2013-09-05 12:09:22 +10:00
Greg Wilkins 9b9c7ba8d1 416568 Simplified servlet exception logging 2013-09-05 11:04:11 +10:00
Simone Bordet 78c322af8e 416314 - jetty async client wrong behaviour for HEAD Method + Redirect. 
Fixed redirect behavior based on
http://greenbytes.de/tech/tc/httpredirects/.
 2013-09-03 10:34:30 +02:00
Greg Wilkins eec9d405e5 416321 handle failure during blocked committing write 2013-09-02 14:56:22 +10:00
Greg Wilkins 07ae3615ed 416321 handle failure during blocked committing write 2013-09-02 14:44:23 +10:00
Greg Wilkins 317a3f27df 416321 improved test harnesses 2013-09-02 12:24:51 +10:00
Thomas Becker d51268977b fix merge issue 2013-08-30 18:00:47 +02:00
Thomas Becker d22fa0dae1 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:22:11 +02:00
Thomas Becker 85c0f47337 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:22:05 +02:00
Thomas Becker 669ee75720 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:21:59 +02:00
Thomas Becker 566065dd34 cleanup import in HttpConnection 2013-08-30 17:21:53 +02:00
Thomas Becker 8ba45188db merge ProxyHTTPSPDYConnection change with 9.1 2013-08-30 17:19:47 +02:00
Thomas Becker 8e4bae0ccf 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:16:22 +02:00
Thomas Becker b370da6783 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE 2013-08-30 17:16:14 +02:00
Greg Wilkins 4358302ce0 416102 - Clean up of async sendContent process 2013-08-30 14:45:21 +10:00
Greg Wilkins 79fb4287bb Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-08-30 14:37:55 +10:00
Greg Wilkins 47c679dabb 416102 - Clean up of async sendContent process 2013-08-30 14:37:43 +10:00
Thomas Becker e8130f4201 415605 fix status code logging for async requests 2013-08-29 13:25:04 +02:00
Greg Wilkins 9bf83d427b 416103 Added AllowSymLinkAliasChecker.java 2013-08-29 16:44:38 +10:00
Greg Wilkins 2b7462e9a9 416103 Added AllowSymLinkAliasChecker.java 2013-08-29 16:17:15 +10:00
Jan Bartel 35d379a335 416096 DefaultServlet leaves open file descriptors with file sizes greater than response buffer 2013-08-29 12:16:38 +10:00
Jesse McConnell ef166c23e6 Merge branch 'release-9' 2013-08-23 18:58:01 -05:00
Greg Wilkins b3c9adac56 fixed header 2013-08-23 20:09:00 +10:00
Greg Wilkins fb82dad812 413684 deprecated unsafe alias checkers 
Added extra test harness
 2013-08-23 19:55:19 +10:00
Greg Wilkins c3691b60b0 Merge remote-tracking branch 'origin/jetty-8' 2013-08-23 17:17:57 +10:00
Greg Wilkins d2ff475834 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
	tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
 2013-08-23 17:17:34 +10:00
Greg Wilkins 2a178a29fd 413684 deprecated unsafe alias checkers 
removed debugs
 2013-08-23 17:11:57 +10:00
Greg Wilkins b33b5f2f5d 413684 deprecated unsafe alias checkers 2013-08-23 16:49:42 +10:00
Greg Wilkins c4583918a3 415330 Avoid multiple callbacks at EOF 2013-08-22 21:31:29 +10:00
Greg Wilkins 16191da3ac reduced test times 2013-08-22 21:31:29 +10:00
Jan Bartel 1ad9d6cff6 411934 War overlay configuration assumes src/main/webapp exists 2013-08-22 20:03:46 +10:00
David Harrigan e351f04002 bug 415302 
Patch to protect against null input's.

-=david=-

Signed-off-by: David Harrigan <dharrigan@gmail.com>
 2013-08-22 07:47:10 +10:00
Simone Bordet 8951c4c773 Added tests for AsyncContext listeners behaviour. 2013-08-21 22:18:56 +02:00
Jesse McConnell fd5d789ff5 [Bug 411069] better set compiler defaults to 1.7, including webdefault.xml for jsp 2013-08-20 13:34:33 -05:00