root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details

This commit is contained in:
Brian Clozel 2025-06-13 16:57:26 +02:00
parent 00cc48dad4 8dee7d8fb6
commit 3da645f4b9
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java
View File

@ -151,7 +151,7 @@ public class DefaultServerWebExchange implements ServerWebExchange {
return EMPTY_FORM_DATA;
}
HttpMessageReader<MultiValueMap<String, String>> reader = getReader(configurer, contentType, FORM_DATA_TYPE);
HttpMessageReader<MultiValueMap<String, String>> reader = getReader(configurer, MediaType.APPLICATION_FORM_URLENCODED, FORM_DATA_TYPE);
if (reader == null) {
return Mono.error(new IllegalStateException("No HttpMessageReader for " + contentType));
}

16
spring-web/src/test/java/org/springframework/web/server/adapter/DefaultServerWebExchangeTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -18,7 +18,10 @@ package org.springframework.web.server.adapter;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.codec.ServerCodecConfigurer;
import org.springframework.util.MultiValueMap;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.i18n.AcceptHeaderLocaleContextResolver;
import org.springframework.web.server.session.DefaultWebSessionManager;
@ -56,6 +59,17 @@ class DefaultServerWebExchangeTests {
assertThat(exchange.transformUrl("/foo")).isEqualTo("/foo;p=abc?q=123");
}
@Test // gh-34660
void useFormDataMessageReaderWhenAllContentType() {
MockServerHttpRequest request = MockServerHttpRequest
.post("https://example.com")
.header(HttpHeaders.CONTENT_TYPE, MediaType.ALL_VALUE)
.body("project=spring");
ServerWebExchange exchange = createExchange(request);
MultiValueMap<String, String> body = exchange.getFormData().block();
assertThat(body.get("project")).contains("spring");
}
private DefaultServerWebExchange createExchange() {
MockServerHttpRequest request = MockServerHttpRequest.get("https://example.com").build();