Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,607 Commits 18 Branches 0 Tags
5528c8a93bc85a185dda8310b6b1f535c7a5a280
Commit Graph

416 Commits

Author SHA1 Message Date
Juergen Hoeller
e9d24d5336 Polishing 
(cherry picked from commit 86b8112)
 2014-12-29 18:59:17 +01:00
Juergen Hoeller
37713ae9dd HandlerExecutionChain prevents re-adding the interceptors array to the list (and declares varargs now) 
Issue: SPR-12566
(cherry picked from commit 6b3023c)
 2014-12-29 18:58:41 +01:00
Juergen Hoeller
90ae073854 Relaxed final declarations and protected doInvoke methods 
Issue: SPR-12484
(cherry picked from commit 2496d68)
 2014-12-07 22:13:03 +01:00
Brian Clozel
1214624265 Fix location checks for servlet 3 resources 
SPR-12354 applied new checks to make sure that served static resources
are under authorized locations.

Prior to this change, serving static resources from Servlet 3 locations
such as "/webjars/" would not work since those locations can be within
one of the JARs on path. In that case, the checkLocation method would
return false and disallow serving that static resource.

This change fixes this issue by making sure to call the
`ServletContextResource.getPath()` method for servlet context resources.

Note that there's a known workaround for this issue, which is using a
classpath scheme as location, such as:
"classpath:/META-INF/resources/webjars/" instead of "/webjars".

Issue: SPR-12432
(cherry picked from commit 161d3e3)
 2014-11-24 17:41:11 +01:00
Juergen Hoeller
5f58cd3b79 Polishing 
(cherry picked from commit 2675ce7)
 2014-11-22 22:47:24 +01:00
Juergen Hoeller
f093a5f749 RequestMappingHandlerAdapter allows for overriding handleInternal 
Issue: SPR-12460
(cherry picked from commit ece2c90)
 2014-11-22 22:45:19 +01:00
Juergen Hoeller
1f45dd297d Unit test for JavaBeans introspection against FreeMarker Configuration class 
Issue: SPR-12448
(cherry picked from commit 282aded)
 2014-11-22 22:45:12 +01:00
Rossen Stoyanchev
9beae9ae42 Apply extra checks to static resource handling 
- remove leading '/' and control chars
- improve url and relative path checks
- account for URL encoding
- add isResourceUnderLocation final verification

Issue: SPR-12354
 2014-11-11 06:31:57 +01:00
Juergen Hoeller
acefd8381d Polishing 2014-11-02 11:38:35 +01:00
Juergen Hoeller
c8b8dc5f97 TilesConfigurer defensively expects null from getResources in case of no resources found 
Also includes order preservation for resource results with Tiles 2 as well as retrieval failure logging with Tiles 3.

Issue: SPR-12362
(cherry picked from commit cb86036)
 2014-11-01 12:55:53 +01:00
Juergen Hoeller
aa82da8507 Set ResponseStatusExceptionResolver.messageSource in the MVC Java config 
Issue: SPR-12380
(cherry picked from commit 17b9bde)
 2014-11-01 12:55:03 +01:00
Juergen Hoeller
15c8987cc4 Polishing 2014-10-22 01:10:01 +02:00
Juergen Hoeller
b91cab1fde Polishing 2014-09-26 22:18:15 +02:00
Juergen Hoeller
7d55715213 Polishing 2014-09-17 13:53:12 +02:00
Juergen Hoeller
f8b729aa5f Polishing 2014-09-17 01:51:23 +02:00
Juergen Hoeller
249c688e9b DispatcherServlet's checkMultipart detects wrapped MultipartRequest as well 
Issue: SPR-12114
(cherry picked from commit 786fd92)
 2014-08-22 23:18:39 +02:00
Juergen Hoeller
e324c2ab4a Polishing 2014-08-22 00:14:10 +02:00
Juergen Hoeller
25971d9927 Consistent attribute documentation/formatting in spring-context and spring-mvc schemas 
(cherry picked from commit b5763fe)
 2014-08-22 00:04:12 +02:00
Juergen Hoeller
42c090efa4 Polishing 
Issue: SPR-12079
(cherry picked from commit 92bd240)
 2014-08-13 15:28:36 +02:00
Juergen Hoeller
035a9b91d2 BeanNameViewResolver ignores non-View beans 
Issue: SPR-12079
(cherry picked from commit 626a5fe)
 2014-08-13 15:28:09 +02:00
Juergen Hoeller
4129f00a02 Polishing 
(cherry picked from commit 4db258b)
 2014-08-11 22:35:26 +02:00
Juergen Hoeller
e2d71a8ccd Polishing 2014-08-11 15:45:54 +02:00
Juergen Hoeller
c08ded769a Polishing (includes varargs for selected String array setters) 2014-08-09 00:19:56 +02:00
Rossen Stoyanchev
fbf24a927d Update Javadoc (cherry-picked from 162734) 
Issue: SPR-12028
 2014-07-29 18:07:36 -04:00
Juergen Hoeller
f2eea9d911 Polishing 
(cherry picked from commit 8f484d3)
 2014-07-29 11:50:50 +02:00
