Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,851 Commits 55 Branches 466 Tags
Commit Graph

198 Commits

Author SHA1 Message Date
Greg Wilkins
ee2d289f63 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-npn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
 2012-04-12 16:02:34 +10:00
Jan Bartel
942c8a19f5 373269 Make ServletHandler.notFound() method impl do nothing - override to send back 404. 2012-04-11 19:53:55 +10:00
Jan Bartel
62713fda2f 376324 <max-file-size> is not respected in <multipart-config> 2012-04-10 15:03:38 +10:00
Jan Bartel
45050ebac9 Merge remote-tracking branch 'origin/master' into jetty-8 2012-04-02 17:49:33 +10:00
Jan Bartel
28de69760a JETTY-1504 HttpServletResponseWrapper ignored when using asyncContext? 2012-04-02 12:35:12 +10:00
Jan Bartel
4b2d976f24 JETTY-1495 Ensure dynamic servlet addition does not cause servlets to be inited. 2012-03-16 15:48:02 +11:00
Simone Bordet
5624a5721e Merged from master. 2012-03-14 18:24:57 +01:00
Greg Wilkins
d3b2a3ee0c 373269: only setHandled(true) if a servlet matches 2012-03-12 12:24:52 +11:00
Jesse McConnell
381615f52d merge from master 2012-03-07 16:44:31 -06:00
Thomas Becker
99d2666b74 Add additional AsyncContextTest.java test case with encoded path and queryString 
Change-Id: I8b592030fa6548ece7ebe56da1dc6f27d8b6f1e9
 2012-03-06 11:36:29 +01:00
Thomas Becker
04c679dddb 372115: added some braces to oneline if stmts of AsyncContextTest.java 2012-03-01 15:15:10 +01:00
Thomas Becker
54262c4ba5 372115: codeformat of AsyncContextTest.java 2012-03-01 15:15:04 +01:00
Thomas Becker
3a94e45050 372115: Cleanup of AsyncContextTest.java 2012-03-01 15:14:56 +01:00
Jan Bartel
c7b42cdb06 Merge remote-tracking branch 'origin/master' into jetty-8 2012-02-29 20:07:33 +11:00
Greg Wilkins
763bd6b190 372115: set pathInContext for suspend with request 2012-02-28 13:25:45 +11:00
Greg Wilkins
7a58f3408e 371635: set all async attributes when the request is suspended 2012-02-27 16:32:50 +11:00
Jesse McConnell
aec2bb83e7 updates to #371635 and #371649 for jetty-8 and servlet 3 2012-02-21 11:39:08 -06:00
Jesse McConnell
eed2a2a0f7 Merge from master 2012-02-21 11:38:28 -06:00
Jesse McConnell
a90c3201e8 [Bug #371635] and [Bug #371649] add missing attributes (non-optimal) and resolve async flow issue with scoping 2012-02-21 10:34:11 -06:00
Jesse McConnell
2a50400bb1 progress on testing #371635 and #371649 2012-02-17 17:49:36 -06:00
Jesse McConnell
68737e7713 ignore it, again 2012-02-15 10:17:06 -06:00
Jesse McConnell
43a6b19590 expand the test a bit more 2012-02-15 09:51:57 -06:00
Jesse McConnell
794b6af64f oops, @Ignore test in progress 2012-02-15 07:27:39 -06:00
Jesse McConnell
3e2049ff1f add another test point in the flow 2012-02-15 06:50:10 -06:00
Jesse McConnell
f4d9d4cff3 Adding a new test illustrating a potential issue in AsyncContext usage 2012-02-14 19:35:55 -06:00
Jesse McConnell
1691441296 add another constructor for ServletHolder that was missing from merge, well that I mistakenly removed during the merge 2012-01-26 11:41:56 -06:00
Jesse McConnell
9c7b44d806 fix merge error from master by setting new method on ServletHolder to Source.EMBEDDED 2012-01-26 11:18:35 -06:00
Jesse McConnell
ab94c48735 merge from master 2012-01-26 10:44:21 -06:00
Greg Wilkins
6b0a97012c Added RegexTargetHandler 2012-01-26 23:14:39 +11:00
Jesse McConnell
90184ab3c3 Latest merge from master 2012-01-17 13:36:44 -06:00
Greg Wilkins
81c48518b6 368635 moved lifecycle state reporting from toString to dump 2012-01-16 15:37:32 +11:00
Greg Wilkins
c6693a73ad Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-12 23:35:24 +11:00
Greg Wilkins
564cf7329c 365302: made map of loggers concurrent and shared in abstract 2012-01-12 20:39:24 +11:00
Jan Bartel
47b7b6db70 368113 Support servlet mapping to "" 2012-01-12 10:33:25 +11:00
Jan Bartel
691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Jan Bartel
2d999a157b 368291 Change warning to info for NoSuchFieldException on BeanELResolver.properties 2012-01-11 11:02:36 +11:00
Jan Bartel
0dfc9feaf9 367383 jsp-config element must be returned for ServletContext.getJspConfigDescriptor 2011-12-22 19:30:01 +11:00
Jan Bartel
c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Jan Bartel
2c650a5fdd 366316 Superfluous printStackTrace on 404 2011-12-12 12:17:16 +11:00
Jan Bartel
0363b8100f Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-05 15:24:22 +11:00
Greg Wilkins
050afb8d57 365370 ServletHandler can fall through to nested handler 2011-12-02 11:09:11 +11:00
Greg Wilkins
de005c68fd Revert "Merge branch 'release-8'" 
This reverts commit 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
 2011-11-30 16:27:30 +11:00
Greg Wilkins
dcf7ef2335 fixes after merge 2011-11-29 10:15:20 +11:00
Greg Wilkins
55d5020980 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2011-11-29 09:06:25 +11:00
Greg Wilkins
b969de1788 organized imports 2011-11-28 15:32:14 +11:00
Jan Bartel
cbec18af60 364430 Support web.xml enabled state for servlets 2011-11-22 14:09:45 +11:00
Jan Bartel
127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Jan Bartel
fc497fe1e8 Merge remote-tracking branch 'origin/master' into jetty-8 2011-10-24 16:30:10 +11:00
Greg Wilkins
a642f7b55c Merge remote-tracking branch 'origin/master' into jetty-7.6 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
 2011-10-24 11:27:42 +11:00
Greg Wilkins
cd0628ab66 Added isDebugEnabled guards to debugging that generates garbage 2011-10-22 09:39:54 +11:00