Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,996 Commits 18 Branches 0 Tags
79ded1ca72b22eaecb9dc3830209ddeb97dec2d7
Commit Graph

9996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen Hoeller
79ded1ca72 MockHttpServletResponse.setIntHeader supports 'Content-Length' header as well 
Issue: SPR-13752
(cherry picked from commit a4f5c46)
 2015-12-02 14:07:15 +01:00
Juergen Hoeller
fad0c9589d Latest applicable dependency updates (JOpt Simple 4.9, C3P0 0.9.5.1, H2 1.4.190, HSQLDB 2.3.3) 2015-12-01 21:03:55 +01:00
Juergen Hoeller
85863a5442 Polishing 2015-12-01 19:16:16 +01:00
Juergen Hoeller
948ab21f43 Aligned class name quoting with ConversionFailedException 
(cherry picked from commit 7589c1f)
 2015-12-01 19:16:11 +01:00
Juergen Hoeller
c56d1a6677 Document destruction callback behavior for inner beans in case of scope mismatch 
Issue: SPR-13739
(cherry picked from commit 998da2f)
 2015-11-30 22:16:18 +01:00
Juergen Hoeller
e6d3c28ec2 Avoid instantiation of non-selected beans in BeanFactoryAnnotationUtils.qualifiedBeanOfType 
Issue: SPR-13741
(cherry picked from commit 8ed2c47)
 2015-11-30 22:03:25 +01:00
Juergen Hoeller
a730b6e1aa Backported exception message refinements from 4.2.x 2015-11-30 12:24:38 +01:00
Juergen Hoeller
6c4f0a4d9f Backported conversion service test updates from 4.2.x 2015-11-30 12:18:56 +01:00
Juergen Hoeller
3bc2a97776 Unit tests for @Value Resource resolution 
Issue: SPR-13731
(cherry picked from commit def1034)
 2015-11-30 12:11:15 +01:00
Juergen Hoeller
ce315b223e Upgrade to Tomcat 8.0.29 and SLF4J 1.7.13 2015-11-27 13:52:20 +01:00
Juergen Hoeller
5bfa82db12 Javadoc fixes 
(cherry picked from commit 9bb72e8)
 2015-11-27 13:51:51 +01:00
Juergen Hoeller
97148ce889 Polishing 2015-11-26 01:10:31 +01:00
Andy Clement
e410129aaf Ensure cast correctly included for OpPlus compilation 
When the plus operator is used between strings in a SpEL
expression and that expression is compiled, it is
important to include a cast if computation of any of
the operands isn't obviously leaving strings on the
stack. Likewise if the stack contents are known to
be strings, a cast should not be included.

Issue: SPR-12426
(cherry picked from commit 58756b0)
 2015-11-26 01:10:04 +01:00
Juergen Hoeller
55494362ef SimpAnnotationMethodMessageHandler skips template variable check in case of no pattern 
Issue: SPR-13704
(cherry picked from commit e8417ea)
 2015-11-26 01:09:57 +01:00
Juergen Hoeller
393e36c29e Latest applicable server engine updates (Jetty 9.2.14, Netty 4.0.33, Undertow 1.1.9) 2015-11-15 00:25:20 +01:00
Juergen Hoeller
5a95156dcc Fixed class name in debug log message 2015-11-14 23:58:27 +01:00
Juergen Hoeller
71fc2ba174 Polishing 2015-11-14 23:32:36 +01:00
Juergen Hoeller
48838d48d2 Fixed various code examples in documentation 
Issue: SPR-13666
Issue: SPR-13485
Issue: SPR-10474
 2015-11-14 23:32:07 +01:00
Juergen Hoeller
5d6aab34cb Reduced warn log entry without stacktrace for startup exceptions 
Also, AbstractApplicationContext.isRunning avoids IllegalStateException now.

Issue: SPR-13663
Issue: SPR-13667
 2015-11-14 23:27:20 +01:00
Juergen Hoeller
90a288513c MethodInvokeTypeProvider lazily invokes target method (avoiding deserialization exploits) 
Issue: SPR-13656
(cherry picked from commit ea2843e)
 2015-11-14 23:25:35 +01:00
Juergen Hoeller
df49b11758 CommonsMultipartFile removes mixed separator paths from original filename 
Issue: SPR-13662
(cherry picked from commit 5d9d88c)
 2015-11-14 23:16:13 +01:00
Juergen Hoeller
d1f5ee2643 Avoid NPE for anonymous SqlParameter in CallMetaDataContext 
Issue: SPR-13628
(cherry picked from commit 6685c78)
 2015-11-14 23:15:06 +01:00
Juergen Hoeller
0f4e4fcca6 Declared JDBC operation compiled flag as volatile 
Issue: SPR-13617
(cherry picked from commit 81342f1)
 2015-11-14 23:12:46 +01:00
Rossen Stoyanchev
a8c7220fc7 Fix failing tests 2015-11-11 18:04:28 -05:00
Rossen Stoyanchev
92ca537d61 Switch "attachment" to "inline" on Content-Disposition 
Issue: SPR-13587, SPR-13643
 2015-11-11 17:47:34 -05:00