Juergen Hoeller
cac0683dab Rearranged statement whitespace in Velocity macros 
(cherry picked from commit 7bc9660)
 2014-07-29 11:47:12 +02:00
Juergen Hoeller
6e95b2613e Polishing 2014-07-24 18:35:49 +02:00
Juergen Hoeller
5f77dce1ee SelectedValueComparator defensively handles null values in exhaustiveCompare 
Issue: SPR-12001
(cherry picked from commit 980f971)
 2014-07-24 17:46:04 +02:00
Juergen Hoeller
ede2150544 Polishing 2014-07-02 17:32:43 +02:00
Juergen Hoeller
7396210d40 Package javadoc cleanup for web.servlet.mvc, removing outdated references 
Issue: SPR-11935
(cherry picked from commit ba522e5)
 2014-07-01 18:12:42 +02:00
Juergen Hoeller
48f753f368 Polishing (backported from master) 2014-07-01 12:12:42 +02:00
Juergen Hoeller
0bf0901b8f SelectTag consistently checks specified 'multiple' attribute now, never falling back to forceMultiple in case of user-provided value 
Issue: SPR-11903
(cherry picked from commit 779ca99)
 2014-07-01 11:57:15 +02:00
Juergen Hoeller
ba6d187b5c Consistent MvcUriComponentsBuilder assertion handling 
(cherry picked from commit 61b47ba)
 2014-05-20 01:51:33 +02:00
Juergen Hoeller
545c28fd4e Minor UriComponentsBuilder javadoc revision 2014-05-20 00:47:03 +02:00
Juergen Hoeller
1e7fade89e JasperReports-related polishing 
(cherry picked from commit 782d10c)
 2014-05-12 20:50:24 +02:00
Sebastien Deleuze
80cb0c4e5b Include more guidance about DispatcherServlet context 
Also update <mvc:annotation-driven /> comment in XSD.

Issue: SPR-11703
 2014-04-28 22:10:52 -04:00
Juergen Hoeller
4dbc0c296c Polishing 
(cherry picked from commit ec7d80b)
 2014-04-24 10:31:39 +02:00
Juergen Hoeller
d3c9a31e9a DispatcherServlet skips multipart resolution if error page exception attribute indicates MultipartException as root cause 
Issue: SPR-11716
(cherry picked from commit 5b47816)
 2014-04-24 10:30:12 +02:00
Juergen Hoeller
38cd79047a SelectTag correctly detects multiple="true" again 
Issue: SPR-11678
(cherry picked from commit 8d8766d)
 2014-04-09 18:59:37 +02:00
Juergen Hoeller
f014bbb5cf Revised ByteArrayOutputStream handling in MarshallingView and co 
Issue: SPR-11646
(cherry picked from commit 8006696)
 2014-04-02 21:29:37 +02:00
Juergen Hoeller
d1030b798d ResourceHttpRequestHandler explicitly closes a Resource's InputStream 
Issue: SPR-11644
(cherry picked from commit 3a96f16)
 2014-04-02 21:29:05 +02:00
Juergen Hoeller
d628025f13 Polishing 
Issue: SPR-11262
 2014-04-02 21:28:42 +02:00
Rossen Stoyanchev
e92bbc8014 Revert "Improve suffix pattern check" 
This reverts commit 3474afb165.

Unfortunately this change is likely to cause issues for applications
that use regular expressions in a URI variable. I think we will have
to leave at: if there are any dots in the last segment of the
request path, regardless of whether they're in a URI var or not,
the suffix pattern match is off.

Issue: SPR-11532
 2014-03-26 11:37:11 -04:00
Juergen Hoeller
074590730b Polishing 2014-03-25 00:54:02 +01:00
Juergen Hoeller
465ca24ab2 DispatcherServlet logs request URI in encoded form only 
Issue: SPR-11591
 2014-03-24 23:26:05 +01:00
Juergen Hoeller
dd7f54c3c0 Revised ResizableByteArrayOutputStream as an actual subclass of ByteArrayOutputStream, and consistently applied appropriate ByteArrayOutputStream initial capacities across the codebase 
Issue: SPR-11594
 2014-03-24 22:57:38 +01:00
Juergen Hoeller
c10eeb414c Polishing 2014-03-24 14:37:08 +01:00
Juergen Hoeller
7399723165 Introduced getFlashMapsMutex template method and optimized SessionFlashMapManager's locking 
SessionFlashMapManager also clears the session attribute now when the given FlashMap List is empty.

Issue: SPR-11538
 2014-03-24 11:16:56 +01:00
Juergen Hoeller
0af6e1bb1b MVC handler method detection ignores scoped targets in favor of proxies 
Issue: SPR-11548
 2014-03-24 11:02:03 +01:00
Stephane Nicoll
4cd818b9e4 Harmonize log configuration 
Prior to this commit, the codebase was using a mix of log4j.xml
and log4j.properties for test-related logging configuration. This
can be an issue as log4j takes the xml variant first when looking
for a default bootstrap configuration.

In practice, some modules declaring the properties variant were
taking the xml variant configuration from another module.

The general structure of the configuration has also been
harmonized to provide a standard console output as well as an
easy way to enable trace logs for the current module.
 2014-03-20 09:43:29 -07:00