Rossen Stoyanchev
f5f57e9544 Expand range of whitelisted extensions by media type 
This commit expands the range of whitelisted extensions by checking
if an extension can be resolved to image/*, audio/*, video/*, as well
as any content type that ends with +xml.

Issue: SPR-13643
 2015-11-11 17:46:36 -05:00
Rossen Stoyanchev
cde4431c80 Add containsKey to ServletResponseHttpHeaders 
Issue: SPR-13668
 2015-11-11 14:28:34 -05:00
Rossen Stoyanchev
d500d523e7 Whitelist extension if present in the request mapping 
We know skip the Content-Disposition header for any extension if the
chosen request mapping explicitly contains the URl extension.

Issue: SPR-13629
 2015-11-06 12:45:40 -05:00
Rossen Stoyanchev
71a9eb7102 Add section on RFD + whitelist yml/properties/csv 
Issue: SPR-13643
 2015-11-05 19:42:30 -05:00
Rossen Stoyanchev
e190f26669 No Content-Disposition if HTML in the request mapping 
Issue: SPR-13629
 2015-11-02 13:13:37 -05:00
Rossen Stoyanchev
0f1897d376 Further improve Detect custom CNVR 
Refine the approach of having <mvc:view-resolvers> detect and use the
ContentNegotiationManager instance registered with
<mvc:annotation-driven> introduced in the last commit.

Issue: SPR-13559
 2015-10-29 20:53:36 -04:00
Rossen Stoyanchev
563a120280 Detect custom ContentNegotiationViewResolver 
The <mvc:annotation-driven> element now adds an alias when a
ContentNegotiationManager bean is registered with a custom name.
This helps <mvc:view-resolvers> to more reliably find such a custom
ContentNegotiationManager.

Issue: SPR-13559
 2015-10-29 18:06:45 -04:00
Brian Clozel
78fc5bbecc Don't throw NPE when serving webjar directories 
Prior to this change, serving resources with ResourceHttpRequestHandler
could result in NPE when requesting an existing folder located in a JAR.

This commit swallows those exceptions, as it is not possible to foresee
those cases without reading the actual resource. This result in a HTTP
200 response with a zero Content-Length instead of a HTTP 500 internal
exception.

Issue: SPR-13620
 2015-10-29 16:48:55 +01:00
Rossen Stoyanchev
a879897063 Skip Content-Disposition header if status != 2xx 
Issue: SPR-13588
 2015-10-26 16:11:20 -04:00
Spring Buildmaster
0016752ad8 Next Development Version 2015-10-15 02:40:06 -07:00
Rossen Stoyanchev
a95c3d820d Protect against RFD exploits 
Issue: SPR-13548
 2015-10-15 10:32:51 +02:00
Juergen Hoeller
271e5fd76a Reverted StrictMapAppenderConstructor constructor back to public 
Issue: SPR-13504
(cherry picked from commit 627393a)
 2015-10-14 15:24:25 +02:00
Juergen Hoeller
5d36ac08ef Added missing @since tags to DeferredResult 2015-10-14 14:48:48 +02:00
Brian Clozel
49393e54a1 Build 4.1.8 SNAPSHOTs 2015-10-14 10:42:07 +02:00
Juergen Hoeller
302a069257 AbstractFileResolvingResource uses extractArchiveURL for last-modified check 
Issue: SPR-13393
 2015-10-13 20:09:21 +02:00
Juergen Hoeller
c33c26ac5d Support for GlassFish 4.1.1 (Tyrus 1.9 - 1.12) 
Issue: SPR-13566
 2015-10-13 20:09:13 +02:00
Rossen Stoyanchev
0086dd830b Enforce cacheLimit in DefaultSubscriptionRegistry 
When the cacheLimit is reached and there is an eviction from the
updateCache, the accessCache is now also updated.

This change also ensures that adding a destination to the cache is
protected with synchronization on the updateCache.

Issue: SPR-13555
 2015-10-13 12:28:27 -04:00
Juergen Hoeller
799a03e98d Polishing 2015-10-13 16:44:51 +02:00
Juergen Hoeller
c0b6d320f1 Updated compatibility statements in RequestUpgradeStrategy javadocs 2015-10-13 12:31:35 +02:00
Juergen Hoeller
d7a418356e Upgrade to Tomcat 8.0.28 2015-10-13 11:52:22 +02:00
Juergen Hoeller
13283ec918 Polishing 2015-10-12 23:24:36 +02:00
Juergen Hoeller
ca60d796a8 Clarified that getBody() never returns null 
As the only place that historically differed, HttpComponents(Async)ClientHttpResponse returns an empty stream instead of null now.

Issue: SPR-13563
(cherry picked from commit a5f81a0)
 2015-10-12 23:24:29 +02:00
Juergen Hoeller
16cb73673e Fixed ContentNegotiationManager reference in MVC docs 
Issue: SPR-13558
 2015-10-10 22:54:26 +02:00
Juergen Hoeller
196adbd459 Polishing 2015-10-10 22:43:51 +02:00
Juergen Hoeller
de932903ca Reliable null value handling in ConcurrentMapCache, GuavaCache, JCacheCache 
The 4.1 variant of this fix just introduces readResolve declarations to the existing NullHolder classes.

Issue: SPR-13553
 2015-10-10 22:43:06 +02:00